diff options
| author | Eugene Petrenko <eugene.petrenko@gmail.com> | 2018-09-11 18:14:53 +0300 |
|---|---|---|
| committer | Eugene Petrenko <eugene.petrenko@gmail.com> | 2018-09-11 18:14:53 +0300 |
| commit | 2051ad797212fdd272f8c7474c920b2802d41450 (patch) | |
| tree | b820b7079a3016c1e54b9469f47e7f1ed33d388d /buildSrc/src/main/groovy | |
| parent | 8b1d9e123be3d8b030daeafadcb7ae35f5de92e9 (diff) | |
| download | dokka-2051ad797212fdd272f8c7474c920b2802d41450.tar.gz dokka-2051ad797212fdd272f8c7474c920b2802d41450.tar.bz2 dokka-2051ad797212fdd272f8c7474c920b2802d41450.zip | |
gradle 4.10 + fix to the workaround around shadow plugin
Diffstat (limited to 'buildSrc/src/main/groovy')
| -rw-r--r-- | buildSrc/src/main/groovy/org/jetbrains/CorrectShadowPublishing.groovy | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/buildSrc/src/main/groovy/org/jetbrains/CorrectShadowPublishing.groovy b/buildSrc/src/main/groovy/org/jetbrains/CorrectShadowPublishing.groovy index 3e1d2106..4f6dcd75 100644 --- a/buildSrc/src/main/groovy/org/jetbrains/CorrectShadowPublishing.groovy +++ b/buildSrc/src/main/groovy/org/jetbrains/CorrectShadowPublishing.groovy @@ -4,22 +4,23 @@ 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) + publication.pom { MavenPom pom -> pom.withXml { xml -> 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) |