From 9b26ec7f67525f3d939d9f9a8fba7ddaa87804e6 Mon Sep 17 00:00:00 2001 From: Benjamin Prud'homme Date: Sun, 20 Oct 2024 12:51:48 -0400 Subject: [PATCH 1/5] Java 21 --- .github/workflows/java-all-versions.yml | 16 +++------------- .github/workflows/macos.yml | 8 ++++---- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/.github/workflows/java-all-versions.yml b/.github/workflows/java-all-versions.yml index 9f089785f..f0162691b 100644 --- a/.github/workflows/java-all-versions.yml +++ b/.github/workflows/java-all-versions.yml @@ -1,4 +1,4 @@ -name: Java 8, 11, 17, 21 CI +name: Java 21 CI on: [push,pull_request] @@ -8,24 +8,14 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDKs 8, 11, 17, 21 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: | - 8 - 11 - 17 - 21 + java-version: 21 - name: Build with Gradle run: ./gradlew assemble - name: Style check run: ./gradlew checkstyleMain - - name: Test with Java 8 - run: ./gradlew test -PtestOnJava=8 --stacktrace - - name: Test with Java 11 - run: ./gradlew test -PtestOnJava=11 --stacktrace - - name: Test with Java 17 - run: ./gradlew test -PtestOnJava=17 --stacktrace - name: Test with Java 21 run: ./gradlew test -PtestOnJava=21 --stacktrace diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index dcfa5e89a..b261af100 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -1,4 +1,4 @@ -name: Java 11 CI macOS (Apple) +name: Java 21 CI macOS (Apple) on: [push,pull_request] @@ -8,12 +8,12 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 11 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 11 + java-version: 21 - name: Build with Gradle run: ./gradlew assemble - name: Test with Gradle - run: ./gradlew test \ No newline at end of file + run: ./gradlew test From ef27317ef0e3e7ec38ff9a734df9d65cb319e3bd Mon Sep 17 00:00:00 2001 From: Benjamin Prud'homme Date: Sun, 20 Oct 2024 13:10:01 -0400 Subject: [PATCH 2/5] Change release version in Gradle build --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7efd6c644..18a374d64 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,7 +33,7 @@ subprojects { options.isDeprecation = true options.isWarnings = true options.compilerArgs = listOf("-Xlint:unchecked") - options.release.set(8) + options.release.set(21) } withType { From 1a44d2f8bc5c4195384a2ce7e6e2be2627294bea Mon Sep 17 00:00:00 2001 From: Benjamin Prud'homme Date: Sun, 20 Oct 2024 13:41:15 -0400 Subject: [PATCH 3/5] Revert "Change release version in Gradle build" This reverts commit ef27317ef0e3e7ec38ff9a734df9d65cb319e3bd. --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 18a374d64..7efd6c644 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,7 +33,7 @@ subprojects { options.isDeprecation = true options.isWarnings = true options.compilerArgs = listOf("-Xlint:unchecked") - options.release.set(21) + options.release.set(8) } withType { From c40ead314e9ef56572f509fd42e2556860d308b2 Mon Sep 17 00:00:00 2001 From: Benjamin Prud'homme <139664105+bgprudhomme@users.noreply.github.com> Date: Sun, 20 Oct 2024 14:06:52 -0400 Subject: [PATCH 4/5] Update build.gradle.kts --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7efd6c644..18a374d64 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,7 +33,7 @@ subprojects { options.isDeprecation = true options.isWarnings = true options.compilerArgs = listOf("-Xlint:unchecked") - options.release.set(8) + options.release.set(21) } withType { From 891ebeeb473a2f8439c82a8e43549fff95625843 Mon Sep 17 00:00:00 2001 From: Benjamin Prud'homme Date: Sun, 20 Oct 2024 22:00:24 -0400 Subject: [PATCH 5/5] Try changing compilation version --- RoaringBitmap/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RoaringBitmap/build.gradle.kts b/RoaringBitmap/build.gradle.kts index b9beaf5a3..13868e6fc 100644 --- a/RoaringBitmap/build.gradle.kts +++ b/RoaringBitmap/build.gradle.kts @@ -27,7 +27,7 @@ tasks.named("sourcesJar") { // Unset Java 8 release applied from root project to allow modularity plugin to // control the class file versions. tasks.named("compileJava") { - options.release.set(null as Int?) + options.release.set(21) } configure { @@ -37,7 +37,7 @@ configure { // Unset Java 8 release applied from root project to allow modularity plugin to // control the class file versions. tasks.named("compileModuleInfoJava") { - options.release.set(null as Int?) + options.release.set(21) } tasks.test {