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:38:29 UTC
groovy git commit: remove unused deprecated constant
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 0ac971717 -> 9e869943c
remove unused deprecated constant
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/9e869943
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/9e869943
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/9e869943
Branch: refs/heads/GROOVY_2_6_X
Commit: 9e869943c47ed02e04b4f80919bbfcc74bbee492
Parents: 0ac9717
Author: Paul King <pa...@asert.com.au>
Authored: Fri May 18 09:38:26 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Fri May 18 09:38:26 2018 +1000
----------------------------------------------------------------------
.../org/codehaus/groovy/control/CompilerConfiguration.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/9e869943/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index 87839ba..0796384 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -87,9 +87,6 @@ public class CompilerConfiguration {
/** An array of the valid targetBytecode values **/
public static final String[] ALLOWED_JDKS = JDK_TO_BYTECODE_VERSION_MAP.keySet().toArray(new String[0]);
- // Just call getVMVersion() once.
- public static final String CURRENT_JVM_VERSION = getVMVersion();
-
private static final String GROOVY_ANTLR4_OPT = "groovy.antlr4";
/**
@@ -231,7 +228,7 @@ public class CompilerConfiguration {
setScriptBaseClass(null);
setRecompileGroovySource(false);
setMinimumRecompilationInterval(100);
- setTargetBytecode(getSystemPropertySafe("groovy.target.bytecode", getVMVersion()));
+ setTargetBytecode(getSystemPropertySafe("groovy.target.bytecode", getMinBytecodeVersion()));
setDefaultScriptExtension(getSystemPropertySafe("groovy.default.scriptExtension", ".groovy"));
// Source file encoding
@@ -778,7 +775,7 @@ public class CompilerConfiguration {
return this.targetBytecode;
}
- private static String getVMVersion() {
+ private static String getMinBytecodeVersion() {
return JDK7;
}