You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2022/02/14 07:12:00 UTC
[groovy] branch GROOVY_2_5_X updated: Add support for Java 15 target
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_2_5_X by this push:
new 9badad5 Add support for Java 15 target
9badad5 is described below
commit 9badad5f0aa8025804d8f9cc13ae6be4463e8d3c
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Mon Feb 7 12:32:54 2022 -0600
Add support for Java 15 target
---
.travis.yml | 2 +-
build.gradle | 2 +-
.../groovy/control/CompilerConfiguration.java | 40 ++++++++++++----------
3 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 4f7a2ae..6d9833b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ dist: trusty
matrix:
include:
- - jdk: openjdk14
+ - jdk: openjdk15
- jdk: openjdk11
- jdk: oraclejdk8
- jdk: openjdk7
diff --git a/build.gradle b/build.gradle
index de915c9..2a9c0bf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -143,7 +143,7 @@ configurations {
ext {
antVersion = '1.9.15'
- asmVersion = '7.3.1'
+ asmVersion = '8.0.1'
antlrVersion = '2.7.7'
bridgerVersion = '1.5.Final'
coberturaVersion = '1.9.4.1'
diff --git a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index 1b5f1d3..b649f17 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -49,28 +49,30 @@ public class CompilerConfiguration {
/** This (<code>"indy"</code>) is the Optimization Option value for enabling <code>invokedynamic</code> compilation. */
public static final String INVOKEDYNAMIC = "indy";
- /** This (<code>"1.4"</code>) is the value for targetBytecode to compile for a JDK 1.4. **/
+ /** This (<code>"1.4"</code>) is the value for targetBytecode to compile for a JDK 1.4. */
public static final String JDK4 = "1.4";
- /** This (<code>"1.5"</code>) is the value for targetBytecode to compile for a JDK 1.5. **/
+ /** This (<code>"1.5"</code>) is the value for targetBytecode to compile for a JDK 1.5. */
public static final String JDK5 = "1.5";
- /** This (<code>"1.6"</code>) is the value for targetBytecode to compile for a JDK 1.6. **/
+ /** This (<code>"1.6"</code>) is the value for targetBytecode to compile for a JDK 1.6. */
public static final String JDK6 = "1.6";
- /** This (<code>"1.7"</code>) is the value for targetBytecode to compile for a JDK 1.7. **/
+ /** This (<code>"1.7"</code>) is the value for targetBytecode to compile for a JDK 1.7. */
public static final String JDK7 = "1.7";
- /** This (<code>"1.8"</code>) is the value for targetBytecode to compile for a JDK 1.8. **/
+ /** This (<code>"1.8"</code>) is the value for targetBytecode to compile for a JDK 1.8. */
public static final String JDK8 = "1.8";
- /** This (<code>"9"</code>) is the value for targetBytecode to compile for a JDK 9. **/
+ /** This (<code>"9"</code>) is the value for targetBytecode to compile for a JDK 9. */
public static final String JDK9 = "9";
- /** This (<code>"10"</code>) is the value for targetBytecode to compile for a JDK 10. **/
+ /** This (<code>"10"</code>) is the value for targetBytecode to compile for a JDK 10. */
public static final String JDK10 = "10";
- /** This (<code>"11"</code>) is the value for targetBytecode to compile for a JDK 11. **/
+ /** This (<code>"11"</code>) is the value for targetBytecode to compile for a JDK 11. */
public static final String JDK11 = "11";
- /** This (<code>"12"</code>) is the value for targetBytecode to compile for a JDK 12. **/
+ /** This (<code>"12"</code>) is the value for targetBytecode to compile for a JDK 12. */
public static final String JDK12 = "12";
- /** This (<code>"13"</code>) is the value for targetBytecode to compile for a JDK 13. **/
+ /** This (<code>"13"</code>) is the value for targetBytecode to compile for a JDK 13. */
public static final String JDK13 = "13";
- /** This (<code>"14"</code>) is the value for targetBytecode to compile for a JDK 14. **/
+ /** This (<code>"14"</code>) is the value for targetBytecode to compile for a JDK 14. */
public static final String JDK14 = "14";
+ /** This (<code>"15"</code>) is the value for targetBytecode to compile for a JDK 15. */
+ public static final String JDK15 = "15";
/**
* This constant is for comparing targetBytecode to ensure it is set to JDK 1.5 or later.
@@ -100,7 +102,8 @@ public class CompilerConfiguration {
JDK11, Opcodes.V11,
JDK12, Opcodes.V12,
JDK13, Opcodes.V13,
- JDK14, Opcodes.V14
+ JDK14, Opcodes.V14,
+ JDK15, Opcodes.V15
);
private static final String[] EMPTY_STRING_ARRAY = new String[0];
@@ -219,6 +222,11 @@ public class CompilerConfiguration {
}
@Override
+ public void setPreviewFeatures(boolean previewFeatures) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
public void setRecompileGroovySource(boolean recompile) {
throw new UnsupportedOperationException();
}
@@ -264,17 +272,11 @@ public class CompilerConfiguration {
}
@Override
- public void setPreviewFeatures(boolean previewFeatures) {
- throw new UnsupportedOperationException();
- }
-
- @Override
public void setWarningLevel(int level) {
throw new UnsupportedOperationException();
}
};
-
/**
* See {@link WarningMessage} for levels.
*/
@@ -378,7 +380,7 @@ public class CompilerConfiguration {
private BytecodeProcessor bytecodePostprocessor;
- public static final int ASM_API_VERSION = Opcodes.ASM7;
+ public static final int ASM_API_VERSION = Opcodes.ASM8;
/**
* Sets the compiler flags/settings to default values.