Skip to content

Commit c52f531

Browse files
committed
fix(cd): release process
1 parent 7fce233 commit c52f531

File tree

3 files changed

+24
-21
lines changed

3 files changed

+24
-21
lines changed

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ jobs:
6262
cache: gradle
6363

6464
- name: Publish artifacts
65-
run: ./gradlew :sumup-sdk:publishToSonatype closeAndReleaseSonatypeStagingRepository
65+
run: ./gradlew :sumup-sdk:sonatypeCentralUpload

build.gradle

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import org.gradle.jvm.toolchain.JavaToolchainService
88
plugins {
99
id 'base'
1010
id 'com.diffplug.spotless' version '6.25.0' apply false
11-
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
1211
}
1312

1413
ext {
@@ -103,13 +102,3 @@ gradle.projectsEvaluated {
103102
task.setClasspath(task.project.files(mainSourceSets.collect { sourceSet -> sourceSet.compileClasspath }))
104103
}
105104
}
106-
107-
nexusPublishing {
108-
packageGroup.set('com.sumup')
109-
repositories {
110-
sonatype {
111-
username.set(providers.environmentVariable('SONATYPE_USERNAME'))
112-
password.set(providers.environmentVariable('SONATYPE_PASSWORD'))
113-
}
114-
}
115-
}

src/build.gradle

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ plugins {
55
id 'com.diffplug.spotless'
66
id 'maven-publish'
77
id 'signing'
8+
id 'cl.franciscosolis.sonatype-central-upload' version '1.0.3'
89
}
910

1011
base {
@@ -87,17 +88,30 @@ publishing {
8788
}
8889
}
8990

90-
def signingKey = providers.environmentVariable('SIGNING_KEY')
91-
def signingPassword = providers.environmentVariable('SIGNING_PASSWORD')
91+
sonatypeCentralUpload {
92+
username = System.getenv('SONATYPE_USERNAME')
93+
password = System.getenv('SONATYPE_PASSWORD')
94+
95+
archives = files(
96+
"$buildDir/libs/sumup-${project.version}.jar",
97+
"$buildDir/libs/sumup-${project.version}-sources.jar",
98+
"$buildDir/libs/sumup-${project.version}-javadoc.jar"
99+
)
100+
101+
pom = file("$buildDir/publications/mavenJava/pom-default.xml")
102+
signingKey = System.getenv('SIGNING_KEY')
103+
signingKeyPassphrase = System.getenv('SIGNING_PASSWORD')
104+
}
92105

93106
signing {
94-
required {
95-
gradle.taskGraph.hasTask('publishToSonatype') ||
96-
gradle.taskGraph.hasTask('closeAndReleaseSonatypeStagingRepository')
107+
def signingKey = System.getenv('SIGNING_KEY')
108+
def signingPassword = System.getenv('SIGNING_PASSWORD')
109+
if (signingKey && signingPassword) {
110+
useInMemoryPgpKeys(signingKey, signingPassword)
111+
sign(publishing.publications.mavenJava)
97112
}
113+
}
98114

99-
if (signingKey.isPresent() && signingPassword.isPresent()) {
100-
useInMemoryPgpKeys(signingKey.get(), signingPassword.get())
101-
sign(publishing.publications)
102-
}
115+
tasks.named('sonatypeCentralUpload') {
116+
dependsOn(tasks.named('build'))
103117
}

0 commit comments

Comments
 (0)