Merge pull request #2 from Multiverse/dtm/fix_version

Use system properties for release version.
Multiverse · Feb 3, 2025 · 98e9e42 · 98e9e42
2 parents 13bddcd + 7099a88
commit 98e9e42
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/.github/workflows/push.release.yml b/.github/workflows/push.release.yml
@@ -38,10 +38,9 @@ jobs:
 
       - name: Build & Publish
         uses: gradle/gradle-build-action@v2
-        env:
-          GITHUB_VERSION: ${{ needs.create_release.outputs.version }}
         with:
           arguments: >
             clean build publish
+              -Dversion=${{ needs.create_release.outputs.version }}
               -PmultiverseUsername=${{ secrets.REPOSILITE_REPO_USERNAME }}
               -PmultiversePassword=${{ secrets.REPOSILITE_REPO_PASSWORD }}
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'org.mvplugins.gradle'
-version = System.getenv('GITHUB_VERSION') ?: '0.0.0-SNAPSHOT'
+version = System.getProperty('version', '0.0.0-SNAPSHOT')
 
 repositories {
     mavenCentral()
@@ -21,9 +21,7 @@ publishing {
     repositories {
         maven {
             name = "multiverse"
-            def releasesRepoUrl = "https://repo.onarandombox.com/multiverse-releases"
-            def snapshotsRepoUrl = "https://repo.onarandombox.com/multiverse-snapshots"
-            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+            url = 'https://repo.onarandombox.com/multiverse-releases'
             credentials(PasswordCredentials)
         }
     }