Merge pull request #66 from nstdio/matrix-build

ci: Matrix builds now building the project with available JDK instead of using Gradle's toolchain.

Author: nstdio

.github/workflows/build.yaml

@@ -26,6 +26,8 @@ jobs:
           java-version: ${{ matrix.java-version }}
           cache: 'gradle'
       - name: Build
+        env:
+          RSQL_PARSER_GRADLE_USE_TOOLCHAIN: false
         run: ./gradlew build
       - uses: codecov/codecov-action@v5
         if: matrix.java-version == 8

build.gradle.kts

@@ -20,8 +20,12 @@ java {
   withSourcesJar()
   withJavadocJar()
 
-  toolchain {
-    languageVersion.set(JavaLanguageVersion.of(8))
+  val useToolchain = System.getenv("RSQL_PARSER_GRADLE_USE_TOOLCHAIN")?.toBoolean() ?: true
+
+  if (useToolchain) {
+    toolchain {
+      languageVersion.set(JavaLanguageVersion.of(8))
+    }
   }
 }
 
@@ -200,12 +204,12 @@ tasks {
 
 tasks.named<JavaCompile>("compileFuzzTestJava") {
   javaCompiler.set(javaToolchains.compilerFor {
-    languageVersion.set(JavaLanguageVersion.of(21))
+    languageVersion.set(JavaLanguageVersion.of(24))
   })
 }
 
 tasks.named<Test>("fuzzTest") {
   javaLauncher.set(javaToolchains.launcherFor {
-    languageVersion.set(JavaLanguageVersion.of(21))
+    languageVersion.set(JavaLanguageVersion.of(24))
   })
 }

settings.gradle.kts

@@ -1 +1,5 @@
+plugins {
+  id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
+}
+
 rootProject.name = "rsql-parser"