Use same JDK everywhere

WhosNickDoglio · Nov 9, 2024 · 05e18fe · 05e18fe
1 parent d2f97d4
commit 05e18fe
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 2 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -41,7 +41,7 @@ licensee {
     allow("MIT")
 }
 
-kotlin { jvmToolchain(21) }
+kotlin { jvmToolchain(libs.versions.jdk.get().toInt()) }
 
 tasks.withType<com.diffplug.gradle.spotless.SpotlessTask>().configureEach {
     notCompatibleWithConfigurationCache("https://github.com/diffplug/spotless/issues/987")

diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -30,7 +30,7 @@ plugins {
     `java-gradle-plugin`
 }
 
-kotlin { jvmToolchain(21) }
+kotlin { jvmToolchain(libs.versions.jdk.get().toInt()) }
 
 spotless {
     format("misc") {
@@ -65,6 +65,9 @@ gradlePlugin {
     }
 }
 
+// https://docs.gradle.org/8.9/userguide/gradle_daemon.html#daemon_jvm_criteria
+tasks.updateDaemonJvm.configure { jvmVersion = JavaVersion.toVersion(libs.versions.jdk.get()) }
+
 dependencies {
     implementation(libs.android.gradle)
     implementation(libs.detekt.gradle)

diff --git a/build-logic/gradle/gradle-daemon-jvm.properties b/build-logic/gradle/gradle-daemon-jvm.properties
@@ -0,0 +1,2 @@
+#This file is generated by updateDaemonJvm
+toolchainVersion=21
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -34,3 +34,7 @@ plugins {
     alias(libs.plugins.doctor)
     alias(libs.plugins.gradle.versions)
 }
+
+
+// https://docs.gradle.org/8.9/userguide/gradle_daemon.html#daemon_jvm_criteria
+tasks.updateDaemonJvm.configure { jvmVersion = JavaVersion.toVersion(libs.versions.jdk.get()) }
diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties
@@ -0,0 +1,2 @@
+#This file is generated by updateDaemonJvm
+toolchainVersion=21
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -19,6 +19,7 @@ sort = "0.12"
 inject = "0.7.2"
 sqldelight = "2.0.2"
 ktor = "3.0.1"
+jdk="21"
 
 [plugins]
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#This file is generated by updateDaemonJvm
		toolchainVersion=21