Skip to content

Commit 2cf5fff

Browse files
committed
Revert to setting the JVM target manually
It looks like setting a toolchain doesn't allow us to use a newer Java versions for compiling than the one that was specified.
1 parent 3832470 commit 2cf5fff

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

build.gradle.kts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
22
import org.apache.tools.ant.filters.ReplaceTokens
3+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
34

45
plugins {
56
java
@@ -28,20 +29,20 @@ subprojects {
2829
}
2930

3031
java {
31-
toolchain {
32-
languageVersion.set(JavaLanguageVersion.of(javaVersion))
33-
}
32+
sourceCompatibility = JavaVersion.toVersion(javaVersion)
33+
targetCompatibility = JavaVersion.toVersion(javaVersion)
3434
}
3535
}
3636

3737
java {
38-
toolchain {
39-
languageVersion.set(JavaLanguageVersion.of(javaVersion))
40-
}
38+
sourceCompatibility = JavaVersion.toVersion(javaVersion)
39+
targetCompatibility = JavaVersion.toVersion(javaVersion)
4140
}
4241

4342
kotlin {
44-
jvmToolchain(javaVersion)
43+
compilerOptions {
44+
jvmTarget = JvmTarget.fromTarget(javaVersion.toString())
45+
}
4546
}
4647

4748
repositories {

0 commit comments

Comments
 (0)