Merge pull request #3128 from Multiverse/fix-publish-repo

Multiverse · Nov 18, 2024 · 2f8d233 · 2f8d233
2 parents e33fc93 + c4d01b6
commit 2f8d233
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/.github/workflows/generic.github_release.yml b/.github/workflows/generic.github_release.yml
@@ -78,10 +78,8 @@ jobs:
         with:
           arguments: >
             publish -x test
-              -PmultiverseReleasesUsername=${{ secrets.REPOSILITE_REPO_USERNAME }}
-              -PmultiverseReleasesPassword=${{ secrets.REPOSILITE_REPO_PASSWORD }}
-              -PmultiverseSnapshotsUsername=${{ secrets.REPOSILITE_REPO_USERNAME }}
-              -PmultiverseSnapshotsPassword=${{ secrets.REPOSILITE_REPO_PASSWORD }}
+              -PmultiverseUsername=${{ secrets.REPOSILITE_REPO_USERNAME }}
+              -PmultiversePassword=${{ secrets.REPOSILITE_REPO_PASSWORD }}
         env:
           GITHUB_VERSION: ${{ steps.release.outputs.publish_version }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/build.gradle b/build.gradle
@@ -127,13 +127,10 @@ publishing {
             }
         }
         maven {
-            name = "multiverseReleases"
-            url = "https://repo.dumptruckman.com/multiverse-releases"
-            credentials(PasswordCredentials)
-        }
-        maven {
-            name = "multiverseSnapshots"
-            url = "https://repo.dumptruckman.com/multiverse-snapshots"
+            name = "multiverse"
+            def releasesRepoUrl = "https://repo.dumptruckman.com/multiverse-releases"
+            def snapshotsRepoUrl = "https://repo.dumptruckman.com/multiverse-snapshots"
+            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
             credentials(PasswordCredentials)
         }
     }