You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2019/11/12 19:09:07 UTC
[groovy] branch GROOVY-8930 created (now 56744cc)
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a change to branch GROOVY-8930
in repository https://gitbox.apache.org/repos/asf/groovy.git.
at 56744cc GROOVY-8930: Ant: allow setting targetBytecode 1.6, 1.7 and 1.8
This branch includes the following new commits:
new 56744cc GROOVY-8930: Ant: allow setting targetBytecode 1.6, 1.7 and 1.8
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[groovy] 01/01: GROOVY-8930: Ant: allow setting targetBytecode 1.6,
1.7 and 1.8
Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY-8930
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 56744cc35884d09578f822a56a3ecfb1730c98e5
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Tue Nov 12 13:06:49 2019 -0600
GROOVY-8930: Ant: allow setting targetBytecode 1.6, 1.7 and 1.8
---
.../groovy/control/CompilerConfiguration.java | 41 +++++++++-------------
.../main/java/org/codehaus/groovy/ant/Groovyc.java | 24 ++++++-------
2 files changed, 28 insertions(+), 37 deletions(-)
diff --git a/src/main/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
index ed9e3b0..d977969 100644
--- a/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -37,13 +37,7 @@ import java.util.StringTokenizer;
/**
* Compilation control flags and coordination stuff.
- *
- * @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- * @author <a href="mailto:blackdrag@gmx.org">Jochen Theodorou</a>
- * @author <a href="mailto:jim@pagesmiths.com">Jim White</a>
- * @author <a href="mailto:cedric.champeau@gmail.com">Cedric Champeau</a>
*/
-
public class CompilerConfiguration {
private static final String JDK5_CLASSNAME_CHECK = "java.lang.annotation.Annotation";
@@ -62,19 +56,18 @@ public class CompilerConfiguration {
/** This (<code>"1.8"</code>) is the value for targetBytecode to compile for a JDK 1.8. **/
public static final String JDK8 = "1.8";
+ /** The valid targetBytecode values. */
+ public static final String[] ALLOWED_JDKS = {JDK4, JDK5, JDK6, JDK7, JDK8};
+
/** This (<code>"1.5"</code>) is the value for targetBytecode to compile for a JDK 1.5 or later JVM. **/
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. **/
public static final String PRE_JDK5 = JDK4;
- private static final String[] ALLOWED_JDKS = { JDK4, JDK5, JDK6, JDK7, JDK8 };
-
@Deprecated
public static final String CURRENT_JVM_VERSION = getMinBytecodeVersion();
- // Static initializers are executed in text order,
- // therefore we must do this one last!
/**
* A convenience for getting a default configuration. Do not modify it!
* See {@link #CompilerConfiguration(Properties)} for an example on how to
@@ -433,10 +426,10 @@ public class CompilerConfiguration {
//
text = configuration.getProperty("groovy.target.directory");
if (text != null) setTargetDirectory(text);
-
+
text = configuration.getProperty("groovy.target.bytecode");
if (text != null) setTargetBytecode(text);
-
+
//
// Classpath
//
@@ -729,11 +722,10 @@ public class CompilerConfiguration {
}
/**
- * Allow setting the bytecode compatibility. The parameter can take
- * one of the values <tt>1.7</tt>, <tt>1.6</tt>, <tt>1.5</tt> or <tt>1.4</tt>.
- * If wrong parameter then the value will default to VM determined version.
- *
- * @param version the bytecode compatibility mode
+ * Allow setting the bytecode compatibility level. The parameter can take
+ * one of the values in {@link #ALLOWED_JDKS}.
+ *
+ * @param version the bytecode compatibility level
*/
public void setTargetBytecode(String version) {
for (String allowedJdk : ALLOWED_JDKS) {
@@ -744,24 +736,25 @@ public class CompilerConfiguration {
}
/**
- * Retrieves the compiler bytecode compatibility mode.
- *
- * @return bytecode compatibility mode. Can be either <tt>1.5</tt> or <tt>1.4</tt>.
+ * Retrieves the compiler bytecode compatibility level.
+ * Defaults to the minimum officially supported bytecode
+ * version for any particular Groovy version.
+ *
+ * @return bytecode compatibility level
*/
public String getTargetBytecode() {
return this.targetBytecode;
}
-
+
private static String getMinBytecodeVersion() {
try {
Class.forName(JDK5_CLASSNAME_CHECK);
return POST_JDK5;
- } catch(Exception ex) {
- // IGNORE
+ } catch(Exception ignore) {
}
return PRE_JDK5;
}
-
+
/**
* Gets the joint compilation options for this configuration.
* @return the options
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
index e3766ac..672de84 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
@@ -162,15 +162,9 @@ import java.util.StringTokenizer;
* </project>
* </pre>
* <p>
- * Based heavily on the Javac implementation in Ant.
+ * Based on the implementation of the Javac task in Apache Ant.
* <p>
* Can also be used from {@link groovy.util.AntBuilder} to allow the build file to be scripted in Groovy.
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
- * @author Hein Meling
- * @author <a href="mailto:russel.winder@concertant.com">Russel Winder</a>
- * @author Danno Ferrin
- * @author Paul King
*/
public class Groovyc extends MatchingTask {
private static final URL[] EMPTY_URL_ARRAY = new URL[0];
@@ -286,20 +280,24 @@ public class Groovyc extends MatchingTask {
}
/**
- * Sets the bytecode compatibility mode
+ * Sets the bytecode compatibility level.
+ * The parameter can take one of the values in {@link CompilerConfiguration#ALLOWED_JDKS}.
*
- * @param version the bytecode compatibility mode
+ * @param version the bytecode compatibility level
*/
public void setTargetBytecode(String version) {
- if (CompilerConfiguration.PRE_JDK5.equals(version) || CompilerConfiguration.POST_JDK5.equals(version)) {
- this.targetBytecode = version;
+ for (String allowedJdk : CompilerConfiguration.ALLOWED_JDKS) {
+ if (allowedJdk.equals(version)) {
+ this.targetBytecode = version;
+ break;
+ }
}
}
/**
- * Retrieves the compiler bytecode compatibility mode.
+ * Retrieves the compiler bytecode compatibility level.
*
- * @return bytecode compatibility mode. Can be either <tt>1.5</tt> or <tt>1.4</tt>.
+ * @return bytecode compatibility level. Can be one of the values in {@link CompilerConfiguration#ALLOWED_JDKS}.
*/
public String getTargetBytecode() {
return this.targetBytecode;