Skip to content

Commit 0c0e442

Browse files
committed
build with java 17, target java 11
1 parent 2db1f5a commit 0c0e442

File tree

2 files changed

+8
-40
lines changed

2 files changed

+8
-40
lines changed

build.gradle.kts

Lines changed: 4 additions & 32 deletions
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-library`
35
groovy
@@ -23,27 +25,6 @@ versions {
2325
))
2426
}
2527

26-
27-
//testing {
28-
// }
29-
//
30-
// sources {
31-
// java {
32-
// srcDirs = ['src/testInt/kotlin']
33-
// }
34-
// }
35-
//
36-
// targets {
37-
// configureEach {
38-
// testTask.configure {
39-
// shouldRunAfter(test)
40-
// }
41-
// }
42-
// }
43-
// }
44-
// }
45-
//}
46-
4728
java {
4829
withJavadocJar ()
4930
withSourcesJar ()
@@ -54,6 +35,7 @@ kotlin {
5435

5536
compilerOptions {
5637
freeCompilerArgs.add("-Xannotation-default-target=param-property")
38+
jvmTarget = JvmTarget.fromTarget(libs.versions.target.jdk.get())
5739
}
5840
}
5941

@@ -130,7 +112,7 @@ tasks.withType<Test>().configureEach {
130112
))
131113

132114
javaLauncher.set(javaToolchains.launcherFor {
133-
languageVersion.set(JavaLanguageVersion.of(libs.versions.test.jdk.get()))
115+
languageVersion.set(JavaLanguageVersion.of(libs.versions.build.jdk.get()))
134116
})
135117

136118
finalizedBy(tasks.named("jacocoTestReport"))
@@ -154,16 +136,6 @@ tasks.jacocoTestReport {
154136
}
155137
}
156138

157-
//publishing {
158-
// publications {
159-
// named<MavenPublication>("openapiprocessor") {
160-
// pom {
161-
// description = "OpenAPI Processor Spring"
162-
// }
163-
// }
164-
// }
165-
//}
166-
167139
sonarqube {
168140
properties {
169141
property("sonar.projectKey", "openapi-processor_openapi-processor-spring")

gradle/libs.versions.toml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
processor = "2025.4-SNAPSHOT"
33

44
kotlin = "2.2.20"
5-
build-jdk = "11"
6-
test-jdk = "17"
5+
target-jdk = "11"
6+
build-jdk = "17"
77
build-plugins = "2025.9"
88

99
api = "2024.2"
@@ -12,12 +12,8 @@ base = "2025.5.1"
1212
junit = "5.9.3"
1313
jacoco = "0.8.7"
1414

15-
spring-web = "5.3.39"
16-
spring-data = "2.7.18"
17-
18-
# although testInt builds with jdk 17 it is complaing that the dependecies need jdk 17
19-
#spring-web = "6.2.7"
20-
#spring-data = "3.5.0"
15+
spring-web = "6.2.7"
16+
spring-data = "3.5.0"
2117

2218
[libraries]
2319
openapi-processor-api = { module = "io.openapiprocessor:openapi-processor-api", version.ref = "api" }

0 commit comments

Comments
 (0)