fix: Include java version for build when publishing. (#25)

Author: kinyoklion

.github/actions/publish/action.yml

@@ -1,27 +1,39 @@
 name: Publish Package
 description: 'Publish the package to Sonatype'
 inputs:
-  code_signing_keyring:
-    description: 'The path of the code signing keyring.'
+  dry_run:
+    description: 'Is this a dry run. If so no package will be published.'
     required: true
   prerelease:
     description: 'Is this a prerelease. If so then it will be published to the staging repository only.'
     required: true
-  dry_run:
-    description: 'Is this a dry run. If so no package will be published.'
+  signing_key_id:
+    description: 'Signing key ID'
+    required: true
+  signing_key_passphrase:
+    description: 'Signing key passphrase'
+    required: true
+  code_signing_keyring:
+    description: 'The path of the code signing keyring.'
+    required: true
+  sonatype_username:
+    description: 'Sonatype repo username.'
+    required: true
+  sonatype_password:
+    description: 'Sonatype repo password.'
     required: true
 
 runs:
   using: composite
   steps:
     - name: Publish Library
       shell: bash
-      if: ${{ inputs.dry_run == 'false' }}
       env:
         LD_RELEASE_IS_PRERELEASE: ${{ inputs.prerelease }}
+        LD_RELEASE_IS_DRYRUN: ${{ inputs.dry_run }}
+        SIGNING_KEY_ID: ${{ inputs.signing_key_id }}
+        SIGNING_KEY_PASSPHRASE: ${{ inputs.signing_key_passphrase }}
+        SIGNING_SECRET_KEY_RING_FILE: ${{ inputs.code_signing_keyring }}
+        SONATYPE_USER_NAME: ${{ inputs.sonatype_username }}
+        SONATYPE_PASSWORD: ${{ inputs.sonatype_password }}
       run: source $GITHUB_ACTION_PATH/publish.sh
-
-    - name: Dry Run Publish Library
-      shell: bash
-      if: ${{ inputs.dry_run == 'true' }}
-      run: echo "Dry run. Not publishing."

.github/actions/publish/publish.sh

@@ -2,17 +2,21 @@
 
 set -ue
 
-echo "Publishing to Sonatype"
-if [ "${LD_RELEASE_IS_PRERELEASE}" == "true" ]; then
-  echo "PRERELEASE"
-  ./gradlew publishToSonatype -Psigning.keyId="${SIGNING_KEY_ID}" -Psigning.secretKeyRingFile="${SIGNING_SECRET_KEY_RING_FILE}" -PossrhUsername="${SONATYPE_USER_NAME}" -PossrhPassword="${SONATYPE_PASSWORD}" || {
-    echo "Gradle publish/release faile" >&2
-    exit 1
-  }
+if $LD_RELEASE_IS_DRYRUN ; then
+  echo "Doing a dry run of publishing."
 else
-  echo "RELEASE"
-  ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository || {
-    echo "Gradle publish/release failed" >&2
-    exit 1
-  }
+    echo "Publishing to Sonatype"
+    if [ "${LD_RELEASE_IS_PRERELEASE}" == "true" ]; then
+        echo "PRERELEASE"
+        ./gradlew publishToSonatype -Psigning.keyId="${SIGNING_KEY_ID}" -Psigning.password="${SIGNING_KEY_PASSPHRASE}" -Psigning.secretKeyRingFile="${SIGNING_SECRET_KEY_RING_FILE}" -PsonatypeUsername="${SONATYPE_USER_NAME}" -PsonatypePassword="${SONATYPE_PASSWORD}" || {
+            echo "Gradle publish/release failed" >&2
+            exit 1
+        }
+    else
+        echo "RELEASE"
+        ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -Psigning.keyId="${SIGNING_KEY_ID}" -Psigning.password="${SIGNING_KEY_PASSPHRASE}" -Psigning.secretKeyRingFile="${SIGNING_SECRET_KEY_RING_FILE}" -PsonatypeUsername="${SONATYPE_USER_NAME}" -PsonatypePassword="${SONATYPE_PASSWORD}" || {
+            echo "Gradle publish/release failed" >&2
+            exit 1
+        }
+    fi
 fi

.github/workflows/publish.yml

@@ -50,7 +50,7 @@ jobs:
         with:
           aws_assume_role: ${{ vars.AWS_ROLE_ARN }}
           ssm_parameter_pairs: '/production/common/releasing/sonatype/username = SONATYPE_USER_NAME,
-          /production/common/releasing/sonatype/password = SONATYPE_PASSWORD
+          /production/common/releasing/sonatype/password = SONATYPE_PASSWORD,
           /production/common/releasing/java/keyId = SIGNING_KEY_ID'
           s3_path_pairs: 'launchdarkly-releaser/java/code-signing-keyring.gpg = code-signing-keyring.gpg'
 
@@ -59,4 +59,8 @@ jobs:
         with:
           dry_run: ${{ inputs.dry_run }}
           prerelease: ${{ inputs.prerelease }}
+          signing_key_id: ${{ env.SIGNING_KEY_ID }}
+          signing_key_passphrase: ''
           code_signing_keyring: 'code-signing-keyring.gpg'
+          sonatype_username: ${{ env.SONATYPE_USER_NAME }}
+          sonatype_password: ${{ env.SONATYPE_PASSWORD }}

build.gradle

@@ -100,10 +100,7 @@ signing {
 nexusPublishing {
     clientTimeout = java.time.Duration.ofMinutes(2) // we've seen extremely long delays in creating repositories
     repositories {
-        sonatype {
-            username = findProperty("ossrhUsername")
-            password = findProperty("ossrhPassword")
-        }
+            sonatype()
     }
 }
 

gradle.properties

@@ -1,2 +1,4 @@
 group = com.launchdarkly
-version=0.2.2 # x-release-please-version
+#x-release-please-start-version
+version=0.2.2
+# x-release-please-version