Skip to content

Commit 0ad6534

Browse files
authored
Merge pull request #601 from komapper/chore/polish-build-script
Polish build script
2 parents d005e3c + d115363 commit 0ad6534

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

build.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
plugins {
24
java
35
alias(libs.plugins.kotlin.jvm)
@@ -59,7 +61,9 @@ subprojects {
5961
}
6062

6163
withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
62-
kotlinOptions.jvmTarget = "17"
64+
compilerOptions {
65+
jvmTarget.set(JvmTarget.JVM_17)
66+
}
6367
}
6468
}
6569
}

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ komapper = { id = "org.komapper.gradle", version.ref = "komapper" }
7373
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
7474
spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
7575
spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot" }
76-
spring-dependency-management = { id = "io.spring.dependency-management" }
76+
spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.6" }
7777
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
7878
kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
7979
kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" }

jpetstore/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ plugins {
22
alias(libs.plugins.spring.boot)
33
alias(libs.plugins.ksp)
44
alias(libs.plugins.kotlin.spring)
5+
alias(libs.plugins.spring.dependency.management)
56
}
67

7-
apply(plugin = libs.plugins.spring.dependency.management.get().pluginId)
8-
98
springBoot {
109
mainClass.set("org.komapper.example.ApplicationKt")
1110
}

spring-boot-jdbc/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ plugins {
33
alias(libs.plugins.ksp)
44
alias(libs.plugins.graalvm.buildtools.native)
55
alias(libs.plugins.kotlin.spring)
6+
alias(libs.plugins.spring.dependency.management)
67
}
78

8-
apply(plugin = libs.plugins.spring.dependency.management.get().pluginId)
9-
109
dependencies {
1110
platform(libs.komapper.platform).let {
1211
implementation(it)

spring-boot-r2dbc/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ plugins {
33
alias(libs.plugins.ksp)
44
alias(libs.plugins.graalvm.buildtools.native)
55
alias(libs.plugins.kotlin.spring)
6+
alias(libs.plugins.spring.dependency.management)
67
}
78

8-
apply(plugin = libs.plugins.spring.dependency.management.get().pluginId)
9-
109
dependencies {
1110
platform(libs.komapper.platform).let {
1211
implementation(it)

0 commit comments

Comments
 (0)