Release workflow fix

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'gradle'
+    directory: '/'
+    schedule:
+      interval: 'daily'

.github/workflows/build.yml

@@ -4,6 +4,11 @@ env:
 
 on:
   workflow_dispatch:
+    inputs:
+      release:
+        type: boolean
+        default: false
+        description: Whether to make a release
   pull_request:
   push:
     paths-ignore:
@@ -19,3 +24,50 @@ jobs:
       - name: Gradle Build and Test
         run: |
           ./gradlew build test --info --stacktrace
+
+      - name: VERSION file changed
+        id: version-file-changed
+        uses: tj-actions/changed-files@v42
+        with:
+          files: VERSION
+
+      - name: Should make release?
+        if: |
+          github.ref == 'refs/heads/main' && 
+            ((github.event.inputs.release && github.event_name == 'workflow_dispatch') ||
+              (github.event_name == 'push' && github.ref == 'refs/heads/main' && steps.version-file-changed.outputs.any_changed == 'true'))
+        run: echo make_release=true >> "$GITHUB_ENV"
+
+      - name: Get version (release)
+        if: env.make_release
+        run: |
+          export VERSION="$(head VERSION)"
+          echo version="$VERSION" >> "$GITHUB_ENV"
+
+      - name: Release (GitHub)
+        if: env.make_release
+        id: github_release
+        uses: softprops/action-gh-release@v1
+        with:
+          name: ${{ env.version }}
+          tag_name: ${{ env.version }}
+
+      - name: Prepare PGP Keyring file
+        if: env.make_release
+        env:
+          GPG_KEY_CONTENTS: ${{ secrets.GPG_KEY_CONTENTS }}
+        run: |
+          echo "${GPG_KEY_CONTENTS}" | base64 -d > signing-key.gpg
+        shell: bash
+
+      - name: Publish to Maven Central
+        if: env.make_release
+        run: |
+          ./gradlew publishReleasePublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository --info --stacktrace
+        env:
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
+          SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+          SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
+

RELEASE.md

@@ -0,0 +1,5 @@
+# Releases
+
+To make a release, make a pull request that bumps the `VERSION` file.
+
+The release workflow will run on merge.

VERSION

@@ -0,0 +1 @@
+5.9.2

build.gradle

@@ -1,3 +1,5 @@
+import java.time.Duration
+
 buildscript {
     repositories {
         maven { url 'https://plugins.gradle.org/m2' }
@@ -99,4 +101,8 @@ nexusPublishing {
             snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
         }
     }
+    transitionCheckOptions {
+        maxRetries = 120
+        delayBetween = Duration.ofSeconds(10)
+    }
 }

gradle/artifact-settings.gradle

@@ -18,9 +18,8 @@ ext {
 }
 
 def getVersionName() {
-    def cmd = "git describe --tag --abbrev=0"
-    def version = cmd.execute().text.trim()
-    def deducedVersion = isSnapshot() ? getSnapshotVersion(version) : getReleaseVersion(version)
+    def version = System.getenv('VERSION')
+    def deducedVersion = isSnapshot() ? getSnapshotVersion(version) : version
     project.logger.info("Project version detected: ${deducedVersion}")
     return deducedVersion
 }
@@ -30,14 +29,6 @@ def isSnapshot() {
     return snapshotProp ? snapshotProp.asBoolean() : false
 }
 
-private static def getReleaseVersion(String version) {
-    if (version && version.length() > 1) {
-        return version.substring(1)
-    } else {
-        return "Unknown"
-    }
-}
-
 private static def getSnapshotVersion(String version) {
     def matcher = version =~ /^[v|V](\d+).(\d+)?.*/
     def major = (matcher[0][1] as Integer)

gradle/libs.versions.toml

@@ -6,7 +6,7 @@ supportAnnotation = "1.0.0"
 okhttp3Mockwebserver = "3.12.7"
 gson = "2.8.6"
 
-gradleNexus = "1.1.0"
+gradleNexus = "1.3.0"
 
 [libraries]
 junit = { group = "junit", name = "junit", version.ref = "junit" }

gradle/publish-root.gradle

@@ -1,21 +1,6 @@
-ext["signing.keyId"] = ''
-ext["signing.password"] = ''
+ext["signing.keyId"] = System.getenv('SIGNING_KEY_ID')
+ext["signing.password"] = System.getenv('SIGNING_PASSWORD')
 ext["signing.secretKeyRingFile"] = "${projectDir}/../signing-key.gpg"
-ext["ossrhUsername"] = ''
-ext["ossrhPassword"] = ''
-ext["sonatypeStagingProfileId"] = ''
-
-File secretPropsFile = project.rootProject.file('local.properties')
-if (secretPropsFile.exists()) {
-    // Read local.properties file first if it exists
-    Properties p = new Properties()
-    new FileInputStream(secretPropsFile).withCloseable { is -> p.load(is) }
-    p.each { name, value -> ext[name] = value }
-} else {
-    // Use system environment variables
-    ext["ossrhUsername"] = System.getenv('OSSRH_USERNAME')
-    ext["ossrhPassword"] = System.getenv('OSSRH_PASSWORD')
-    ext["sonatypeStagingProfileId"] = System.getenv('SONATYPE_STAGING_PROFILE_ID')
-    ext["signing.keyId"] = System.getenv('SIGNING_KEY_ID')
-    ext["signing.password"] = System.getenv('SIGNING_PASSWORD')
-}
+ext["ossrhUsername"] = System.getenv('OSSRH_USERNAME')
+ext["ossrhPassword"] = System.getenv('OSSRH_PASSWORD')
+ext["sonatypeStagingProfileId"] = System.getenv('SONATYPE_STAGING_PROFILE_ID')