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 2018/05/17 23:33:50 UTC

groovy git commit: deprecate unused constant

Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_4_X 406b9dd0a -> fc79cd3b3


deprecate unused constant


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/fc79cd3b
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/fc79cd3b
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/fc79cd3b

Branch: refs/heads/GROOVY_2_4_X
Commit: fc79cd3b3ae9475462fee96e73796741919d45ad
Parents: 406b9dd
Author: Paul King <pa...@asert.com.au>
Authored: Fri May 18 09:33:47 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Fri May 18 09:33:47 2018 +1000

----------------------------------------------------------------------
 .../org/codehaus/groovy/control/CompilerConfiguration.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/fc79cd3b/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
index ee4075c..ed9e3b0 100644
--- a/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -70,8 +70,8 @@ public class CompilerConfiguration {
 
     private static final String[] ALLOWED_JDKS = { JDK4, JDK5, JDK6, JDK7, JDK8 };
 
-    // Just call getVMVersion() once.
-    public static final String CURRENT_JVM_VERSION = getVMVersion();
+    @Deprecated
+    public static final String CURRENT_JVM_VERSION = getMinBytecodeVersion();
 
     // Static initializers are executed in text order,
     // therefore we must do this one last!
@@ -203,7 +203,7 @@ public class CompilerConfiguration {
         if(targetByteCode != null) {
             setTargetBytecode(targetByteCode);
         } else {
-            setTargetBytecode(getVMVersion());
+            setTargetBytecode(getMinBytecodeVersion());
         }
         String tmpDefaultScriptExtension = null;
         try {
@@ -752,7 +752,7 @@ public class CompilerConfiguration {
         return this.targetBytecode;
     }
     
-    private static String getVMVersion() {
+    private static String getMinBytecodeVersion() {
         try {
             Class.forName(JDK5_CLASSNAME_CHECK);
             return POST_JDK5;