Merge pull request #277 from groovy/fix-bytecode-check

Fix bytecode check condition (closes #276)
groovy · Sep 28, 2023 · f6c1c56 · f6c1c56
2 parents ae9883f + 4e44955
commit f6c1c56
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/org/codehaus/gmavenplus/mojo/AbstractCompileMojo.java b/src/main/java/org/codehaus/gmavenplus/mojo/AbstractCompileMojo.java
@@ -337,13 +337,15 @@ protected synchronized void doCompile(final Set<File> sources, final List classp
         logPluginClasspath();
         classWrangler.logGroovyVersion(mojoExecution.getMojoDescriptor().getGoal());
 
-        if (groovyVersionSupportsAction() && !skipBytecodeCheck) {
-            verifyGroovyVersionSupportsTargetBytecode();
-        } else {
+        if (!groovyVersionSupportsAction()) {
             getLog().error("Your Groovy version (" + classWrangler.getGroovyVersionString() + ") doesn't support compilation. The minimum version of Groovy required is " + minGroovyVersion + ". Skipping compiling.");
             return;
         }
 
+        if (!skipBytecodeCheck) {
+            verifyGroovyVersionSupportsTargetBytecode();
+        }
+
         // get classes we need with reflection
         Class<?> compilerConfigurationClass = classWrangler.getClass("org.codehaus.groovy.control.CompilerConfiguration");
         Class<?> compilationUnitClass = classWrangler.getClass("org.codehaus.groovy.control.CompilationUnit");

diff --git a/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGenerateStubsMojo.java b/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGenerateStubsMojo.java
@@ -295,13 +295,15 @@ protected synchronized void doStubGeneration(final Set<File> stubSources, final
         logPluginClasspath();
         classWrangler.logGroovyVersion(mojoExecution.getMojoDescriptor().getGoal());
 
-        if (groovyVersionSupportsAction() && !skipBytecodeCheck) {
-            verifyGroovyVersionSupportsTargetBytecode();
-        } else {
+        if (!groovyVersionSupportsAction()) {
             getLog().error("Your Groovy version (" + classWrangler.getGroovyVersionString() + ") doesn't support stub generation. The minimum version of Groovy required is " + minGroovyVersion + ". Skipping stub generation.");
             return;
         }
 
+        if (!skipBytecodeCheck) {
+            verifyGroovyVersionSupportsTargetBytecode();
+        }
+
         // get classes we need with reflection
         Class<?> compilerConfigurationClass = classWrangler.getClass("org.codehaus.groovy.control.CompilerConfiguration");
         Class<?> javaStubCompilationUnitClass = classWrangler.getClass("org.codehaus.groovy.tools.javac.JavaStubCompilationUnit");