From 1ae2c1ff6aaa4fb6accb5d26060e9b6caac58b52 Mon Sep 17 00:00:00 2001 From: "leonid.stashevsky" Date: Mon, 4 Apr 2022 13:55:52 +0200 Subject: [PATCH] KTOR-4109 Release 2.0.0-rc-1 --- buildSrc/src/main/kotlin/Publication.kt | 23 ++++++++++++++++++++++- gradle.properties | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/Publication.kt b/buildSrc/src/main/kotlin/Publication.kt index ee2b3ce646..33b6164366 100644 --- a/buildSrc/src/main/kotlin/Publication.kt +++ b/buildSrc/src/main/kotlin/Publication.kt @@ -9,6 +9,7 @@ import org.gradle.api.publish.maven.tasks.* import org.gradle.jvm.tasks.* import org.gradle.kotlin.dsl.* import org.gradle.plugins.signing.* +import java.util.concurrent.locks.ReentrantLock fun isAvailableForPublication(publication: Publication): Boolean { val name = publication.name @@ -61,7 +62,15 @@ fun Project.configurePublication() { val publishingUser: String? = System.getenv("PUBLISHING_USER") val publishingPassword: String? = System.getenv("PUBLISHING_PASSWORD") - val publishingUrl: String? = System.getenv("PUBLISHING_URL") + + val repositoryId: String? = System.getenv("REPOSITORY_ID") + val publishingUrl: String? = if (repositoryId?.isNotBlank() == true) { + println("Set publishing to repository $repositoryId") + "https://oss.sonatype.org/service/local/staging/deployByRepositoryId/$repositoryId" + } else { + println("Publishing to default URL") + System.getenv("PUBLISHING_URL") + } val publishLocal: Boolean by rootProject.extra val globalM2: String by rootProject.extra @@ -165,5 +174,17 @@ fun Project.configurePublication() { sign(the().publications) } + + val gpgAgentLock: ReentrantLock by rootProject.extra { ReentrantLock() } + + tasks.withType { + doFirst { + gpgAgentLock.lock() + } + + doLast { + gpgAgentLock.unlock() + } + } } } diff --git a/gradle.properties b/gradle.properties index bf68397b82..894c8d5ef2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ kotlin.code.style=official # config -version=2.0.0-SNAPSHOT +version=2.0.0-rc-1 kotlin.incremental.js=true kotlin.incremental.multiplatform=true kotlin.native.ignoreIncorrectDependencies=true