Repository: groovy Updated Branches: refs/heads/GROOVY_2_5_X 70006c7dd -> f526134ce
Minor refactoring Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/f526134c Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/f526134c Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/f526134c Branch: refs/heads/GROOVY_2_5_X Commit: f526134cecfdbbc160b0467228deb066af4444a9 Parents: 4fb9128 Author: sunlan <[email protected]> Authored: Sun Aug 27 18:50:17 2017 +0800 Committer: sunlan <[email protected]> Committed: Sun Aug 27 18:50:44 2017 +0800 ---------------------------------------------------------------------- .../groovy/control/CompilerConfiguration.java | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/f526134c/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 216d01c..39a195e 100644 --- a/src/main/org/codehaus/groovy/control/CompilerConfiguration.java +++ b/src/main/org/codehaus/groovy/control/CompilerConfiguration.java @@ -24,7 +24,17 @@ import org.codehaus.groovy.control.messages.WarningMessage; import java.io.File; import java.io.PrintWriter; -import java.util.*; +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.StringTokenizer; /** * Compilation control flags and coordination stuff. @@ -368,10 +378,7 @@ public class CompilerConfiguration { * @return true if the bytecode version is JDK 1.5+ */ public static boolean isPostJDK5(String bytecodeVersion) { - return JDK5.equals(bytecodeVersion) - || JDK6.equals(bytecodeVersion) - || JDK7.equals(bytecodeVersion) - || JDK8.equals(bytecodeVersion); + return new BigDecimal(bytecodeVersion).compareTo(new BigDecimal(JDK5)) >= 0; } /** @@ -381,8 +388,7 @@ public class CompilerConfiguration { * @return true if the bytecode version is JDK 1.7+ */ public static boolean isPostJDK7(String bytecodeVersion) { - return JDK7.equals(bytecodeVersion) - || JDK8.equals(bytecodeVersion); + return new BigDecimal(bytecodeVersion).compareTo(new BigDecimal(JDK7)) >= 0; } /**
