Complex plugin setup fix

src/main/groovy/nebula/plugin/publishing/PublicationBase.groovy

@@ -0,0 +1,87 @@
+package nebula.plugin.publishing
+
+import nebula.plugin.publishing.ivy.IvyBasePublishPlugin
+import nebula.plugin.publishing.maven.MavenBasePublishPlugin
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.Task
+import org.gradle.api.publish.ivy.IvyPublication
+import org.gradle.api.publish.ivy.plugins.IvyPublishPlugin
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
+
+trait PublicationBase implements Plugin<Project>, StandardTextValues {
+
+    /**
+     * Checks to see if the task already exists or not on the project.  If it does not, then it creates it.
+     * @param project project to add the task too
+     * @param task Map configuration of the task to create
+     * @return Null if it was not created, the task object if it was.
+     */
+    Task addTaskLocal(Project project, Map<String, ?> task) {
+        if (!project.tasks.findByName(task.get('name').toString())) {
+            project.tasks.create(task)
+        } else {
+            null
+        }
+    }
+
+    void checkAddMavenPublish(Project project, Task createdTask) {
+        project.plugins.withType(MavenPublishPlugin) {
+            project.plugins.apply(MavenBasePublishPlugin)
+
+            project.publishing.publications {
+                nebula(MavenPublication) {
+                    artifact createdTask
+                }
+            }
+        }
+    }
+
+    void checkAddIvyPublish(Project project, Task createdTask, String classifier) {
+        project.plugins.withType(IvyPublishPlugin) {
+            project.plugins.apply(IvyBasePublishPlugin)
+
+            project.publishing.publications {
+                nebulaIvy(IvyPublication) {
+                    artifact(createdTask) {
+                        type classifier
+                        conf classifier
+                    }
+                }
+            }
+        }
+    }
+
+    void buildConfigureTask(Project project, Task createdTask, String classifierString, String dependsOnTask,
+                            String artifactExtension, boolean fromSources = false, sourceSetNames = []) {
+
+        if (createdTask != null) {
+            /*
+             the addTaskLocal checks to see if the task already exists or not.  If it returns null,
+             that means it did not create the task.  If it returned the task object, then it created it
+             We dont want to configure things if we didn't create the task
+            */
+
+            // this means it was just created correctly, now reprocess it
+            def dependsOnTaskObject = project.tasks.getByName(dependsOnTask)
+
+            createdTask.configure {
+                dependsOn dependsOnTaskObject
+                if (fromSources) {
+                    sourceSetNames.each {
+                        from project.sourceSets.findByName(it).allSource
+                    }
+                } else {
+                    from dependsOnTaskObject.destinationDir
+                }
+
+                classifier classifierString
+                extension artifactExtension
+            }
+
+            checkAddMavenPublish(project, createdTask)
+            checkAddIvyPublish(project, createdTask, classifierString)
+        }
+    }
+}

src/main/groovy/nebula/plugin/publishing/StandardTextValues.groovy

@@ -0,0 +1,29 @@
+package nebula.plugin.publishing
+
+
+interface StandardTextValues {
+    public static final String CORE_GROUP_BUILD = "build"
+
+    public static final String CORE_TASK_GROOVYDOC = "groovydoc"
+    public static final String CORE_TASK_JAVADOC = "javadoc"
+    public static final String CORE_TASK_SCALADOC = "scaladoc"
+    public static final String CORE_TASK_CLASSES = "classes"
+
+
+    public static final String TASK_NAME_GROOVYDOC_JAR = "groovydocJar"
+    public static final String TASK_DESC_GROOVYDOC_JAR = "Jars the groovydoc files for the project"
+    public static final String TASK_NAME_JAVADOC_JAR = "javadocJar"
+    public static final String TASK_DESC_JAVADOC_JAR = "Jars the javadoc files for the project"
+    public static final String TASK_NAME_SCALADOC_JAR = "scaladocJar"
+    public static final String TASK_DESC_SCALADOC_JAR = "Jars the groovydoc files for the project"
+
+    public static final String TASK_NAME_SOURCE_JAR = "sourceJar"
+    public static final String TASK_DESC_SOURCE_JAR = "Jars the source files for the project"
+
+    public static final String ARCHIVE_CLASSIFIER_GROOVYDOC = "groovydoc"
+    public static final String ARCHIVE_CLASSIFIER_SOURCES = "sources"
+    public static final String ARCHIVE_CLASSIFIER_JAVADOC = "javadoc"
+    public static final String ARCHIVE_CLASSIFIER_SCALADOC = "scaladoc"
+
+    public static final String EXTENSION_JAR = "jar"
+}

src/main/groovy/nebula/plugin/publishing/publications/GroovydocJarPlugin.groovy

@@ -0,0 +1,21 @@
+package nebula.plugin.publishing.publications
+
+import nebula.plugin.publishing.PublicationBase
+import org.gradle.api.Project
+import org.gradle.api.plugins.GroovyPlugin
+import org.gradle.api.tasks.bundling.Jar
+
+class GroovydocJarPlugin implements PublicationBase {
+    @Override
+    void apply(Project project) {
+        project.plugins.withType(GroovyPlugin) {
+
+            def groovyJar = addTaskLocal(project, [name       : TASK_NAME_GROOVYDOC_JAR,
+                                                   description: TASK_DESC_GROOVYDOC_JAR,
+                                                   group      : CORE_GROUP_BUILD,
+                                                   type       : Jar])
+
+            buildConfigureTask(project, groovyJar, ARCHIVE_CLASSIFIER_GROOVYDOC, CORE_TASK_GROOVYDOC, EXTENSION_JAR)
+        }
+    }
+}

src/main/groovy/nebula/plugin/publishing/publications/JavadocJarPlugin.groovy

@@ -14,55 +14,23 @@
  * limitations under the License.
  */
 package nebula.plugin.publishing.publications
-import nebula.plugin.publishing.ivy.IvyBasePublishPlugin
-import nebula.plugin.publishing.maven.MavenBasePublishPlugin
-import org.gradle.api.Plugin
+
+import nebula.plugin.publishing.PublicationBase
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.publish.ivy.IvyPublication
-import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.tasks.bundling.Jar
-import org.gradle.api.tasks.javadoc.Javadoc
 
-class JavadocJarPlugin implements Plugin<Project> {
+class JavadocJarPlugin implements PublicationBase {
     @Override
     void apply(Project project) {
         project.plugins.withType(JavaPlugin) {
-            Javadoc javadocTask = (Javadoc) project.tasks.getByName('javadoc')
-            project.tasks.create('javadocJar', Jar) {
-                dependsOn javadocTask
-                from javadocTask.destinationDir
-                classifier 'javadoc'
-                extension 'jar'
-                group 'build'
-            }
-
-            project.plugins.withType(org.gradle.api.publish.maven.plugins.MavenPublishPlugin) {
-                project.plugins.apply(MavenBasePublishPlugin)
-
-                project.publishing {
-                    publications {
-                        nebula(MavenPublication) {
-                            artifact project.tasks.javadocJar
-                        }
-                    }
-                }
-            }
 
-            project.plugins.withType(org.gradle.api.publish.ivy.plugins.IvyPublishPlugin) {
-                project.plugins.apply(IvyBasePublishPlugin)
+            def javadocJar = addTaskLocal(project, [name       : TASK_NAME_JAVADOC_JAR,
+                                                    description: TASK_DESC_JAVADOC_JAR,
+                                                    group      : CORE_GROUP_BUILD,
+                                                    type       : Jar])
 
-                project.publishing {
-                    publications {
-                        nebulaIvy(IvyPublication) {
-                            artifact(project.tasks.javadocJar) {
-                                type 'javadoc'
-                                conf 'javadoc'
-                            }
-                        }
-                    }
-                }
-            }
+            buildConfigureTask(project, javadocJar, ARCHIVE_CLASSIFIER_JAVADOC, CORE_TASK_JAVADOC, EXTENSION_JAR)
         }
     }
 }

src/main/groovy/nebula/plugin/publishing/publications/ScaladocJarPlugin.groovy

@@ -0,0 +1,21 @@
+package nebula.plugin.publishing.publications
+
+import nebula.plugin.publishing.PublicationBase
+import org.gradle.api.Project
+import org.gradle.api.plugins.scala.ScalaPlugin
+import org.gradle.api.tasks.bundling.Jar
+
+class ScaladocJarPlugin implements PublicationBase {
+    @Override
+    void apply(Project project) {
+        project.plugins.withType(ScalaPlugin) {
+
+            def scalaJar = addTaskLocal(project, [name       : TASK_NAME_SCALADOC_JAR,
+                                                  description: TASK_DESC_SCALADOC_JAR,
+                                                  group      : CORE_GROUP_BUILD,
+                                                  type       : Jar])
+
+            buildConfigureTask(project, scalaJar, ARCHIVE_CLASSIFIER_SCALADOC, CORE_TASK_SCALADOC, EXTENSION_JAR)
+        }
+    }
+}

src/main/groovy/nebula/plugin/publishing/publications/SourceJarPlugin.groovy

@@ -15,53 +15,22 @@
  */
 package nebula.plugin.publishing.publications
 
-import nebula.plugin.publishing.ivy.IvyBasePublishPlugin
-import nebula.plugin.publishing.maven.MavenBasePublishPlugin
-import org.gradle.api.Plugin
+import nebula.plugin.publishing.PublicationBase
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.publish.ivy.IvyPublication
-import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.tasks.bundling.Jar
 
-class SourceJarPlugin implements Plugin<Project> {
+class SourceJarPlugin implements PublicationBase {
     @Override
     void apply(Project project) {
         project.plugins.withType(JavaPlugin) {
-            project.tasks.create('sourceJar', Jar) {
-                dependsOn project.tasks.getByName('classes')
-                from project.sourceSets.main.allSource
-                classifier 'sources'
-                extension 'jar'
-                group 'build'
-            }
 
-            project.plugins.withType(org.gradle.api.publish.maven.plugins.MavenPublishPlugin) {
-                project.plugins.apply(MavenBasePublishPlugin)
+            def sourceJar = addTaskLocal(project, [name       : TASK_NAME_SOURCE_JAR,
+                                                   description: TASK_DESC_SOURCE_JAR,
+                                                   group      : CORE_GROUP_BUILD,
+                                                   type       : Jar])
 
-                project.publishing {
-                    publications {
-                        nebula(MavenPublication) {
-                            artifact project.tasks.sourceJar
-                        }
-                    }
-                }
-            }
-
-            project.plugins.withType(org.gradle.api.publish.ivy.plugins.IvyPublishPlugin) {
-                project.plugins.apply(IvyBasePublishPlugin)
-
-                project.publishing {
-                    publications {
-                        nebulaIvy(IvyPublication) {
-                            artifact(project.tasks.sourceJar) {
-                                type 'sources'
-                                conf 'sources'
-                            }
-                        }
-                    }
-                }
-            }
+            buildConfigureTask(project, sourceJar, ARCHIVE_CLASSIFIER_SOURCES, CORE_TASK_CLASSES, EXTENSION_JAR, true, ['main'])
         }
     }
 }

src/main/resources/META-INF/gradle-plugins/nebula.groovydoc-jar.properties

@@ -0,0 +1 @@
+implementation-class=nebula.plugin.publishing.publications.GroovydocJarPlugin

src/main/resources/META-INF/gradle-plugins/nebula.scaladoc-jar.properties

@@ -0,0 +1 @@
+implementation-class=nebula.plugin.publishing.publications.ScaladocJarPlugin