Skip to content

Commit 6cfa4e3

Browse files
committed
New plugin attempt
1 parent b662f4d commit 6cfa4e3

2 files changed

Lines changed: 12 additions & 26 deletions

File tree

.github/workflows/release.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,13 @@ jobs:
3030
run: |
3131
echo -n "${{ secrets.GPG_SIGNING_KEY }}" | base64 --decode > $HOME/secring.gpg
3232
33+
# https://vanniktech.github.io/gradle-maven-publish-plugin/central
3334
- name: Publish package
34-
run: ./gradlew publish -Pversion=$VERSION -Psigning.secretKeyRingFile="$HOME/secring.gpg" -Psigning.password="${{ secrets.GPG_SIGNING_KEY_PASSPHRASE }}" -Psigning.keyId="${{ secrets.GPG_SIGNING_KEY_ID }}" -PsonatypeUsername="${{ secrets.SONATYPE_USERNAME }}" -PsonatypePassword="${{ secrets.SONATYPE_PASSWORD }}"
35+
run: ./gradlew publishToMavenCentral -Pversion=$VERSION --no-configuration-cache
3536
env:
3637
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
38+
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USERNAME }}
39+
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
40+
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_SIGNING_KEY_ASC }}
41+
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GPG_SIGNING_KEY_PASSPHRASE }}
42+

api/build.gradle.kts

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("eu.kakde.gradle.sonatype-maven-central-publisher") version "1.0.6"
2+
id("com.vanniktech.maven.publish") version "0.33.0"
33
}
44

55
java {
@@ -28,26 +28,11 @@ dependencies {
2828
testCompileOnly(libs.jetbrains.annotations)
2929
}
3030

31-
signing {
32-
publishing.publications.configureEach {
33-
sign(this)
34-
}
35-
sign(configurations.archives.get())
36-
}
37-
38-
sonatypeCentralPublishExtension {
39-
// Set group ID, artifact ID, version, and other publication details
40-
groupId.set("com.faforever")
41-
artifactId.set("api")
42-
version.set("unspecified")
43-
componentType.set("java") // "java" or "versionCatalog"
44-
publishingType.set("USER_MANAGED") // USER_MANAGED or AUTOMATIC
45-
shaAlgorithms.set(listOf("SHA-256", "SHA-512" ))
46-
47-
// Set username and password for Sonatype repository
48-
username.set(project.properties["sonatypeUsername"].toString())
49-
password.set(project.properties["sonatypePassword"].toString())
31+
mavenPublishing {
32+
publishToMavenCentral()
33+
signAllPublications()
5034

35+
coordinates("com.faforever.commons", "api", "SNAPSHOT")
5136
// Configure POM metadata
5237
pom {
5338
name.set("api")
@@ -67,11 +52,6 @@ sonatypeCentralPublishExtension {
6752
organizationUrl.set("https://github.com/FAForever")
6853
}
6954
}
70-
scm {
71-
url.set("https://github.com/FAForever/faf-java-commons")
72-
connection.set("scm:git:https://github.com/FAForever/faf-java-commons")
73-
developerConnection.set("scm:git:https://github.com/FAForever/faf-java-commons")
74-
}
7555
issueManagement {
7656
system.set("GitHub")
7757
url.set("https://github.com/FAForever/faf-java-commons/issues")

0 commit comments

Comments
 (0)