diff --git a/build.gradle.kts b/build.gradle.kts index a19a572c..081b79f0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { java alias(libs.plugins.kotlin.jvm) @@ -59,7 +61,9 @@ subprojects { } withType().configureEach { - kotlinOptions.jvmTarget = "17" + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b2118109..2dd794f6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -73,7 +73,7 @@ komapper = { id = "org.komapper.gradle", version.ref = "komapper" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } spotless = { id = "com.diffplug.spotless", version = "6.25.0" } spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot" } -spring-dependency-management = { id = "io.spring.dependency-management" } +spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.6" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" } kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" } diff --git a/jpetstore/build.gradle.kts b/jpetstore/build.gradle.kts index 7e140266..e391f39d 100644 --- a/jpetstore/build.gradle.kts +++ b/jpetstore/build.gradle.kts @@ -2,10 +2,9 @@ plugins { alias(libs.plugins.spring.boot) alias(libs.plugins.ksp) alias(libs.plugins.kotlin.spring) + alias(libs.plugins.spring.dependency.management) } -apply(plugin = libs.plugins.spring.dependency.management.get().pluginId) - springBoot { mainClass.set("org.komapper.example.ApplicationKt") } diff --git a/spring-boot-jdbc/build.gradle.kts b/spring-boot-jdbc/build.gradle.kts index 297f0a46..e681e524 100644 --- a/spring-boot-jdbc/build.gradle.kts +++ b/spring-boot-jdbc/build.gradle.kts @@ -3,10 +3,9 @@ plugins { alias(libs.plugins.ksp) alias(libs.plugins.graalvm.buildtools.native) alias(libs.plugins.kotlin.spring) + alias(libs.plugins.spring.dependency.management) } -apply(plugin = libs.plugins.spring.dependency.management.get().pluginId) - dependencies { platform(libs.komapper.platform).let { implementation(it) diff --git a/spring-boot-r2dbc/build.gradle.kts b/spring-boot-r2dbc/build.gradle.kts index 103c6c10..b22dc585 100644 --- a/spring-boot-r2dbc/build.gradle.kts +++ b/spring-boot-r2dbc/build.gradle.kts @@ -3,10 +3,9 @@ plugins { alias(libs.plugins.ksp) alias(libs.plugins.graalvm.buildtools.native) alias(libs.plugins.kotlin.spring) + alias(libs.plugins.spring.dependency.management) } -apply(plugin = libs.plugins.spring.dependency.management.get().pluginId) - dependencies { platform(libs.komapper.platform).let { implementation(it)