remove nexus publishing plugin

nabto · Jun 2, 2024 · b9f2770 · b9f2770
1 parent 15bec2a
commit b9f2770
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,6 @@ plugins {
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.androidLibrary) apply false
     alias(libs.plugins.jetbrainsKotlinAndroid) apply false
-    alias(libs.plugins.nexusPlugin)
 }
 
 apply(from = "$rootDir/scripts/versioning.gradle.kts")
@@ -20,17 +19,3 @@ rootProject.extra.apply {
     set("signingKeyBase64", System.getenv("SIGNING_KEY_BASE64") ?: "")
     set("signingPassword",  System.getenv("SIGNING_PASSWORD")   ?: "")
 }
-
-val ossrhUsername: String by extra
-val ossrhPassword: String by extra
-
-nexusPublishing {
-    repositories {
-        sonatype {
-            nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
-            snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
-            username.set(ossrhUsername)
-            password.set(ossrhPassword)
-        }
-    }
-}
diff --git a/scripts/publish.gradle b/scripts/publish.gradle
@@ -1,8 +1,13 @@
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
-group = POM_GROUP_ID
-version = POM_VERSION
+def getReleaseRepositoryUrl() {
+    return 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
+}
+
+def getSnapshotRepositoryUrl() {
+    return 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
+}
 
 afterEvaluate {
     publishing {
@@ -38,6 +43,16 @@ afterEvaluate {
                 }
             }
         }
+
+        repositories {
+            maven {
+                url = rootProject.ext["isReleaseVersion"] ? getReleaseRepositoryUrl() : getSnapshotRepositoryUrl()
+                credentials {
+                    username = rootProject.ext["ossrhUsername"]
+                    password = rootProject.ext["ossrhPassword"]
+                }
+            }
+        }
     }
 }
 

diff --git a/scripts/publish.sh b/scripts/publish.sh
@@ -5,8 +5,8 @@ git diff --quiet && clean=true || clean=false
 if [ "$clean" = true ] && [ ! -z "$(git describe --exact-match --tags 2>/dev/null)" ];
 then
     echo "Releasing to maven central..."
-    ./gradlew publishReleasePublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository
 else
    echo "Publishing to sonatype staging repository without releasing..."
-   ./gradlew publishReleasePublicationToSonatypeRepository closeSonatypeStagingRepository
 fi
+
+./gradlew publish
diff --git a/scripts/versioning.gradle.kts b/scripts/versioning.gradle.kts
@@ -18,6 +18,8 @@ val gitBranch = GitCommand("rev-parse", "--abbrev-ref", "HEAD")
 
 val isReleaseVersion = gitTag.isNotEmpty() && gitStatus.isEmpty()
 
+rootProject.extra["isReleaseVersion"] = isReleaseVersion
+
 rootProject.extra["buildVersionName"] = run {
     if (isReleaseVersion) {
         gitTag.substring(1)