update test toolchains

unimined · Jul 27, 2024 · a249eea · a249eea
1 parent 31590e3
commit a249eea
Show file tree

Hide file tree

Showing 14 changed files with 69 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -240,7 +240,7 @@ tasks.build {
 
 tasks.test {
     javaLauncher = javaToolchains.launcherFor {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(8))
     }
 
     useJUnitPlatform()

diff --git a/testing/1.17.1-Forge-Fabric/build.gradle b/testing/1.17.1-Forge-Fabric/build.gradle
@@ -10,6 +10,12 @@ base {
     archivesName = "UniminedExampleMod"
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
 // this is just here so we can test the outputs easier and clean between tests
 unimined.useGlobalCache = false
 

diff --git a/testing/1.17.1-Forge-Fabric/settings.gradle b/testing/1.17.1-Forge-Fabric/settings.gradle
@@ -25,6 +25,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 // so we can use the unimined directly provided by the super project
 includeBuild('../../')
 

diff --git a/testing/1.20.1-NeoForged-Fabric/build.gradle b/testing/1.20.1-NeoForged-Fabric/build.gradle
@@ -10,6 +10,12 @@ base {
     archivesName = "UniminedExampleMod"
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
 // this is just here so we can test the outputs easier and clean between tests
 unimined.useGlobalCache = false
 

diff --git a/testing/1.20.1-NeoForged-Fabric/settings.gradle b/testing/1.20.1-NeoForged-Fabric/settings.gradle
@@ -25,6 +25,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 // so we can use the unimined directly provided by the super project
 includeBuild('../../')
 

diff --git a/testing/1.20.2-NeoForged-Forge-Fabric/build.gradle b/testing/1.20.2-NeoForged-Forge-Fabric/build.gradle
@@ -10,6 +10,12 @@ base {
     archivesName = "UniminedExampleMod"
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
 // this is just here so we can test the outputs easier and clean between tests
 unimined.useGlobalCache = false
 

diff --git a/testing/1.20.2-NeoForged-Forge-Fabric/settings.gradle b/testing/1.20.2-NeoForged-Forge-Fabric/settings.gradle
@@ -25,6 +25,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 // so we can use the unimined directly provided by the super project
 includeBuild('../../')
 

diff --git a/testing/1.20.4-FlintLoader/build.gradle b/testing/1.20.4-FlintLoader/build.gradle
@@ -10,6 +10,16 @@ base {
     archivesName = "UniminedExampleMod"
 }
 
+java {
+    withSourcesJar()
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
 // this is just here so we can test the outputs easier and clean between tests
 unimined.useGlobalCache = false
 
@@ -39,10 +49,4 @@ processResources {
     filesMatching("flintmodule.json") {
         expand "version": project.version
     }
-}
-
-java {
-    withSourcesJar()
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
 }
diff --git a/testing/1.20.4-FlintLoader/settings.gradle b/testing/1.20.4-FlintLoader/settings.gradle
@@ -24,6 +24,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 // so we can use the unimined directly provided by the super project
 includeBuild('../../')
 

diff --git a/testing/1.20.4-NeoForged-Forge-Fabric/build.gradle b/testing/1.20.4-NeoForged-Forge-Fabric/build.gradle
@@ -10,6 +10,12 @@ base {
     archivesName = "UniminedExampleMod"
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
 // this is just here so we can test the outputs easier and clean between tests
 unimined.useGlobalCache = false
 

diff --git a/testing/1.20.4-NeoForged-Forge-Fabric/settings.gradle b/testing/1.20.4-NeoForged-Forge-Fabric/settings.gradle
@@ -25,6 +25,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 // so we can use the unimined directly provided by the super project
 includeBuild('../../')
 

diff --git a/testing/1.20.6-NeoForged-Forge-Fabric/build.gradle b/testing/1.20.6-NeoForged-Forge-Fabric/build.gradle
@@ -10,6 +10,12 @@ base {
     archivesName = "UniminedExampleMod"
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 // this is just here so we can test the outputs easier and clean between tests
 unimined.useGlobalCache = false
 

diff --git a/testing/1.20.6-NeoForged-Forge-Fabric/settings.gradle b/testing/1.20.6-NeoForged-Forge-Fabric/settings.gradle
@@ -25,6 +25,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 // so we can use the unimined directly provided by the super project
 includeBuild('../../')
 

diff --git a/testing/1.21-NeoForged-Fabric/settings.gradle b/testing/1.21-NeoForged-Fabric/settings.gradle
@@ -25,6 +25,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 // so we can use the unimined directly provided by the super project
 includeBuild('../../')