From 09dab0a9dd61ddfea9e3c7447cab2c1d2fbeaef9 Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 30 Oct 2025 09:58:21 +0800 Subject: [PATCH 1/4] Pin JDK release for AbstractCompile on 8 (#1490) Syncs f3b66b8d459d3cfd19b6b6ab0456b51a73c3493a. --- build.gradle.kts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 36817112a..187137a52 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,11 +15,6 @@ version = providers.gradleProperty("VERSION_NAME").get() group = providers.gradleProperty("GROUP").get() description = providers.gradleProperty("POM_DESCRIPTION").get() -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - gradlePlugin { website = providers.gradleProperty("POM_URL") vcsUrl = providers.gradleProperty("POM_URL") @@ -93,6 +88,14 @@ dependencies { testImplementation("org.junit.platform:junit-platform-suite-engine") } +tasks.withType().configureEach { + options.release = 8 +} + +tasks.withType().configureEach { + options.release = 8 +} + tasks.withType().configureEach { useJUnitPlatform() From b6f5676e25081c30286df02a85a5bd20410150eb Mon Sep 17 00:00:00 2001 From: Zongle Wang Date: Wed, 22 Oct 2025 12:10:35 +0800 Subject: [PATCH 2/4] Always test on the latest Java (#1819) (cherry picked from commit 7dec2519dd895d03c2953dd7ec6e01e5e5185b96) --- .github/workflows/.java-version | 1 + .github/workflows/ci.yml | 21 ++++----------------- .github/workflows/release.yml | 2 +- 3 files changed, 6 insertions(+), 18 deletions(-) create mode 100644 .github/workflows/.java-version diff --git a/.github/workflows/.java-version b/.github/workflows/.java-version new file mode 100644 index 000000000..a45fd52cc --- /dev/null +++ b/.github/workflows/.java-version @@ -0,0 +1 @@ +24 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 773006448..63726a1e1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,32 +11,19 @@ on: jobs: build: - name: OS=${{ matrix.os }}, Java=${{ matrix.java }}, Gradle=${{ matrix.gradle }} + name: OS=${{ matrix.os }}, Gradle=${{ matrix.gradle }} strategy: matrix: - os: [ ubuntu-24.04-arm ] - # Always test on the latest version and some LTS. - java: [ 17, 25 ] + os: [ ubuntu-24.04-arm, windows-latest ] # Test on the minimum Gradle version and the latest. gradle: [ 8.3, current ] - exclude: - # Gradle 8.3 doesn't support Java 25. - - gradle: 8.3 - java: 25 - include: - - os: windows-latest - gradle: 8.3 - java: 17 - - os: windows-latest - gradle: current - java: 21 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v5 - uses: actions/setup-java@v5 with: distribution: 'zulu' - java-version: ${{ matrix.java }} + java-version-file: .github/workflows/.java-version - uses: gradle/actions/setup-gradle@v5 - run: ./gradlew build "-PtestGradleVersion=${{ matrix.gradle }}" --stacktrace @@ -65,7 +52,7 @@ jobs: - uses: actions/setup-java@v5 with: distribution: 'zulu' - java-version: 21 + java-version-file: .github/workflows/.java-version - uses: gradle/actions/setup-gradle@v5 with: cache-read-only: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0ab967947..3e7d89130 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-java@v5 with: distribution: 'zulu' - java-version: 21 + java-version-file: .github/workflows/.java-version - uses: gradle/actions/setup-gradle@v5 with: cache-read-only: true From 85b17cf5450c782bdd9ec06cbafe67de7735ec82 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 28 Oct 2025 10:03:06 +0000 Subject: [PATCH 3/4] Update dependency java to v25 (#1821) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit f1f19481c50904aecaaf74389c8c3ac8f36b3247) --- .github/workflows/.java-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/.java-version b/.github/workflows/.java-version index a45fd52cc..7273c0fa8 100644 --- a/.github/workflows/.java-version +++ b/.github/workflows/.java-version @@ -1 +1 @@ -24 +25 From a7c0b0c1d374b3e3f3031d2a79e5d14ee1d303c3 Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 30 Oct 2025 10:33:30 +0800 Subject: [PATCH 4/4] Revert "Pin JDK release for AbstractCompile on 8" This reverts commit 09dab0a9dd61ddfea9e3c7447cab2c1d2fbeaef9. --- build.gradle.kts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 187137a52..36817112a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,6 +15,11 @@ version = providers.gradleProperty("VERSION_NAME").get() group = providers.gradleProperty("GROUP").get() description = providers.gradleProperty("POM_DESCRIPTION").get() +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + gradlePlugin { website = providers.gradleProperty("POM_URL") vcsUrl = providers.gradleProperty("POM_URL") @@ -88,14 +93,6 @@ dependencies { testImplementation("org.junit.platform:junit-platform-suite-engine") } -tasks.withType().configureEach { - options.release = 8 -} - -tasks.withType().configureEach { - options.release = 8 -} - tasks.withType().configureEach { useJUnitPlatform()