Provide libVersionSuffix="SNAPSHOT" from build configuration

sczerwinski · Dec 12, 2020 · 2277de7 · 2277de7
1 parent 05ede2c
commit 2277de7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -119,7 +119,7 @@ jobs:
   snapshot:
     name: Publish To OSSRH Snapshot Repository
     if: (github.event_name != 'pull_request') && (github.ref == 'refs/heads/main')
-    needs: properties
+    needs: gradleValidation
     runs-on: ubuntu-latest
     steps:
       - name: Fetch Sources
@@ -138,5 +138,4 @@ jobs:
           SIGNING_PASS: ${{ secrets.SIGNING_PASS }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-          VERSION: ${{ needs.properties.outputs.version }}-SNAPSHOT
-        run: ./gradlew publish -PlibVersion="${VERSION}" -Psigning.secretKeyRingFile=../../secring.gpg -Psigning.password="${SIGNING_PASS}" -Psigning.keyId="${SIGNING_KEY_ID}" --stacktrace
+        run: ./gradlew publish -PlibVersionSuffix="SNAPSHOT" -Psigning.secretKeyRingFile=../../secring.gpg -Psigning.password="${SIGNING_PASS}" -Psigning.keyId="${SIGNING_KEY_ID}" --stacktrace
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,7 +21,7 @@ allprojects {
     val libVersionSuffix: String by project
 
     group = libGroupId
-    version = if (libVersion.endsWith("SNAPSHOT")) libVersion else "$libVersion-$libVersionSuffix"
+    version = if (libVersionSuffix.isBlank()) libVersion else "$libVersion-$libVersionSuffix"
 
     repositories {
         google()