From de0c61dcae2eeb86db17db223df5e849e99c5ecd Mon Sep 17 00:00:00 2001 From: Goooler Date: Tue, 28 Feb 2023 12:28:29 +0800 Subject: [PATCH] Extract shadowConfig --- .../jengelman/gradle/plugins/shadow/ShadowBasePlugin.groovy | 6 +----- .../jengelman/gradle/plugins/shadow/ShadowExtension.groovy | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) 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 index 1f7a3a7d4..1b79b2d02 100644 --- a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowBasePlugin.groovy +++ b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowBasePlugin.groovy @@ -17,15 +17,11 @@ class ShadowBasePlugin implements Plugin { throw new GradleException("This version of Shadow supports Gradle 8.0+ only. Please upgrade.") } project.extensions.create(EXTENSION_NAME, ShadowExtension, project) - createShadowConfiguration(project) + project.configurations.create(CONFIGURATION_NAME) project.tasks.register(KnowsTask.NAME, KnowsTask) { knows -> knows.group = ShadowJavaPlugin.SHADOW_GROUP knows.description = KnowsTask.DESC } } - - private static void createShadowConfiguration(Project project) { - project.configurations.create(CONFIGURATION_NAME) - } } 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 index d0bc27906..b2eadab63 100644 --- a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowExtension.groovy +++ b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowExtension.groovy @@ -20,10 +20,11 @@ class ShadowExtension { void component(MavenPublication publication) { publication.artifact(project.tasks.named("shadowJar")) + final def shadowConfig = project.configurations.getByName(ShadowBasePlugin.CONFIGURATION_NAME) publication.pom { MavenPom pom -> pom.withXml { xml -> def dependenciesNode = xml.asNode().get('dependencies') ?: xml.asNode().appendNode('dependencies') - project.configurations.shadow.allDependencies.each { + shadowConfig.allDependencies.each { if ((it instanceof ProjectDependency) || ! (it instanceof SelfResolvingDependency)) { def dependencyNode = dependenciesNode.appendNode('dependency') dependencyNode.appendNode('groupId', it.group)