Skip to content

Commit 2ae60f6

Browse files
219 fix releasing again (#220)
* Revert "Prepare release for 4.0.0-M8" This reverts commit ff7a712. * fixes #219: fix project description not included in release I removed the subProject.afterEvaluate which made sure that the description set in the subProject build.gradle.kts has been set.
1 parent ff7a712 commit 2ae60f6

File tree

2 files changed

+28
-25
lines changed

2 files changed

+28
-25
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plugins {
1212

1313
allprojects {
1414
group = "com.jashmore"
15-
version = "4.0.0-M8"
15+
version = "4.0.0-M8-SNAPSHOT"
1616

1717
repositories {
1818
mavenCentral()

buildSrc/src/main/kotlin/com/jashmore/ReleasePlugin.kt

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.jashmore
22

3+
import com.jashmore.utils.isSnapshotVersion
34
import io.codearte.gradle.nexus.NexusStagingExtension
45
import io.codearte.gradle.nexus.NexusStagingPlugin
56
import org.gradle.api.Plugin
@@ -16,7 +17,6 @@ import org.gradle.plugins.signing.SigningExtension
1617
import org.gradle.plugins.signing.SigningPlugin
1718
import java.io.File
1819
import java.net.URI
19-
import com.jashmore.utils.isSnapshotVersion
2020

2121
open class ReleasePluginExtension {
2222
/**
@@ -89,35 +89,38 @@ open class ReleasePlugin : Plugin<Project> {
8989

9090
from(subProject.components["java"])
9191

92-
pom {
93-
name.set(determineModuleName(subProject.name))
94-
description.set(subProject.description)
95-
url.set("http://github.com/jaidenashmore/java-dynamic-sqs-listener")
92+
// Need to do it last so that the description is properly set in each of the project's gradle build files
93+
subProject.afterEvaluate {
94+
pom {
95+
name.set(determineModuleName(subProject.name))
96+
description.set(subProject.description)
97+
url.set("http://github.com/jaidenashmore/java-dynamic-sqs-listener")
9698

97-
licenses {
98-
license {
99-
name.set("MIT License")
100-
url.set("http://www.opensource.org/licenses/mit-license.php")
99+
licenses {
100+
license {
101+
name.set("MIT License")
102+
url.set("http://www.opensource.org/licenses/mit-license.php")
103+
}
101104
}
102-
}
103105

104-
developers {
105-
developer {
106-
id.set("jaidenashmore")
107-
name.set("Jaiden Ashmore")
108-
email.set("jaidenkyleashmore@gmail.com")
109-
organization {
110-
name.set("jaidenashmore")
111-
url.set("https://github.com/jaidenashmore")
106+
developers {
107+
developer {
108+
id.set("jaidenashmore")
109+
name.set("Jaiden Ashmore")
110+
email.set("jaidenkyleashmore@gmail.com")
111+
organization {
112+
name.set("jaidenashmore")
113+
url.set("https://github.com/jaidenashmore")
114+
}
112115
}
113116
}
114-
}
115117

116-
scm {
117-
connection.set("scm:git:ssh://git@github.com/jaidenashmore/java-dynamic-sqs-listener.git")
118-
developerConnection.set("scm:git:ssh://git@github.com/jaidenashmore/java-dynamic-sqs-listener.git")
119-
url.set("http://github.com/jaidenashmore/java-dynamic-sqs-listener")
120-
tag.set(deploymentTag)
118+
scm {
119+
connection.set("scm:git:ssh://git@github.com/jaidenashmore/java-dynamic-sqs-listener.git")
120+
developerConnection.set("scm:git:ssh://git@github.com/jaidenashmore/java-dynamic-sqs-listener.git")
121+
url.set("http://github.com/jaidenashmore/java-dynamic-sqs-listener")
122+
tag.set(deploymentTag)
123+
}
121124
}
122125
}
123126
}

0 commit comments

Comments
 (0)