Add support for Gradle 8 in source jar plugin

nebula-plugins · Dec 13, 2022 · 5bd6112 · 5bd6112
1 parent 53a68cd
commit 5bd6112
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 plugins {
-    id 'com.netflix.nebula.plugin-plugin' version '20.0.0'
+    id 'com.netflix.nebula.plugin-plugin' version '20.1.0'
 }
 
 description 'Gradle plugin to ease use of ivy-publish and maven-publish'

diff --git a/src/main/groovy/nebula/plugin/publishing/publications/SourceJarPlugin.groovy b/src/main/groovy/nebula/plugin/publishing/publications/SourceJarPlugin.groovy
@@ -48,7 +48,13 @@ class SourceJarPlugin implements Plugin<Project> {
             ConfigurationContainer configurations = project.getConfigurations()
             JavaPluginExtension javaPluginExtension = project.extensions.getByType(JavaPluginExtension)
             SourceSet main = (SourceSet) javaPluginExtension.getSourceSets().getByName("main")
-            if(GradleVersion.current() >= GradleVersion.version("7.4-rc-1")) {
+            if(GradleVersion.current() >= GradleVersion.version("8.0-milestone-4")) {
+                FileResolver resolver = ((ProjectInternal) project).getFileResolver()
+                def taskDependencyFactory = project.getTaskDependencyFactory()
+                JvmPluginsHelper.configureDocumentationVariantWithArtifact(
+                        "sourcesElements", (String)null, "sources", Collections.emptyList(),
+                        "sourceJar", main.getAllSource(), project.components.java, configurations, tasks, this.objectFactory, resolver, taskDependencyFactory)
+            } else if(GradleVersion.current() >= GradleVersion.version("7.4-rc-1")) {
                 FileResolver resolver = ((ProjectInternal) project).getFileResolver()
                 JvmPluginsHelper.configureDocumentationVariantWithArtifact(
                         "sourcesElements", (String)null, "sources", Collections.emptyList(),

diff --git a/src/test/groovy/nebula/plugin/publishing/publications/SourceJarPluginIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/publications/SourceJarPluginIntegrationSpec.groovy
@@ -104,6 +104,19 @@ class SourceJarPluginIntegrationSpec extends IntegrationSpec {
         new File(mavenPublishDir, 'sourcetest-0.1.0-sources.jar').exists()
     }
 
+    def 'creates a source jar with maven publishing with Gradle 8'() {
+        gradleVersion = '8.0-milestone-5'
+        buildFile << '''\
+            apply plugin: 'java'
+        '''.stripIndent()
+
+        when:
+        runTasksSuccessfully('publishNebulaPublicationToTestMavenRepository')
+
+        then:
+        new File(mavenPublishDir, 'sourcetest-0.1.0-sources.jar').exists()
+    }
+
     def 'creates a source jar with ivy publishing'() {
         buildFile << '''\
             apply plugin: 'java'