GROOVY-8784: Prepare for supporting JDK 12 bytecode (plus deprecate some old constants)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/80fe7156 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/80fe7156 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/80fe7156 Branch: refs/heads/GROOVY_2_5_X Commit: 80fe715668fd61350d5ce01a40e4fbfb7718a81a Parents: b9dab0a Author: Paul King <[email protected]> Authored: Thu Sep 13 07:18:17 2018 +1000 Committer: Paul King <[email protected]> Committed: Thu Sep 13 09:15:21 2018 +1000 ---------------------------------------------------------------------- .../groovy/control/CompilerConfiguration.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/80fe7156/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 c25a229..02dc79f 100644 --- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java +++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java @@ -70,11 +70,21 @@ public class CompilerConfiguration { public static final String JDK10 = "10"; /** This (<code>"11"</code>) is the value for targetBytecode to compile for a JDK 11. **/ public static final String JDK11 = "11"; + /** This (<code>"12"</code>) is the value for targetBytecode to compile for a JDK 12. **/ + public static final String JDK12 = "12"; - /** This (<code>"1.5"</code>) is the value for targetBytecode to compile for a JDK 1.5 or later JVM. **/ + /** + * This constant is for comparing targetBytecode to ensure it is set to JDK 1.5 or later. + * @deprecated + */ + @Deprecated public static final String POST_JDK5 = JDK5; // for backwards compatibility - /** This (<code>"1.4"</code>) is the value for targetBytecode to compile for a JDK 1.4 JVM. **/ + /** + * This constant is for comparing targetBytecode to ensure it is set to an earlier value than JDK 1.5. + * @deprecated + */ + @Deprecated public static final String PRE_JDK5 = JDK4; /** JDK version to bytecode version mapping */ @@ -86,7 +96,8 @@ public class CompilerConfiguration { JDK8, Opcodes.V1_8, JDK9, Opcodes.V9, JDK10, Opcodes.V10, - JDK11, Opcodes.V11 + JDK11, Opcodes.V11, + JDK12, Opcodes.V12 ); /** An array of the valid targetBytecode values **/
