groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject groovy git commit: GROOVY-7827: Allow groovyc ant task to select all available target bytecode versions (minor tweaks to PR#307)
Date Sat, 23 Apr 2016 03:42:32 GMT
Repository: groovy
Updated Branches:
  refs/heads/master 7d6170918 -> 6f2a09585


GROOVY-7827: Allow groovyc ant task to select all available target bytecode versions (minor
tweaks to PR#307)


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/6f2a0958
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/6f2a0958
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/6f2a0958

Branch: refs/heads/master
Commit: 6f2a09585f6469623560ca52b50b058903f4b71f
Parents: 7d61709
Author: paulk <paulk@asert.com.au>
Authored: Sat Apr 23 13:41:31 2016 +1000
Committer: paulk <paulk@asert.com.au>
Committed: Sat Apr 23 13:41:31 2016 +1000

----------------------------------------------------------------------
 .../src/main/java/org/codehaus/groovy/ant/Groovyc.java  | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/6f2a0958/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
----------------------------------------------------------------------
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 7499428..2e8faaf 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 org.codehaus.groovy.tools.javac.JavaAwareCompilationUnit;
  * &lt;/project&gt;
  * </pre>
  * <p>
- * Based heavily on the Javac implementation in Ant.
+ * Based heavily 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];
@@ -216,7 +210,6 @@ public class Groovyc extends MatchingTask {
 
     private Set<String> scriptExtensions = new LinkedHashSet<String>();
 
-
     /**
      * If true, generates metadata for reflection on method parameter names (jdk8+ only).
 Defaults to false.
      */
@@ -302,6 +295,7 @@ public class Groovyc extends MatchingTask {
         for (String allowedJdk : CompilerConfiguration.ALLOWED_JDKS) {
             if (allowedJdk.equals(version)) {
                 this.targetBytecode = version;
+                break;
             }
         }
     }
@@ -1194,7 +1188,7 @@ public class Groovyc extends MatchingTask {
             String[] filenames = FileSystemCompiler.generateFileNamesFromOptions(cli);
             boolean fileNameErrors = filenames == null;
 
-            fileNameErrors = fileNameErrors && !FileSystemCompiler.validateFiles(filenames);
+            fileNameErrors = fileNameErrors || !FileSystemCompiler.validateFiles(filenames);
 
             if (targetBytecode != null) {
                 configuration.setTargetBytecode(targetBytecode);


Mime
View raw message