This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 067073673e GROOVY-11592: Bump asm to 9.8
067073673e is described below
commit 067073673e3887d845c67ba820eca0661baac771
Author: Paul King <[email protected]>
AuthorDate: Sun Mar 30 07:25:35 2025 +1000
GROOVY-11592: Bump asm to 9.8
---
src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java | 5 ++++-
src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java | 4 ++--
versions.properties | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git
a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index ff8115e060..4d086b7523 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -107,6 +107,8 @@ public class CompilerConfiguration {
public static final String JDK23 = "23";
/** This (<code>"24"</code>) is the value for targetBytecode to compile
for a JDK 24. */
public static final String JDK24 = "24";
+ /** This (<code>"24"</code>) is the value for targetBytecode to compile
for a JDK 24. */
+ public static final String JDK25 = "25";
/**
* JDK version to bytecode version mapping.
@@ -125,7 +127,8 @@ public class CompilerConfiguration {
JDK21, Opcodes.V21,
JDK22, Opcodes.V22,
JDK23, Opcodes.V23,
- JDK24, Opcodes.V24
+ JDK24, Opcodes.V24,
+ JDK25, Opcodes.V25
);
public static final String DEFAULT_TARGET_BYTECODE =
defaultTargetBytecode();
diff --git
a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
index 2d0b4d6437..5eb2a117a8 100644
--- a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
+++ b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
@@ -297,8 +297,8 @@ public final class CompilerConfigurationTest {
@Test // GROOVY-10278
public void testTargetVersion() {
CompilerConfiguration config = new CompilerConfiguration();
- String[] inputs = {"1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9",
"5" , "6" , "7" , "8" , "9" , "9.0", "10", "11", "12", "13", "14", "15", "16",
"17", "18", "19", "20", "21", "22", "23", "24", "25"};
- String[] expect = {"11" , "11" , "11" , "11" , "11" , "11" , "11" ,
"11", "11", "11", "11", "11", "11" , "11", "11", "12", "13", "14", "15", "16",
"17", "18", "19", "20", "21", "22", "23", "24", "24"};
+ String[] inputs = {"1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9",
"5" , "6" , "7" , "8" , "9" , "9.0", "10", "11", "12", "13", "14", "15", "16",
"17", "18", "19", "20", "21", "22", "23", "24", "25", "26"};
+ String[] expect = {"11" , "11" , "11" , "11" , "11" , "11" , "11" ,
"11", "11", "11", "11", "11", "11" , "11", "11", "12", "13", "14", "15", "16",
"17", "18", "19", "20", "21", "22", "23", "24", "25", "25"};
assertArrayEquals(expect, Arrays.stream(inputs).map(v -> {
config.setTargetBytecode(v); return config.getTargetBytecode();
}).toArray(String[]::new));
}
}
diff --git a/versions.properties b/versions.properties
index aa3a64817a..cfaeede807 100644
--- a/versions.properties
+++ b/versions.properties
@@ -20,7 +20,7 @@ asciidoctorDiagram=2.2.17
asciidoctorGroovyDsl=2.0.2
asciidoctorPdf=2.3.19
asciidoctorj=2.5.11
-asm=9.7.1
+asm=9.8
bridger=1.6.Final
checkstyle=10.21.4
cobertura=1.9.4.1
