Drop feature: Mojo sourceset (#275)

Resolves #210

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Maven Plugin Development Gradle plugin - Changelog
 
+## Version 1.0
+
+This release marks the move of this plugin to the [GradleX project](https://github.com/gradlex-org).
+Consequently this is a breaking release with features being dropped, plugin ID and code coordinate changes, and the implementation language changing from Kotlin to Java.
+The minimal required Gradle version has been increased to 7.0.
+Lower versions of Gradle might be supported but are not tested.
+
+* [Fixed] [#210](https://github.com/britter/maven-plugin-development/issues/210) Drop feature: Mojo source set. It's not longer possibel to define a dedicated source set for defining the mojo. Use a dedicated project instead.
+
 ## Version 0.4.3
 
 * [Fixed] [#166](https://github.com/britter/maven-plugin-development/issues/166) Fix deprecation warnings. Thanks to https://github.com/Goooler[Zongle Wang].

README.md

@@ -6,7 +6,7 @@
 This plugin aims to fill the tiny gap for people who need to create an [Apache Maven](https://maven.apache.org) plugin from a Gradle build.
 To do this the plugin wraps around the [Maven Plugin Tools API](https://maven.apache.org/plugin-tools/) and feeds it with the right inputs from the Gradle build.
 
-Compatible with Gradle 5.5.1 or later.
+Compatible with Gradle 7.x or later.
 
 ## Features
 

src/main/kotlin/de/benediktritter/maven/plugin/development/MavenPluginDevelopmentExtension.kt

@@ -28,8 +28,6 @@ interface MavenPluginDevelopmentExtension {
         const val NAME = "mavenPlugin"
     }
 
-    val pluginSourceSet: Property<SourceSet>
-
     val groupId: Property<String>
 
     val artifactId: Property<String>

src/main/kotlin/de/benediktritter/maven/plugin/development/MavenPluginDevelopmentPlugin.kt

@@ -75,13 +75,14 @@ class MavenPluginDevelopmentPlugin : Plugin<Project> {
             runtimeDependencies.set(extension.dependencies)
         }
 
+        val main = project.extensions.getByType<SourceSetContainer>()["main"]
         val generateTask = tasks.register<GenerateMavenPluginDescriptorTask>("generateMavenPluginDescriptor") {
             group = TASK_GROUP_NAME
             description = "Generates the Maven plugin descriptor file"
 
-            classesDirs.set(extension.pluginSourceSet.map { it.output.classesDirs })
-            sourcesDirs.set(extension.pluginSourceSet.map { it.java.sourceDirectories })
-            javaClassesDir.set(extension.pluginSourceSet.flatMap { it.java.classesDirectory })
+            classesDirs.set(main.output.classesDirs)
+            sourcesDirs.set(main.java.sourceDirectories)
+            javaClassesDir.set(main.java.classesDirectory)
             upstreamProjects.convention(provider {
                 val compileClasspath = configurations.getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME)
                 compileClasspath.incoming.dependencies
@@ -112,14 +113,13 @@ class MavenPluginDevelopmentPlugin : Plugin<Project> {
             additionalMojos.set(extension.mojos)
             runtimeDependencies.set(extension.dependencies)
 
-            dependsOn(extension.pluginSourceSet.map { it.output }, generateHelpMojoTask)
+            dependsOn(main.output, generateHelpMojoTask)
         }
 
         project.afterEvaluate {
-            val sourceSet = extension.pluginSourceSet.get()
-            val jarTask: Jar? = tasks.findByName(sourceSet.jarTaskName) as Jar?
+            val jarTask: Jar? = tasks.findByName(main.jarTaskName) as Jar?
             jarTask?.from(generateTask)
-            sourceSet.java.srcDir(generateHelpMojoTask.map { it.outputDirectory })
+            main.java.srcDir(generateHelpMojoTask.map { it.outputDirectory })
         }
     }
 

src/main/kotlin/de/benediktritter/maven/plugin/development/internal/DefaultMavenPluginDevelopmentExtension.kt

@@ -30,9 +30,6 @@ import javax.inject.Inject
 
 open class DefaultMavenPluginDevelopmentExtension @Inject constructor(project: Project) : MavenPluginDevelopmentExtension {
 
-    override val pluginSourceSet: Property<SourceSet> = project.objects.property<SourceSet>()
-            .convention(project.provider { project.extensions.getByType<SourceSetContainer>()["main"] })
-
     override val groupId: Property<String> = project.objects.property<String>()
             .convention(project.provider { project.group.toString() })
 

src/test/groovy/de/benediktritter/maven/plugin/development/GradleCrossVersionTest.groovy

@@ -30,6 +30,6 @@ class GradleCrossVersionTest extends AbstractPluginFuncTest {
           .build()
 
         where:
-        gradleVersion << ["5.5.1", "5.6.4", "6.0.1", "6.9.4", "7.0.2", "7.6.4", "8.0.2"]
+        gradleVersion << ["7.0.2", "7.6.4", "8.0.2"]
     }
 }

src/test/groovy/de/benediktritter/maven/plugin/development/PluginDescriptorGenerationFuncTest.groovy

@@ -158,28 +158,6 @@ class PluginDescriptorGenerationFuncTest extends AbstractPluginFuncTest {
         helpDescriptor.hasGoal("touch")
     }
 
-    def "generates a plugin descriptor and help descriptor for a different source set"() {
-        given:
-        buildFile << """
-            def mojoSourceSet = sourceSets.create('mojo')
-            mavenPlugin {
-                pluginSourceSet = mojoSourceSet
-            }
-            dependencies {
-                mojoImplementation 'org.apache.maven:maven-plugin-api:3.6.3'
-                mojoImplementation 'org.apache.maven.plugin-tools:maven-plugin-annotations:3.6.0'
-            }
-        """
-        javaMojo("mojo")
-
-        when:
-        run("generateMavenPluginDescriptor")
-
-        then:
-        pluginDescriptor()
-        helpDescriptor()
-    }
-
     def "adds direct and transitive runtime dependencies to plugin descriptor"() {
         given:
         buildFile << """