diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index ccb23f7d..4697b1cd 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -40,7 +40,7 @@ jobs: - if: github.event_name == 'push' run: ./gradlew :PdCore:pd-core:publishToSonatype env: + ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }} + ORG_GRADLE_PROJECT_signingPassphrase: ${{ secrets.SIGNING_PASSPHRASE }} ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }} ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }} - #ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }} - #ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }} diff --git a/PdCore/pd-core/build.gradle b/PdCore/pd-core/build.gradle index 617f8a69..2270ab58 100644 --- a/PdCore/pd-core/build.gradle +++ b/PdCore/pd-core/build.gradle @@ -157,11 +157,11 @@ publishing { } } -// ossrh requires signed releases, but not snapshots. +// Maven Central requires signed releases, but not snapshots. // This configures signing if a key is found. // The following environment variables provide a signing key and passphrase: // export ORG_GRADLE_PROJECT_signingKey=`cat private.pgp` -// export ORG_GRADLE_PROJECT_signingPassword="" +// export ORG_GRADLE_PROJECT_signingPassphrase="" // After making the above available, you can try signing using // ./gradlew signMavenPublication def hasSigningKey = project.hasProperty('signingKeyId') || project.hasProperty('signingKey') @@ -173,13 +173,13 @@ void sign(Project project) { required { project.gradle.taskGraph.hasTask('required') } def signingKeyId = project.findProperty('signingKeyId') def signingKey = project.findProperty('signingKey') - def signingPassword = project.findProperty('signingPassword') + def signingPassphrase = project.findProperty('signingPassphrase') if (signingKeyId) { // use in-memory ascii-armored OpenPGP subkey - useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword) + useInMemoryPgpKeys(signingKeyId, signingKey, signingPassphrase) } else if (signingKey) { // use in-memory ascii-armored key - useInMemoryPgpKeys(signingKey, signingPassword) + useInMemoryPgpKeys(signingKey, signingPassphrase) } sign publishing.publications.maven }