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 2020/04/15 04:13:35 UTC

[groovy] branch GROOVY_3_0_X updated (b47ec55 -> 87d2ca7)

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a change to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.


    from b47ec55  GROOVY-9504: Add support for Path to slurper classes(closes #1220)
     new 4e07db3  GROOVY-9505: Bump ASM_API_VERSION to Opcodes.ASM8 (closes #1222)
     new f568734  GROOVY-9508: groovyConsole CLI plumbing for --enable-preview command-line switch is missing one part
     new 87d2ca7  GROOVY-9505: improve comment

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java | 5 ++++-
 .../groovy-console/src/main/groovy/groovy/console/ui/Console.groovy  | 1 +
 .../src/main/resources/groovy/console/ui/Console.properties          | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)


[groovy] 01/03: GROOVY-9505: Bump ASM_API_VERSION to Opcodes.ASM8 (closes #1222)

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 4e07db3cb1bd5b328c596ced7d69c3760e0ffbce
Author: Kamil Jedrzejuk <ka...@gmail.com>
AuthorDate: Mon Apr 13 15:58:18 2020 +0200

    GROOVY-9505: Bump ASM_API_VERSION to Opcodes.ASM8 (closes #1222)
---
 src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index bce0c8f..2d8bfb3 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -122,7 +122,10 @@ public class CompilerConfiguration {
      */
     public static final String[] ALLOWED_JDKS = JDK_TO_BYTECODE_VERSION_MAP.keySet().toArray(new String[JDK_TO_BYTECODE_VERSION_MAP.size()]);
 
-    public static final int ASM_API_VERSION = Opcodes.ASM7;
+    /**
+    * The valid instruction sets.
+    */
+    public static final int ASM_API_VERSION = Opcodes.ASM8;
 
     /**
      * The default source encoding.


[groovy] 03/03: GROOVY-9505: improve comment

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 87d2ca799af7a9c18974ea95f05c698601b140fa
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Apr 15 13:26:44 2020 +1000

    GROOVY-9505: improve comment
---
 src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index 2d8bfb3..3e7e58f 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -123,7 +123,7 @@ public class CompilerConfiguration {
     public static final String[] ALLOWED_JDKS = JDK_TO_BYTECODE_VERSION_MAP.keySet().toArray(new String[JDK_TO_BYTECODE_VERSION_MAP.size()]);
 
     /**
-    * The valid instruction sets.
+    * The ASM api version to use when loading/parsing classes, and generating proxy adapter classes.
     */
     public static final int ASM_API_VERSION = Opcodes.ASM8;
 


[groovy] 02/03: GROOVY-9508: groovyConsole CLI plumbing for --enable-preview command-line switch is missing one part

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit f56873452f8b453d3d702652eb1ced7bdb3ea050
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Apr 15 13:24:06 2020 +1000

    GROOVY-9508: groovyConsole CLI plumbing for --enable-preview command-line switch is missing one part
---
 .../groovy-console/src/main/groovy/groovy/console/ui/Console.groovy     | 1 +
 .../src/main/resources/groovy/console/ui/Console.properties             | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/subprojects/groovy-console/src/main/groovy/groovy/console/ui/Console.groovy b/subprojects/groovy-console/src/main/groovy/groovy/console/ui/Console.groovy
index 24d74be..3ccf41f 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/console/ui/Console.groovy
+++ b/subprojects/groovy-console/src/main/groovy/groovy/console/ui/Console.groovy
@@ -245,6 +245,7 @@ class Console implements CaretListener, HyperlinkListener, ComponentListener, Fo
             h(longOpt: 'help', messages['cli.option.help.description'])
             V(longOpt: 'version', messages['cli.option.version.description'])
             pa(longOpt: 'parameters', messages['cli.option.parameters.description'])
+            pr(longOpt: 'enable-preview', messages['cli.option.enable.preview.description'])
             i(longOpt: 'indy', messages['cli.option.indy.description'])
             D(longOpt: 'define', type: Map, argName: 'name=value', messages['cli.option.define.description'])
             _(longOpt: 'configscript', args: 1, messages['cli.option.configscript.description'])
diff --git a/subprojects/groovy-console/src/main/resources/groovy/console/ui/Console.properties b/subprojects/groovy-console/src/main/resources/groovy/console/ui/Console.properties
index 6c443b7..56371c2 100644
--- a/subprojects/groovy-console/src/main/resources/groovy/console/ui/Console.properties
+++ b/subprojects/groovy-console/src/main/resources/groovy/console/ui/Console.properties
@@ -26,6 +26,8 @@ cli.option.cp.description=Aliases for '-classpath'
 
 cli.option.classpath.description=Specify where to find the class files - must be first argument
 
+cli.option.enable.preview.description=Enable preview Java features (JEP 12) (jdk12+ only) - must be after classpath but before other arguments
+
 cli.option.parameters.description=Generate metadata for reflection on method parameter names (jdk8+ only)
 
 cli.option.indy.description=Enable InvokeDynamic (Indy) compilation for scripts