✅ let kotlin-spring-app convention apply app mixin

CXwudi · Nov 4, 2023 · 890dc7e · 890dc7e
1 parent 9a9517b
commit 890dc7e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/gradle/plugins/convention/kotlin-spring-app/build.gradle.kts b/gradle/plugins/convention/kotlin-spring-app/build.gradle.kts
@@ -4,6 +4,11 @@ plugins {
 
 dependencies {
   implementation(project(":mixin:kotlin-jvm"))
+  // let makes all spring apps using app mixin to enjoy the better Jar packaging
+  implementation(project(":mixin:app"))
   implementation(project(":mixin:spring-boot-kotlin"))
   implementation(project(":mixin:spring-boot-app"))
+  // we could merge the spring-boot-app and app mixins into here
+  // but unsure if in the future we'll need to separate them again
+  // (e.g., cloud native app without Spring Boot)
 }
diff --git a/gradle/plugins/convention/kotlin-spring-app/src/main/kotlin/my.kotlin-spring-app.gradle.kts b/gradle/plugins/convention/kotlin-spring-app/src/main/kotlin/my.kotlin-spring-app.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
   id("my.mixin.kotlin-jvm")
   id("my.mixin.spring-boot-kotlin")
+  id("my.mixin.app")
   id("my.mixin.spring-boot-app")
 }
diff --git a/yc-app-cli/build.gradle.kts b/yc-app-cli/build.gradle.kts
@@ -1,10 +1,10 @@
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
   id("my.kotlin-spring-app")
-  id("my.mixin.app") // to generate a run script version of this app
   alias(libs.plugins.graalvm.native.image)
 }
 
+version = "1.0.0"
+
 dependencies {
   implementation(project(":yc-core-ical"))
   implementation(project(":yc-apiclient-youtrack"))