Skip to content

Commit bb428ea

Browse files
committed
ci: Matrix builds now building the project with available JDK instead of using Gradle's toolchain.
1 parent 41cce50 commit bb428ea

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

.github/workflows/build.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ jobs:
2626
java-version: ${{ matrix.java-version }}
2727
cache: 'gradle'
2828
- name: Build
29+
env:
30+
RSQL_PARSER_GRADLE_USE_TOOLCHAIN: false
2931
run: ./gradlew build
3032
- uses: codecov/codecov-action@v5
3133
if: matrix.java-version == 8

build.gradle.kts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@ java {
2020
withSourcesJar()
2121
withJavadocJar()
2222

23-
toolchain {
24-
languageVersion.set(JavaLanguageVersion.of(8))
23+
val useToolchain = System.getenv("RSQL_PARSER_GRADLE_USE_TOOLCHAIN")?.toBoolean() ?: true
24+
25+
if (useToolchain) {
26+
toolchain {
27+
languageVersion.set(JavaLanguageVersion.of(8))
28+
}
2529
}
2630
}
2731

@@ -200,12 +204,12 @@ tasks {
200204

201205
tasks.named<JavaCompile>("compileFuzzTestJava") {
202206
javaCompiler.set(javaToolchains.compilerFor {
203-
languageVersion.set(JavaLanguageVersion.of(21))
207+
languageVersion.set(JavaLanguageVersion.of(24))
204208
})
205209
}
206210

207211
tasks.named<Test>("fuzzTest") {
208212
javaLauncher.set(javaToolchains.launcherFor {
209-
languageVersion.set(JavaLanguageVersion.of(21))
213+
languageVersion.set(JavaLanguageVersion.of(24))
210214
})
211215
}

settings.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1+
plugins {
2+
id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
3+
}
4+
15
rootProject.name = "rsql-parser"

0 commit comments

Comments
 (0)