diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-21 15:03:16 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-21 15:03:16 +0000 |
| commit | 1a674e052870a891ff4eb140bf0358880b2ede76 (patch) | |
| tree | 7ed184660673e7bac61ae4cd824405bfe2ddb8f7 /buildSrc/src/main/groovy/org/jetbrains/CorrectShadowPublishing.groovy | |
| parent | b6a894185cf341bb4f01d760893bacee6b6ab4df (diff) | |
| parent | 194d376f044f4aa46b53f4c1fef75b511d37694c (diff) | |
| download | dokka-1a674e052870a891ff4eb140bf0358880b2ede76.tar.gz | |
Snap for 7478067 from 194d376f044f4aa46b53f4c1fef75b511d37694c to mainline-ipsec-releaseandroid-mainline-12.0.0_r88android-mainline-12.0.0_r73android-mainline-12.0.0_r61android-mainline-12.0.0_r45android-mainline-12.0.0_r28android-mainline-12.0.0_r118android-mainline-12.0.0_r103android-mainline-12.0.0_r10android12-mainline-ipsec-release
Change-Id: I8656a298cd471273b50ce64247ff5920066034a8
Diffstat (limited to 'buildSrc/src/main/groovy/org/jetbrains/CorrectShadowPublishing.groovy')
| -rw-r--r-- | buildSrc/src/main/groovy/org/jetbrains/CorrectShadowPublishing.groovy | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/buildSrc/src/main/groovy/org/jetbrains/CorrectShadowPublishing.groovy b/buildSrc/src/main/groovy/org/jetbrains/CorrectShadowPublishing.groovy index 58cfdcf7a..aacede449 100644 --- a/buildSrc/src/main/groovy/org/jetbrains/CorrectShadowPublishing.groovy +++ b/buildSrc/src/main/groovy/org/jetbrains/CorrectShadowPublishing.groovy @@ -4,10 +4,11 @@ import org.gradle.api.Project import org.gradle.api.artifacts.ModuleVersionIdentifier import org.gradle.api.artifacts.ProjectDependency import org.gradle.api.artifacts.SelfResolvingDependency -import org.gradle.api.publish.internal.ProjectDependencyPublicationResolver +import org.gradle.api.internal.artifacts.ivyservice.projectmodule.ProjectDependencyPublicationResolver import org.gradle.api.publish.maven.MavenPom import org.gradle.api.publish.maven.MavenPublication +//https://github.com/johnrengelman/shadow/issues/334 static void configure(MavenPublication publication, Project project) { publication.artifact(project.tasks.shadowJar) @@ -16,10 +17,9 @@ static void configure(MavenPublication publication, Project project) { def dependenciesNode = xml.asNode().appendNode('dependencies') project.configurations.shadow.allDependencies.each { - //if (! (it instanceof SelfResolvingDependency)) { if (it instanceof ProjectDependency) { - def projectDependencyResolver = project.gradle.services.get(ProjectDependencyPublicationResolver) - ModuleVersionIdentifier identifier = projectDependencyResolver.resolve(it) + final ProjectDependencyPublicationResolver projectDependencyResolver = project.gradle.services.get(ProjectDependencyPublicationResolver) + final ModuleVersionIdentifier identifier = projectDependencyResolver.resolve(ModuleVersionIdentifier, it) addDependency(dependenciesNode, identifier) } else if (!(it instanceof SelfResolvingDependency)) { addDependency(dependenciesNode, it) |