Support CC in ShadowExtension.component

Goooler · Mar 2, 2023 · 6bbc401 · 6bbc401
1 parent 85b9e06
commit 6bbc401
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 30 deletions.
diff --git a/src/docs/publishing/README.md b/src/docs/publishing/README.md
@@ -16,7 +16,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
 publishing {
   publications {
     shadow(MavenPublication) { publication ->
-      project.shadow.component(publication)
+      project.shadow.component(project, publication)
     }
   }
   repositories {

diff --git a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowBasePlugin.groovy b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowBasePlugin.groovy
@@ -16,7 +16,7 @@ class ShadowBasePlugin implements Plugin<Project> {
         if (GradleVersion.current() < GradleVersion.version("8.0")) {
             throw new GradleException("This version of Shadow supports Gradle 8.0+ only. Please upgrade.")
         }
-        project.extensions.create(EXTENSION_NAME, ShadowExtension, project)
+        project.extensions.create(EXTENSION_NAME, ShadowExtension)
         createShadowConfiguration(project)
 
         project.tasks.register(KnowsTask.NAME, KnowsTask) { knows ->

diff --git a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowExtension.groovy b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowExtension.groovy
@@ -3,42 +3,50 @@ package com.github.jengelman.gradle.plugins.shadow
 import org.gradle.api.Project
 import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.artifacts.SelfResolvingDependency
-import org.gradle.api.file.CopySpec
 import org.gradle.api.publish.maven.MavenPom
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.util.GradleVersion
 
 class ShadowExtension {
 
-    CopySpec applicationDistribution
-    Project project
-
-    ShadowExtension(Project project) {
-        this.project = project
-        applicationDistribution = project.copySpec {}
-    }
-
-    void component(MavenPublication publication) {
+    void component(Project project, MavenPublication publication) {
 
         if (GradleVersion.current() >= GradleVersion.version("6.6")) {
             publication.artifact(project.tasks.named("shadowJar"))
         } else {
             publication.artifact(project.tasks.shadowJar)
         }
 
+        final def allDependencies = project.provider {
+            project.configurations.shadow.allDependencies.collect {
+                if ((it instanceof ProjectDependency) || ! (it instanceof SelfResolvingDependency)) {
+                    new Dep(it.group, it.name, it.version)
+                }
+            }
+        }
         publication.pom { MavenPom pom ->
             pom.withXml { xml ->
                 def dependenciesNode = xml.asNode().get('dependencies') ?: xml.asNode().appendNode('dependencies')
-                project.configurations.shadow.allDependencies.each {
-                    if ((it instanceof ProjectDependency) || ! (it instanceof SelfResolvingDependency)) {
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', it.group)
-                        dependencyNode.appendNode('artifactId', it.name)
-                        dependencyNode.appendNode('version', it.version)
-                        dependencyNode.appendNode('scope', 'runtime')
-                    }
+                allDependencies.get().each {
+                    def dependencyNode = dependenciesNode.appendNode('dependency')
+                    dependencyNode.appendNode('groupId', it.group)
+                    dependencyNode.appendNode('artifactId', it.name)
+                    dependencyNode.appendNode('version', it.version)
+                    dependencyNode.appendNode('scope', 'runtime')
                 }
             }
         }
     }
+
+    private class Dep {
+        String group
+        String name
+        String version
+
+        Dep(String group, String name, String version) {
+            this.group = group
+            this.name = name
+            this.version = version
+        }
+    }
 }
diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/PublishingSpec.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/PublishingSpec.groovy
@@ -42,7 +42,7 @@ class PublishingSpec extends PluginSpecification {
             publishing {
                publications {
                    shadow(MavenPublication) { publication ->
-                       project.shadow.component(publication)
+                       project.shadow.component(project, publication)
                        artifactId = 'maven-all'
                    }
                }
@@ -52,10 +52,6 @@ class PublishingSpec extends PluginSpecification {
                    }
                }
             }
-            
-            tasks.withType(org.gradle.api.publish.maven.tasks.GenerateMavenPom).configureEach {
-                notCompatibleWithConfigurationCache('https://github.com/gradle/gradle/issues/21926')
-            }
         """.stripIndent()
 
         when:
@@ -148,15 +144,11 @@ class PublishingSpec extends PluginSpecification {
             publishing {
                publications {
                    shadow(MavenPublication) { publication ->
-                       project.shadow.component(publication)
+                       project.shadow.component(project, publication)
                        artifactId = 'maven-all'
                    }
                }
             }
-            
-            tasks.withType(org.gradle.api.publish.maven.tasks.GenerateMavenPom).configureEach {
-                notCompatibleWithConfigurationCache('https://github.com/gradle/gradle/issues/21926')
-            }
         """.stripMargin()
 
         when: