Merge pull request #337 from groovy/fix-groovydoc-constructor

Fix GroovydocTool constructor for Groovy >= 4.0.27 (closes #335)

Author: keeganwitt

pom.xml

@@ -5,7 +5,7 @@
   <groupId>org.codehaus.gmavenplus</groupId>
   <artifactId>gmavenplus-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>4.3.0-SNAPSHOT</version>
+  <version>4.2.1-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/org/codehaus/gmavenplus/javaparser/LanguageLevel.java

@@ -0,0 +1,48 @@
+package org.codehaus.gmavenplus.javaparser;
+
+import java.util.Arrays;
+
+public enum LanguageLevel {
+    JAVA_1_0,
+    JAVA_1_1,
+    JAVA_1_2,
+    JAVA_1_3,
+    JAVA_1_4,
+    JAVA_5,
+    JAVA_6,
+    JAVA_7,
+    JAVA_8,
+    JAVA_9,
+    JAVA_10,
+    JAVA_10_PREVIEW,
+    JAVA_11,
+    JAVA_11_PREVIEW,
+    JAVA_12,
+    JAVA_12_PREVIEW,
+    JAVA_13,
+    JAVA_13_PREVIEW,
+    JAVA_14,
+    JAVA_14_PREVIEW,
+    JAVA_15,
+    JAVA_15_PREVIEW,
+    JAVA_16,
+    JAVA_16_PREVIEW,
+    JAVA_17,
+    JAVA_17_PREVIEW,
+    JAVA_18,
+    JAVA_19,
+    JAVA_20,
+    JAVA_21;
+
+    public static final LanguageLevel RAW = null;
+    public static final LanguageLevel POPULAR = JAVA_11;
+    public static final LanguageLevel CURRENT = JAVA_18;
+    public static final LanguageLevel BLEEDING_EDGE = JAVA_21;
+    private static final LanguageLevel[] yieldSupport = new LanguageLevel[]{
+            JAVA_1_0, JAVA_13, JAVA_13_PREVIEW, JAVA_14, JAVA_14_PREVIEW, JAVA_15, JAVA_15_PREVIEW, JAVA_16,
+            JAVA_16_PREVIEW, JAVA_17, JAVA_17_PREVIEW, JAVA_18, JAVA_19, JAVA_20, JAVA_21};
+
+    public boolean isYieldSupported() {
+        return Arrays.stream(yieldSupport).anyMatch((level) -> level == this);
+    }
+}

src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovyDocMojo.java

@@ -20,6 +20,7 @@
 import org.apache.maven.shared.model.fileset.FileSet;
 import org.apache.maven.shared.model.fileset.util.FileSetManager;
 import org.codehaus.gmavenplus.groovyworkarounds.GroovyDocTemplateInfo;
+import org.codehaus.gmavenplus.javaparser.LanguageLevel;
 import org.codehaus.gmavenplus.model.IncludeClasspath;
 import org.codehaus.gmavenplus.model.Link;
 import org.codehaus.gmavenplus.model.Scopes;
@@ -54,6 +55,21 @@
  */
 public abstract class AbstractGroovyDocMojo extends AbstractGroovySourcesMojo {
 
+    /**
+     * Groovy 5.0.0-beta-1 version.
+     */
+    protected static final Version GROOVY_5_0_0_BETA_1 = new Version(5, 0, 0, "beta-1");
+
+    /**
+     * Groovy 5.0.0-alpha-1 version.
+     */
+    protected static final Version GROOVY_5_0_0_ALPHA_1 = new Version(5, 0, 0, "alpha-1");
+
+    /**
+     * Groovy 4.0.27 version.
+     */
+    protected static final Version GROOVY_4_0_27 = new Version(4, 0, 27);
+
     /**
      * Groovy 3.0.0 alpha-4 version.
      */
@@ -97,6 +113,12 @@ public abstract class AbstractGroovyDocMojo extends AbstractGroovySourcesMojo {
     @Parameter(defaultValue = "Groovy Documentation")
     protected String footer;
 
+    /**
+     * The Java language level to use for GroovyDoc generation.
+     */
+    @Parameter
+    protected LanguageLevel languageLevel;
+
     /**
      * The page header.
      */
@@ -426,7 +448,18 @@ protected List<?> setupLinks() throws ClassNotFoundException, InvocationTargetEx
      */
     protected Object createGroovyDocTool(final Class<?> groovyDocToolClass, final Class<?> resourceManagerClass, final Properties docProperties, final Object classpathResourceManager, final List<String> sourceDirectories, final GroovyDocTemplateInfo groovyDocTemplateInfo, final List<?> groovyDocLinks) throws InvocationTargetException, IllegalAccessException, InstantiationException {
         Object groovyDocTool;
-        if (groovyAtLeast(GROOVY_1_6_0_RC2)) {
+        if ((groovyAtLeast(GROOVY_4_0_27) && groovyOlderThan(GROOVY_5_0_0_ALPHA_1)) || groovyAtLeast(GROOVY_5_0_0_BETA_1)) {
+            groovyDocTool = invokeConstructor(findConstructor(groovyDocToolClass, resourceManagerClass, String[].class, String[].class, String[].class, String[].class, List.class, String.class, Properties.class),
+                    classpathResourceManager,
+                    sourceDirectories.toArray(new String[0]),
+                    defaultDocTemplates == null ? groovyDocTemplateInfo.defaultDocTemplates() : defaultDocTemplates,
+                    defaultPackageTemplates == null ? groovyDocTemplateInfo.defaultPackageTemplates() : defaultPackageTemplates,
+                    defaultClassTemplates == null ? groovyDocTemplateInfo.defaultClassTemplates() : defaultClassTemplates,
+                    groovyDocLinks,
+                    languageLevel,
+                    docProperties
+            );
+        } else if (groovyAtLeast(GROOVY_1_6_0_RC2)) {
             groovyDocTool = invokeConstructor(findConstructor(groovyDocToolClass, resourceManagerClass, String[].class, String[].class, String[].class, String[].class, List.class, Properties.class),
                     classpathResourceManager,
                     sourceDirectories.toArray(new String[0]),