From 4e44955cd167a53bb11d32fc5f291a47a7237bf6 Mon Sep 17 00:00:00 2001 From: Keegan Witt Date: Thu, 28 Sep 2023 09:46:47 -0400 Subject: [PATCH] Fix bytecode check condition (closes #276) --- .../org/codehaus/gmavenplus/mojo/AbstractCompileMojo.java | 8 +++++--- .../gmavenplus/mojo/AbstractGenerateStubsMojo.java | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/codehaus/gmavenplus/mojo/AbstractCompileMojo.java b/src/main/java/org/codehaus/gmavenplus/mojo/AbstractCompileMojo.java index 602d3b04..8c44ab56 100644 --- 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 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 index 51e20451..dc3f5142 100644 --- 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 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");