You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2024/01/21 14:48:29 UTC
(groovy) 01/01: Add JDK 22-ea build
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/tweak_gawf
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 2943033473ebac2d0d5484c4e1f9490ada9355a5
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Jan 21 21:47:58 2024 +0800
Add JDK 22-ea build
---
.github/workflows/groovy-build-test-ea.yml | 5 ++---
build-logic/src/main/groovy/org.apache.groovy-tested.gradle | 4 ++++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/groovy-build-test-ea.yml b/.github/workflows/groovy-build-test-ea.yml
index ec561cbaaa..d09217956d 100644
--- a/.github/workflows/groovy-build-test-ea.yml
+++ b/.github/workflows/groovy-build-test-ea.yml
@@ -26,10 +26,9 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
- java: [17]
+ java: [21]
# The jdk links of "install-jdk.sh" are sometimes outdated, so we have to download openjdk releases from https://jdk.java.net/ by ourselves.
- jdk: ["https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-x64_bin.tar.gz",
- "https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_linux-x64_bin.tar.gz"]
+ jdk: ["https://download.java.net/java/early_access/jdk22/31/GPL/openjdk-22-ea+31_linux-x64_bin.tar.gz"]
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
diff --git a/build-logic/src/main/groovy/org.apache.groovy-tested.gradle b/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
index 7ec0b5aea7..7302140ac4 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
@@ -37,10 +37,14 @@ tasks.withType(Test).configureEach {
def grapeDirectory = new File(temporaryDir, 'grape')
def jdk8 = ['-XX:+UseConcMarkSweepGC']
def jdk9 = ['-Djava.locale.providers=COMPAT,SPI'/*, '--illegal-access=debug'*/]
+ def jdk22 = ['-Djava.locale.providers=CLDR,SPI'] /* WARNING: COMPAT locale provider will be removed in a future release */
def common = ['-ea', "-Xms${groovyJUnit_ms}", "-Xmx${groovyJUnit_mx}", '-Duser.language=en']
if (JavaVersion.current().isJava9Compatible()) {
jvmArgs(*common, *jdk9)
systemProperty 'groovy.force.illegal.access', findProperty('groovy.force.illegal.access')
+ } else if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_22)) {
+ jvmArgs(*common, *jdk22)
+ systemProperty 'groovy.force.illegal.access', findProperty('groovy.force.illegal.access')
} else {
jvmArgs(*common, *jdk8)
}