Skip to content

Commit 05e18fe

Browse files
Use same JDK everywhere
1 parent d2f97d4 commit 05e18fe

File tree

6 files changed

+14
-2
lines changed

6 files changed

+14
-2
lines changed

app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ licensee {
4141
allow("MIT")
4242
}
4343

44-
kotlin { jvmToolchain(21) }
44+
kotlin { jvmToolchain(libs.versions.jdk.get().toInt()) }
4545

4646
tasks.withType<com.diffplug.gradle.spotless.SpotlessTask>().configureEach {
4747
notCompatibleWithConfigurationCache("https://github.com/diffplug/spotless/issues/987")

build-logic/build.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ plugins {
3030
`java-gradle-plugin`
3131
}
3232

33-
kotlin { jvmToolchain(21) }
33+
kotlin { jvmToolchain(libs.versions.jdk.get().toInt()) }
3434

3535
spotless {
3636
format("misc") {
@@ -65,6 +65,9 @@ gradlePlugin {
6565
}
6666
}
6767

68+
// https://docs.gradle.org/8.9/userguide/gradle_daemon.html#daemon_jvm_criteria
69+
tasks.updateDaemonJvm.configure { jvmVersion = JavaVersion.toVersion(libs.versions.jdk.get()) }
70+
6871
dependencies {
6972
implementation(libs.android.gradle)
7073
implementation(libs.detekt.gradle)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#This file is generated by updateDaemonJvm
2+
toolchainVersion=21

build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,7 @@ plugins {
3434
alias(libs.plugins.doctor)
3535
alias(libs.plugins.gradle.versions)
3636
}
37+
38+
39+
// https://docs.gradle.org/8.9/userguide/gradle_daemon.html#daemon_jvm_criteria
40+
tasks.updateDaemonJvm.configure { jvmVersion = JavaVersion.toVersion(libs.versions.jdk.get()) }

gradle/gradle-daemon-jvm.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#This file is generated by updateDaemonJvm
2+
toolchainVersion=21

gradle/libs.versions.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ sort = "0.12"
1919
inject = "0.7.2"
2020
sqldelight = "2.0.2"
2121
ktor = "3.0.1"
22+
jdk="21"
2223

2324
[plugins]
2425
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }

0 commit comments

Comments
 (0)