Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X c28b8ca84 -> 4694379ea
Minor refactoring Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/4694379e Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/4694379e Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/4694379e Branch: refs/heads/GROOVY_2_6_X Commit: 4694379eaff52fa12dc1c57a47f2090feccd678e Parents: c28b8ca Author: sunlan <[email protected]> Authored: Sun Aug 27 18:41:51 2017 +0800 Committer: sunlan <[email protected]> Committed: Sun Aug 27 18:41:51 2017 +0800 ---------------------------------------------------------------------- .../org/codehaus/groovy/control/CompilerConfiguration.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/4694379e/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 1e4cf68..fbc3d0d 100644 --- a/src/main/org/codehaus/groovy/control/CompilerConfiguration.java +++ b/src/main/org/codehaus/groovy/control/CompilerConfiguration.java @@ -26,6 +26,7 @@ import org.objectweb.asm.Opcodes; import java.io.File; import java.io.PrintWriter; +import java.math.BigDecimal; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; @@ -404,10 +405,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; } /** @@ -417,8 +415,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; } /**
