Fix Java toolchain config

gesellix · gesellix · commit 2681273399c6 · 2025-08-04T21:34:15.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,6 +27,7 @@ jobs:
         java:
           - 8
           - 17
+#          - 21
     runs-on: ${{ matrix.os }}
     timeout-minutes: 20
     steps:
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -104,6 +104,8 @@ java {
 
 tasks {
   withType<JavaCompile> {
+    // https://docs.gradle.org/current/userguide/toolchains.html#comparison_table_for_setting_project_toolchains
+//    options.release = 8
     options.encoding = "UTF-8"
   }
   withType<Test> {
@@ -199,3 +201,8 @@ nexusPublishing {
     }
   }
 }
+
+tasks.named<UpdateDaemonJvm>("updateDaemonJvm") {
+  languageVersion = JavaLanguageVersion.of(21)
+  vendor = JvmVendorSpec.AMAZON
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,6 @@
 org.gradle.daemon=true
+org.gradle.java.installations.auto-detect=true
+org.gradle.java.installations.auto-download=true
 
 group=de.gesellix
 
diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties
@@ -0,0 +1,12 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/836cff6b69c28369ebb08c5f3e9b9134/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/bf61362f429c3a4553b499ba99a26558/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/836cff6b69c28369ebb08c5f3e9b9134/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/bf61362f429c3a4553b499ba99a26558/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/862aec68ec978ffb2463736698353744/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/0db63c935722a67c26d9acdb1889c830/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/836cff6b69c28369ebb08c5f3e9b9134/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/bf61362f429c3a4553b499ba99a26558/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/929c9452a7ee2b282306407e29f12a4e/redirect
+toolchainVendor=AMAZON
+toolchainVersion=21
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -2,5 +2,5 @@ rootProject.name = "docker-filesocket"
 
 // https://docs.gradle.org/current/userguide/toolchains.html#sub:download_repositories
 plugins {
-  id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
+  id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,8 @@ java {`
`104`	`104`
`105`	`105`	`tasks {`
`106`	`106`	`withType<JavaCompile> {`
	`107`	`+ // https://docs.gradle.org/current/userguide/toolchains.html#comparison_table_for_setting_project_toolchains`
	`108`	`+// options.release = 8`
`107`	`109`	`options.encoding = "UTF-8"`
`108`	`110`	`}`
`109`	`111`	`withType<Test> {`
`@@ -199,3 +201,8 @@ nexusPublishing {`
`199`	`201`	`}`
`200`	`202`	`}`
`201`	`203`	`}`
	`204`	`+`
	`205`	`+tasks.named<UpdateDaemonJvm>("updateDaemonJvm") {`
	`206`	`+ languageVersion = JavaLanguageVersion.of(21)`
	`207`	`+ vendor = JvmVendorSpec.AMAZON`
	`208`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ rootProject.name = "docker-filesocket"`
`2`	`2`
`3`	`3`	`// https://docs.gradle.org/current/userguide/toolchains.html#sub:download_repositories`
`4`	`4`	`plugins {`
`5`		`- id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"`
	`5`	`+ id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"`
`6`	`6`	`}`