Skip to content

Commit bdf0325

Browse files
authored
Remove publish logic duplication (#461)
* Move pom configuration to separate file * Single publish conventions plugin * Remove `sign` logic duplication
1 parent 3721108 commit bdf0325

File tree

13 files changed

+50
-121
lines changed

13 files changed

+50
-121
lines changed

buildSrc/src/main/kotlin/MavenPom.kt

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
import org.gradle.api.Project
2+
import org.gradle.api.publish.maven.MavenPublication
3+
4+
internal fun MavenPublication.configurePom(
5+
project: Project
6+
) {
7+
pom {
8+
name.set(project.name)
9+
description.set(project.description)
10+
url.set("https://github.com/JetBrains/kotlin-wrappers")
11+
12+
licenses {
13+
license {
14+
name.set("The Apache License, Version 2.0")
15+
url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
16+
}
17+
}
18+
19+
developers {
20+
developer {
21+
id.set("JetBrains")
22+
name.set("Leonid Khachaturov")
23+
email.set("[email protected]")
24+
}
25+
}
26+
27+
scm {
28+
connection.set("scm:git:git://github.com/JetBrains/kotlin-wrappers.git")
29+
developerConnection.set("scm:git:[email protected]:JetBrains/kotlin-wrappers.git")
30+
url.set("https://github.com/JetBrains/kotlin-wrappers")
31+
}
32+
}
33+
}

buildSrc/src/main/kotlin/maven-publishing-conventions.gradle.kts renamed to buildSrc/src/main/kotlin/publish-conventions.gradle.kts

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ configure<PublishingExtension> {
2828
if (name == "jvm")
2929
artifact(javadocJar!!.get())
3030

31-
metadata()
31+
configurePom(project)
3232
}
3333

3434
isKotlinJsProject ->
@@ -41,7 +41,7 @@ configure<PublishingExtension> {
4141

4242
artifact(tasks.getByName<Zip>("jsLegacySourcesJar"))
4343

44-
metadata()
44+
configurePom(project)
4545
}
4646
}
4747
}
@@ -55,31 +55,10 @@ configure<PublishingExtension> {
5555
}
5656
}
5757

58-
fun MavenPublication.metadata() {
59-
pom {
60-
name.set(project.name)
61-
description.set(project.description)
62-
url.set("https://github.com/JetBrains/kotlin-wrappers")
58+
signing {
59+
setRequired({
60+
gradle.taskGraph.hasTask("publish")
61+
})
6362

64-
licenses {
65-
license {
66-
name.set("The Apache License, Version 2.0")
67-
url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
68-
}
69-
}
70-
71-
developers {
72-
developer {
73-
id.set("JetBrains")
74-
name.set("Leonid Khachaturov")
75-
email.set("[email protected]")
76-
}
77-
}
78-
79-
scm {
80-
connection.set("scm:git:git://github.com/JetBrains/kotlin-wrappers.git")
81-
developerConnection.set("scm:git:[email protected]:JetBrains/kotlin-wrappers.git")
82-
url.set("https://github.com/JetBrains/kotlin-wrappers")
83-
}
84-
}
63+
sign(publishing.publications)
8564
}

buildSrc/src/main/kotlin/publishing-conventions.gradle.kts

Lines changed: 0 additions & 3 deletions
This file was deleted.

kotlin-css/build.gradle.kts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
kotlin("multiplatform")
3-
`publishing-conventions`
3+
`publish-conventions`
44
}
55

66
kotlin {
@@ -35,11 +35,3 @@ kotlin {
3535
}
3636
}
3737
}
38-
39-
signing {
40-
setRequired({
41-
gradle.taskGraph.hasTask("publish")
42-
})
43-
44-
sign(publishing.publications)
45-
}

kotlin-extensions/build.gradle.kts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
plugins {
22
kotlin("js")
3-
`publishing-conventions`
3+
`publish-conventions`
44
}
5-
6-
signing {
7-
setRequired({
8-
gradle.taskGraph.hasTask("publish")
9-
})
10-
11-
sign(publishing.publications)
12-
}

kotlin-mocha/build.gradle.kts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
plugins {
22
kotlin("js")
3-
`publishing-conventions`
3+
`publish-conventions`
44
}
55

66
dependencies {
77
api(npmv("mocha"))
88
}
9-
10-
signing {
11-
setRequired({
12-
gradle.taskGraph.hasTask("publish")
13-
})
14-
15-
sign(publishing.publications)
16-
}

kotlin-react-dom/build.gradle.kts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
kotlin("js")
3-
`publishing-conventions`
3+
`publish-conventions`
44
}
55

66
dependencies {
@@ -11,11 +11,3 @@ dependencies {
1111

1212
api(npmv("react-dom"))
1313
}
14-
15-
signing {
16-
setRequired({
17-
gradle.taskGraph.hasTask("publish")
18-
})
19-
20-
sign(publishing.publications)
21-
}

kotlin-react-redux/build.gradle.kts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
kotlin("js")
3-
`publishing-conventions`
3+
`publish-conventions`
44
}
55

66
dependencies {
@@ -10,11 +10,3 @@ dependencies {
1010

1111
api(npmv("react-redux"))
1212
}
13-
14-
signing {
15-
setRequired({
16-
gradle.taskGraph.hasTask("publish")
17-
})
18-
19-
sign(publishing.publications)
20-
}
Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
kotlin("js")
3-
`publishing-conventions`
3+
`publish-conventions`
44
}
55

66
dependencies {
@@ -9,11 +9,3 @@ dependencies {
99

1010
api(npmv("react-router-dom"))
1111
}
12-
13-
signing {
14-
setRequired({
15-
gradle.taskGraph.hasTask("publish")
16-
})
17-
18-
sign(publishing.publications)
19-
}

kotlin-react-table/build.gradle.kts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
kotlin("js")
3-
`publishing-conventions`
3+
`publish-conventions`
44
}
55

66
dependencies {
@@ -9,11 +9,3 @@ dependencies {
99

1010
api(npmv("react-table"))
1111
}
12-
13-
signing {
14-
setRequired({
15-
gradle.taskGraph.hasTask("publish")
16-
})
17-
18-
sign(publishing.publications)
19-
}

kotlin-react/build.gradle.kts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
11
plugins {
22
kotlin("js")
3-
`publishing-conventions`
3+
`publish-conventions`
44
}
55

66
dependencies {
77
api(project(":kotlin-extensions"))
88

99
api(npmv("react"))
1010
}
11-
12-
signing {
13-
setRequired({
14-
gradle.taskGraph.hasTask("publish")
15-
})
16-
17-
sign(publishing.publications)
18-
}

kotlin-redux/build.gradle.kts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
kotlin("js")
33
kotlin("plugin.serialization")
4-
`publishing-conventions`
4+
`publish-conventions`
55
}
66

77
dependencies {
@@ -10,11 +10,3 @@ dependencies {
1010

1111
api(npmv("redux"))
1212
}
13-
14-
signing {
15-
setRequired({
16-
gradle.taskGraph.hasTask("publish")
17-
})
18-
19-
sign(publishing.publications)
20-
}

kotlin-styled/build.gradle.kts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
kotlin("js")
3-
`publishing-conventions`
3+
`publish-conventions`
44
}
55

66
dependencies {
@@ -15,11 +15,3 @@ dependencies {
1515
api(npm("inline-style-prefixer", "^6.0.0"))
1616
api(npm("styled-components", "^5.2.0"))
1717
}
18-
19-
signing {
20-
setRequired({
21-
gradle.taskGraph.hasTask("publish")
22-
})
23-
24-
sign(publishing.publications)
25-
}

0 commit comments

Comments
 (0)