File tree Expand file tree Collapse file tree 4 files changed +15
-18
lines changed Expand file tree Collapse file tree 4 files changed +15
-18
lines changed Original file line number Diff line number Diff line change @@ -35,16 +35,18 @@ dependencies {
3535}
3636
3737java {
38- sourceCompatibility = JavaVersion .toVersion(toolchainVersion)
39- targetCompatibility = JavaVersion .toVersion(toolchainVersion)
40-
4138 toolchain {
4239 languageVersion = JavaLanguageVersion .of(toolchainVersion)
4340 vendor = JvmVendorSpec .ADOPTIUM
4441 }
4542}
4643
44+ tasks.withType<JavaCompile >().configureEach { options.release = toolchainVersion }
45+
4746kotlin {
4847 jvmToolchain(toolchainVersion)
49- compilerOptions { jvmTarget = JvmTarget .fromTarget(toolchainVersion.toString()) }
48+ compilerOptions {
49+ jvmTarget = JvmTarget .fromTarget(toolchainVersion.toString())
50+ freeCompilerArgs.add(" -Xjdk-release=$toolchainVersion " )
51+ }
5052}
Original file line number Diff line number Diff line change 1616import com.diffplug.gradle.spotless.KotlinGradleExtension
1717import org.gradle.accessors.dm.LibrariesForLibs
1818import org.jetbrains.kotlin.gradle.dsl.JvmTarget
19- import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
19+ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
2020
2121plugins { id(" com.diffplug.spotless" ) }
2222
@@ -52,15 +52,14 @@ configurations.all {
5252}
5353
5454plugins.withType(JavaPlugin ::class ).configureEach {
55- val java = project.extensions.getByType<JavaPluginExtension >()
56- java.sourceCompatibility = JavaVersion .VERSION_17
57- java.targetCompatibility = JavaVersion .VERSION_17
55+ tasks.withType<JavaCompile >().configureEach { options.release = 17 }
5856}
5957
60- tasks.withType<KotlinCompile >().configureEach {
58+ tasks.withType<KotlinJvmCompile >().configureEach {
6159 compilerOptions {
6260 jvmTarget = JvmTarget .JVM_17
6361 freeCompilerArgs.addAll(" -Xjsr305=strict" , " -Xjvm-default=all" )
62+ freeCompilerArgs.add(" -Xjdk-release=17" )
6463 }
6564}
6665
Original file line number Diff line number Diff line change @@ -34,14 +34,9 @@ val libs = the<LibrariesForLibs>()
3434val info = project.extensions.getByType<BuildInfo >()
3535
3636java {
37- val jvmTarget = JavaVersion .toVersion(info.jvmTarget)
38-
3937 withSourcesJar() // creates `sourcesJar` task
4038 withJavadocJar()
4139
42- sourceCompatibility = jvmTarget
43- targetCompatibility = jvmTarget
44-
4540 toolchain {
4641 languageVersion = info.jdkToolchainVersion
4742 vendor = info.jdkVendor
@@ -112,10 +107,8 @@ tasks.compileJava {
112107}
113108
114109tasks.withType<JavaCompile >().configureEach {
115- val jvmTarget = JavaVersion .toVersion(info.jvmTarget)
116110 javaCompiler = info.javaCompiler
117- sourceCompatibility = jvmTarget.majorVersion
118- targetCompatibility = jvmTarget.majorVersion
111+ options.release = info.jvmTarget
119112}
120113
121114tasks.withType<JavaExec >().configureEach { jvmArgs(info.jpmsAddModulesFlags) }
Original file line number Diff line number Diff line change @@ -42,5 +42,8 @@ tasks.compileKotlin {
4242}
4343
4444tasks.withType<KotlinJvmCompile >().configureEach {
45- compilerOptions { jvmTarget = JvmTarget .fromTarget(buildInfo.jvmTarget.toString()) }
45+ compilerOptions {
46+ jvmTarget = JvmTarget .fromTarget(buildInfo.jvmTarget.toString())
47+ freeCompilerArgs.addAll(" -Xjdk-release=${buildInfo.jvmTarget} " )
48+ }
4649}
You can’t perform that action at this time.
0 commit comments