Skip to content

Commit f1dbf20

Browse files
committed
fix deploy
1 parent 3550ac2 commit f1dbf20

2 files changed

Lines changed: 13 additions & 42 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ jobs:
112112
if: github.event_name == 'release'
113113
permissions:
114114
contents: read
115-
packages: write
116115

117116
steps:
118117
- name: Checkout
@@ -132,39 +131,19 @@ jobs:
132131
apt-get install -y cmake
133132
cmake --version
134133
135-
- name: Stage release artifacts for Central
134+
- name: Publish release to Maven Central
136135
run: |
137136
if [ "${{ secrets.OSSRH_PASSWORD }}" = "" ];
138137
then
139138
echo "Configure the following secrets to enable uploading to Sonatype:"
140139
echo "OSSRH_PASSWORD, OSSRH_USERNAME, SIGNING_KEY, SIGNING_PASSWORD"
141140
else
142141
export ANDROID_NDK="$ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION"
143-
./gradlew publishMavenPublicationToCentralRepository \
142+
./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository \
144143
-PcentralPassword=${{ secrets.OSSRH_PASSWORD }} \
145144
-PcentralUsername=${{ secrets.OSSRH_USERNAME }} \
146145
-PsigningKey='${{ secrets.SIGNING_KEY }}' \
147146
-PsigningPassword='${{ secrets.SIGNING_PASSWORD }}' \
148147
-PreleaseVersion=${GITHUB_REF_NAME#v} \
149148
--console=plain --stacktrace
150149
fi
151-
152-
- name: Publish to GitHub Packages
153-
run: |
154-
export ANDROID_NDK="$ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION"
155-
if [ "${{ secrets.SIGNING_PASSWORD }}" = "" ];
156-
then
157-
./gradlew publishMavenPublicationToGitHubPackagesRepository \
158-
-PreleaseVersion=${GITHUB_REF_NAME#v} \
159-
-PgithubPackagesUsername='${{ github.actor }}' \
160-
-PgithubPackagesPassword='${{ secrets.GITHUB_TOKEN }}' \
161-
--console=plain --stacktrace
162-
else
163-
./gradlew publishMavenPublicationToGitHubPackagesRepository \
164-
-PsigningKey='${{ secrets.SIGNING_KEY }}' \
165-
-PsigningPassword='${{ secrets.SIGNING_PASSWORD }}' \
166-
-PreleaseVersion=${GITHUB_REF_NAME#v} \
167-
-PgithubPackagesUsername='${{ github.actor }}' \
168-
-PgithubPackagesPassword='${{ secrets.GITHUB_TOKEN }}' \
169-
--console=plain --stacktrace
170-
fi

build.gradle

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ plugins {
33
id 'com.android.library' version '9.1.0'
44
id 'maven-publish'
55
id 'signing'
6+
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
67
}
78

89
group = 'org.jmonkeyengine'
@@ -201,14 +202,6 @@ publishing {
201202
name = 'Dist'
202203
url = layout.buildDirectory.dir('dist/maven')
203204
}
204-
maven {
205-
credentials {
206-
username = gradle.rootProject.hasProperty('centralUsername') ? centralUsername : 'Unknown user'
207-
password = gradle.rootProject.hasProperty('centralPassword') ? centralPassword : 'Unknown password'
208-
}
209-
name = 'Central'
210-
url = 'https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/'
211-
}
212205
maven {
213206
credentials {
214207
username = gradle.rootProject.hasProperty('centralUsername') ? centralUsername : 'Unknown user'
@@ -217,17 +210,16 @@ publishing {
217210
name = 'SNAPSHOT'
218211
url = 'https://central.sonatype.com/repository/maven-snapshots/'
219212
}
220-
maven {
221-
name = 'GitHubPackages'
222-
url = uri("https://maven.pkg.github.com/${providers.environmentVariable('GITHUB_REPOSITORY').getOrElse('jMonkeyEngine/jmeAndroidNatives')}")
223-
credentials {
224-
username = providers.gradleProperty('githubPackagesUsername')
225-
.orElse(providers.environmentVariable('GITHUB_ACTOR'))
226-
.getOrElse('Unknown user')
227-
password = providers.gradleProperty('githubPackagesPassword')
228-
.orElse(providers.environmentVariable('GITHUB_TOKEN'))
229-
.getOrElse('Unknown password')
230-
}
213+
}
214+
}
215+
216+
nexusPublishing {
217+
repositories {
218+
sonatype {
219+
nexusUrl.set(uri('https://ossrh-staging-api.central.sonatype.com/service/local/'))
220+
snapshotRepositoryUrl.set(uri('https://central.sonatype.com/repository/maven-snapshots/'))
221+
username.set(gradle.rootProject.findProperty('centralUsername') ?: '')
222+
password.set(gradle.rootProject.findProperty('centralPassword') ?: '')
231223
}
232224
}
233225
}

0 commit comments

Comments
 (0)