Build: Fix pom description generation

rozza · rozza · commit 2e429a67fc31 · 2020-01-17T16:06:27.000Z
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
@@ -95,7 +95,6 @@ configure(javaProjects) { project ->
                 artifact sourcesJar
                 artifact javadocJar
 
-                pom configurePom(project)
             }
         }
 
@@ -105,6 +104,7 @@ configure(javaProjects) { project ->
     afterEvaluate {
         jar configureJarManifestAttributes(project)
         publishing.publications.mavenJava.artifactId = project.archivesBaseName
+        publishing.publications.mavenJava.pom configurePom(project)
         signing {
             sign publishing.publications.mavenJava
         }
@@ -135,7 +135,6 @@ configure(scalaProjects) { project ->
                 if (!scalaVersion.startsWith("2.13")) {
                     artifact scaladocJar  // https://github.com/gradle/gradle/issues/9855
                 }
-                pom configurePom(project)
             }
         }
 
@@ -144,6 +143,8 @@ configure(scalaProjects) { project ->
 
     afterEvaluate {
         jar configureJarManifestAttributes(project)
+        publishing.publications.mavenJava.artifactId = project.archivesBaseName
+        publishing.publications.mavenJava.pom configurePom(project)
         signing {
             sign publishing.publications.mavenJava
         }

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,6 @@ configure(javaProjects) { project ->`
`95`	`95`	`artifact sourcesJar`
`96`	`96`	`artifact javadocJar`
`97`	`97`
`98`		`- pom configurePom(project)`
`99`	`98`	`}`
`100`	`99`	`}`
`101`	`100`
`@@ -105,6 +104,7 @@ configure(javaProjects) { project ->`
`105`	`104`	`afterEvaluate {`
`106`	`105`	`jar configureJarManifestAttributes(project)`
`107`	`106`	`publishing.publications.mavenJava.artifactId = project.archivesBaseName`
	`107`	`+ publishing.publications.mavenJava.pom configurePom(project)`
`108`	`108`	`signing {`
`109`	`109`	`sign publishing.publications.mavenJava`
`110`	`110`	`}`
`@@ -135,7 +135,6 @@ configure(scalaProjects) { project ->`
`135`	`135`	`if (!scalaVersion.startsWith("2.13")) {`
`136`	`136`	`artifact scaladocJar // https://github.com/gradle/gradle/issues/9855`
`137`	`137`	`}`
`138`		`- pom configurePom(project)`
`139`	`138`	`}`
`140`	`139`	`}`
`141`	`140`
`@@ -144,6 +143,8 @@ configure(scalaProjects) { project ->`
`144`	`143`
`145`	`144`	`afterEvaluate {`
`146`	`145`	`jar configureJarManifestAttributes(project)`
	`146`	`+ publishing.publications.mavenJava.artifactId = project.archivesBaseName`
	`147`	`+ publishing.publications.mavenJava.pom configurePom(project)`
`147`	`148`	`signing {`
`148`	`149`	`sign publishing.publications.mavenJava`
`149`	`150`	`}`