Skip to content

Add Java 25 and Gradle 9.x build compatibility for Groovy 3.0.x #2347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: GROOVY_3_0_X
Choose a base branch
from
+1,241 −352
Open

Add Java 25 and Gradle 9.x build compatibility for Groovy 3.0.x #2347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55486c9
Add Java 25 and Gradle 9.x build compatibility
jrepp Nov 30, 2025
3f6af80
Add Java toolchain support for cross-JDK testing
jrepp Nov 30, 2025
65637c9
Update CI workflows for Gradle 9.x compatibility
jrepp Nov 30, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 44 additions & 41 deletions .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,66 +17,69 @@ name: Build and test

on: [push, pull_request]

permissions:
contents: read

env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}

jobs:
test:
lts:
strategy:
fail-fast: false
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
java: [8, 11]
runs-on: ${{ matrix.os }}
java: [8, 11, 17, 21, 25]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
check-latest: true
distribution: 'zulu'
java-version: ${{ matrix.java }}
- name: Build and test with Gradle
run: ./gradlew test
java-version: '21'
check-latest: true
- uses: gradle/actions/setup-gradle@v4
- name: Test with Gradle
run: ./gradlew test -PtestJavaVersion=${{ matrix.java }}
timeout-minutes: 60
env:
GRADLE_SCANS_ACCEPT: yes
testWithIndy:
- name: Upload reports
uses: actions/upload-artifact@v4
if: always()
with:
name: build-reports-${{ matrix.java }}
path: '**/build/reports/'

additional:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
java: [8, 11, 15]
runs-on: ${{ matrix.os }}
java: [9, 10, 12, 13, 14, 15, 16, 18, 19, 20, 22, 23, 24]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
check-latest: true
distribution: 'zulu'
java-version: ${{ matrix.java }}
- name: Build and test with Gradle
run: ./gradlew testWithIndy
java-version: '21'
check-latest: true
- uses: gradle/actions/setup-gradle@v4
- name: Test with Gradle
run: ./gradlew test -PtestJavaVersion=${{ matrix.java }}
timeout-minutes: 60
env:
GRADLE_SCANS_ACCEPT: yes
testWithJEP396:

testWithIndy:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
java: [16, 17]
runs-on: ${{ matrix.os }}
java: [8, 11, 17, 21, 25]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
check-latest: true
distribution: 'zulu'
java-version: |
${{ matrix.java }}
11
- name: Build and test with Gradle
run: ./gradlew -Ptarget.java.home=$JAVA_HOME_${{ matrix.java }}_X64 testWithIndy
java-version: '21'
check-latest: true
- uses: gradle/actions/setup-gradle@v4
- name: Test with Gradle (indy)
run: ./gradlew testWithIndy -PtestJavaVersion=${{ matrix.java }}
timeout-minutes: 60
env:
GRADLE_SCANS_ACCEPT: yes
32 changes: 18 additions & 14 deletions .github/workflows/gradle-snapshot-distribution.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,35 @@ name: "Distribute Groovy SNAPSHOT"

on: [push, pull_request]

permissions:
contents: read

env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}

jobs:
dist:
strategy:
fail-fast: true
matrix:
os: [ubuntu-latest]
java: [11.0.6]
runs-on: ${{ matrix.os }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'zulu'
java-version: '21'
check-latest: true
- uses: gradle/actions/setup-gradle@v4
- name: Build and package
run: ./gradlew clean dist --no-build-cache --no-scan
run: ./gradlew clean dist --no-build-cache
timeout-minutes: 60
- name: Move binary distribution
run: mkdir target/distributions/binary/ && mv target/distributions/apache-groovy-binary-*.zip target/distributions/binary/
run: mkdir target/distributions/binary/ && mv target/distributions/apache-groovy-binary-*.zip target/distributions/binary/
- name: Move src distribution
run: mkdir target/distributions/src/ && mv target/distributions/apache-groovy-src-*.zip target/distributions/src/
run: mkdir target/distributions/src/ && mv target/distributions/apache-groovy-src-*.zip target/distributions/src/
- name: Move docs distribution
run: mkdir target/distributions/docs/ && mv target/distributions/apache-groovy-docs-*.zip target/distributions/docs/
run: mkdir target/distributions/docs/ && mv target/distributions/apache-groovy-docs-*.zip target/distributions/docs/
- name: Move sdk distribution
run: mkdir target/distributions/sdk/ && mv target/distributions/apache-groovy-sdk-*.zip target/distributions/sdk/
run: mkdir target/distributions/sdk/ && mv target/distributions/apache-groovy-sdk-*.zip target/distributions/sdk/
- name: Upload binary distribution
uses: actions/upload-artifact@v4
with:
Expand Down
21 changes: 15 additions & 6 deletions .github/workflows/grails-joint-validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,27 @@ on:
branches:
- GROOVY_3_0_X
# - master

permissions:
contents: read

env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}

jobs:
build:
strategy:
fail-fast: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: '15'
distribution: 'zulu'
java-version: '21'
check-latest: true
- uses: gradle/actions/setup-gradle@v4
- name: env
run: env

Expand All @@ -47,13 +56,13 @@ jobs:
if: ${{ (github.event_name == 'pull_request' && github.base_ref == 'GROOVY_3_0_X') || github.ref == 'refs/heads/GROOVY_3_0_X' }}

- name: Build and install groovy (no docs)
run: ./gradlew clean install -x groovydoc -x javadoc -x javadocAll -x groovydocAll -x asciidoc -x asciidocAll -x docGDK --no-build-cache --no-scan --no-daemon
run: ./gradlew clean install -x groovydoc -x javadoc -x javadocAll -x groovydocAll -x asciidoc -x asciidocAll -x docGDK --no-build-cache --no-daemon
timeout-minutes: 60

- name: Set CI_GROOVY_VERSION for Grails
run: echo "CI_GROOVY_VERSION=$(cat gradle.properties | grep groovyVersion | cut -d\= -f2 | tr -d '[:space:]')" >> $GITHUB_ENV
- name: echo CI_GROOVY_VERSION
run: echo $CI_GROOVY_VERSION
- name: Build Grails
run: cd ../grails-core && ./gradlew clean build test -x groovydoc --no-build-cache --no-scan --no-daemon
run: cd ../grails-core && ./gradlew clean build test -x groovydoc --no-build-cache --no-daemon
timeout-minutes: 60
28 changes: 17 additions & 11 deletions .github/workflows/micronaut-joint-validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,25 @@ on:
pull_request:
branches:
- GROOVY_3_0_X

permissions:
contents: read

env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}

jobs:
build:
strategy:
fail-fast: true
matrix:
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 11
distribution: 'zulu'
java-version: '21'
check-latest: true
- uses: gradle/actions/setup-gradle@v4
- name: env
run: env

Expand All @@ -49,7 +55,7 @@ jobs:
run: cd .. && git clone --depth 1 https://github.com/groovy/micronaut-groovy -b 3.5.x

- name: Build and install groovy (no docs)
run: ./gradlew --no-build-cache --no-daemon --no-scan clean install -x asciidoc -x asciidocAll -x docGDK -x groovydoc -x javadoc -x javadocAll -x groovydocAll
run: ./gradlew --no-build-cache --no-daemon clean install -x asciidoc -x asciidocAll -x docGDK -x groovydoc -x javadoc -x javadocAll -x groovydocAll
timeout-minutes: 60

- name: Set CI_GROOVY_VERSION
Expand All @@ -58,9 +64,9 @@ jobs:
run: echo $CI_GROOVY_VERSION

- name: Test Micronaut Core
run: cd ../micronaut-core && ./gradlew --init-script ../maven-local-init.gradle --no-build-cache --no-daemon --no-scan clean test -x :test-suite-kotlin:test -PgroovyVersion=$CI_GROOVY_VERSION
run: cd ../micronaut-core && ./gradlew --init-script ../maven-local-init.gradle --no-build-cache --no-daemon clean test -x :test-suite-kotlin:test -PgroovyVersion=$CI_GROOVY_VERSION
timeout-minutes: 60

- name: Check Micronaut Groovy
run: cd ../micronaut-groovy && ./gradlew --init-script ../maven-local-init.gradle --no-build-cache --no-daemon --no-scan clean check -PgroovyVersion=$CI_GROOVY_VERSION
run: cd ../micronaut-groovy && ./gradlew --init-script ../maven-local-init.gradle --no-build-cache --no-daemon clean check -PgroovyVersion=$CI_GROOVY_VERSION
timeout-minutes: 60
Loading