Skip to content

Commit 03c8407

Browse files
Merge pull request #442 from weisJ/fix_pom
Fix configuration of pom for published artifacts
2 parents 337550c + 877c004 commit 03c8407

File tree

1 file changed

+58
-56
lines changed

1 file changed

+58
-56
lines changed

build.gradle.kts

Lines changed: 58 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -161,68 +161,70 @@ allprojects {
161161
}
162162
}
163163

164-
extensions.findByType(PublishingExtension::class)?.apply {
165-
if (project.path == ":") {
166-
// Skip the root project
167-
return@apply
168-
}
164+
plugins.withType<MavenPublishPlugin>().configureEach {
165+
configure<PublishingExtension> {
166+
if (project.path == ":") {
167+
// Skip the root project
168+
return@configure
169+
}
169170

170-
val useInMemoryKey by props()
171-
if (useInMemoryKey) {
172-
apply(plugin = "signing")
171+
val useInMemoryKey by props()
172+
if (useInMemoryKey) {
173+
apply(plugin = "signing")
173174

174-
configure<SigningExtension> {
175-
useInMemoryPgpKeys(
176-
project.stringProperty("signing.inMemoryKey"),
177-
project.stringProperty("signing.password")
178-
)
175+
configure<SigningExtension> {
176+
useInMemoryPgpKeys(
177+
project.stringProperty("signing.inMemoryKey"),
178+
project.stringProperty("signing.password")
179+
)
180+
}
179181
}
180-
}
181182

182-
publications {
183-
withType<MavenPublication> {
184-
// Use the resolved versions in pom.xml
185-
// Gradle might have different resolution rules, so we set the versions
186-
// that were used in Gradle build/test.
187-
versionFromResolution()
188-
pom {
189-
simplifyXml()
190-
description.set(project.description!!)
191-
name.set(
192-
(project.findProperty("artifact.name") as? String)
193-
?: project.name.capitalize().replace("-", " ")
194-
)
195-
url.set("https://litiengine.com")
196-
organization {
197-
name.set("Gurkenlabs")
198-
url.set("https://gurkenlabs.de/")
199-
}
200-
issueManagement {
201-
system.set("GitHub")
202-
url.set("https://github.com/gurkenlabs/litiengine/issues")
203-
}
204-
licenses {
205-
license {
206-
name.set("MIT")
207-
url.set("https://github.com/gurkenlabs/litiengine/blob/master/LICENSE")
208-
distribution.set("repo")
183+
publications {
184+
withType<MavenPublication> {
185+
// Use the resolved versions in pom.xml
186+
// Gradle might have different resolution rules, so we set the versions
187+
// that were used in Gradle build/test.
188+
versionFromResolution()
189+
pom {
190+
simplifyXml()
191+
description.set(project.description!!)
192+
name.set(
193+
(project.findProperty("artifact.name") as? String)
194+
?: project.name.capitalize().replace("-", " ")
195+
)
196+
url.set("https://litiengine.com")
197+
organization {
198+
name.set("Gurkenlabs")
199+
url.set("https://gurkenlabs.de/")
209200
}
210-
}
211-
scm {
212-
url.set("'https://github.com/gurkenlabs/litiengine/")
213-
connection.set("scm:git:git://github.com/gurkenlabs/litiengine.git")
214-
developerConnection.set("scm:git:git@github.com:gurkenlabs/litiengine.git")
215-
}
216-
developers {
217-
developer {
218-
id.set("steffen")
219-
name.set("Steffen Wilke")
220-
email.set("steffen@gurkenlabs.de")
201+
issueManagement {
202+
system.set("GitHub")
203+
url.set("https://github.com/gurkenlabs/litiengine/issues")
204+
}
205+
licenses {
206+
license {
207+
name.set("MIT")
208+
url.set("https://github.com/gurkenlabs/litiengine/blob/master/LICENSE")
209+
distribution.set("repo")
210+
}
211+
}
212+
scm {
213+
url.set("'https://github.com/gurkenlabs/litiengine/")
214+
connection.set("scm:git:git://github.com/gurkenlabs/litiengine.git")
215+
developerConnection.set("scm:git:git@github.com:gurkenlabs/litiengine.git")
221216
}
222-
developer {
223-
id.set("matthias")
224-
name.set("Matthias Wilke")
225-
email.set("matthias@gurkenlabs.de")
217+
developers {
218+
developer {
219+
id.set("steffen")
220+
name.set("Steffen Wilke")
221+
email.set("steffen@gurkenlabs.de")
222+
}
223+
developer {
224+
id.set("matthias")
225+
name.set("Matthias Wilke")
226+
email.set("matthias@gurkenlabs.de")
227+
}
226228
}
227229
}
228230
}

0 commit comments

Comments
 (0)