Support a new publication scheme (#551)

Author: fzhinkin

buildSrc/src/main/kotlin/Publishing.kt

@@ -6,24 +6,15 @@
 
 import org.gradle.api.*
 import org.gradle.api.artifacts.dsl.*
+import org.gradle.api.artifacts.repositories.PasswordCredentials
 import org.gradle.api.provider.*
 import org.gradle.api.publish.maven.*
+import org.gradle.api.publish.PublishingExtension
 import org.gradle.plugins.signing.*
 import java.net.*
 
 // Pom configuration
 
-fun mavenRepositoryUri(): URI {
-    val repositoryId: String? = System.getenv("libs.repository.id")
-    return if (repositoryId == null) {
-        // Using implicitly created staging, for MPP it's likely to be a mistake because
-        // publication on TeamCity will create 3 independent staging repositories
-        URI("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-    } else {
-        URI("https://oss.sonatype.org/service/local/staging/deployByRepositoryId/$repositoryId")
-    }
-}
-
 fun signPublicationIfKeyPresent(project: Project, publication: MavenPublication) {
     val keyId = project.getSensitiveProperty("libs.sign.key.id")
     val signingKey = project.getSensitiveProperty("libs.sign.key.private")
@@ -36,6 +27,23 @@ fun signPublicationIfKeyPresent(project: Project, publication: MavenPublication)
     }
 }
 
+fun PublishingExtension.addPublishingRepositoryIfPresent() {
+    val repoUrl = System.getenv("libs.repo.url")
+    if (!repoUrl.isNullOrBlank()) {
+        repositories {
+            maven {
+                // if you change the name, you should change the name of the credential properties on CI as well
+                name = "MavenRepositoryForPublishing"
+                url = URI(repoUrl)
+
+                // we use such type of credential because of the configuration cache problems with other types:
+                // https://github.com/gradle/gradle/issues/24040
+                credentials(PasswordCredentials::class.java)
+            }
+        }
+    }
+}
+
 internal fun Project.getSensitiveProperty(name: String): String? {
     return project.findProperty(name) as? String ?: System.getenv(name)
 }

buildSrc/src/main/kotlin/base-publish-conventions.gradle.kts

@@ -4,18 +4,8 @@ plugins {
 }
 
 publishing {
-    repositories {
-        maven {
-            // if you change the name, you should change the name of the credential properties on CI as well
-            name = "MavenRepositoryForPublishing"
+    addPublishingRepositoryIfPresent()
 
-            url = mavenRepositoryUri()
-
-            // we use such type of credential because of the configuration cache problems with other types:
-            // https://github.com/gradle/gradle/issues/24040
-            credentials(PasswordCredentials::class)
-        }
-    }
     publications.withType<MavenPublication>().configureEach {
         pom {
             name = project.name
@@ -44,7 +34,6 @@ publishing {
             }
         }
 
-
         signPublicationIfKeyPresent(project, this)
     }