Upgrade infra version to 0.3.0-dev-64

Author: Abduqodiri Qurbonzoda

.teamcity/settings.kts

@@ -46,10 +46,16 @@ project {
 
     val deployVersion = deployVersion().apply {
         dependsOnSnapshot(buildAll, onFailure = FailureAction.IGNORE)
+        dependsOnSnapshot(BUILD_CREATE_STAGING_REPO_ABSOLUTE_ID) {
+            reuseBuilds = ReuseBuilds.NO
+        }
     }
     val deploys = platforms.map { deploy(it, deployVersion) }
     val deployPublish = deployPublish(deployVersion).apply {
         dependsOnSnapshot(buildAll, onFailure = FailureAction.IGNORE)
+        dependsOnSnapshot(BUILD_CREATE_STAGING_REPO_ABSOLUTE_ID) {
+            reuseBuilds = ReuseBuilds.NO
+        }
         deploys.forEach {
             dependsOnSnapshot(it)
         }
@@ -139,6 +145,8 @@ fun Project.deployVersion() = BuildType {
         param("bintray-user", bintrayUserName)
         password("bintray-key", bintrayToken)
         param(versionSuffixParameter, "dev-%build.counter%")
+        param("reverse.dep.$BUILD_CREATE_STAGING_REPO_ABSOLUTE_ID.system.libs.repo.description", libraryStagingRepoDescription)
+        param("env.libs.repository.id", "%dep.$BUILD_CREATE_STAGING_REPO_ABSOLUTE_ID.env.libs.repository.id%")
     }
 
     requirements {
@@ -149,7 +157,7 @@ fun Project.deployVersion() = BuildType {
     steps {
         gradle {
             name = "Verify Gradle Configuration"
-            tasks = "clean publishBintrayCreateVersion"
+            tasks = "clean publishPrepareVersion"
             gradleParams = "--info --stacktrace -P$versionSuffixParameter=%$versionSuffixParameter% -P$releaseVersionParameter=%$releaseVersionParameter% -PbintrayApiKey=%bintray-key% -PbintrayUser=%bintray-user%"
             buildFile = ""
             jdkHome = "%env.$jdk%"
@@ -167,6 +175,7 @@ fun Project.deployPublish(configureBuild: BuildType) = BuildType {
         // Tell configuration build how to get release version parameter from this build
         // "dev" is the default and means publishing is not releasing to public
         text(configureBuild.reverseDepParamRefs[releaseVersionParameter].name, "dev", display = ParameterDisplay.PROMPT, label = "Release Version")
+        param("env.libs.repository.id", "%dep.$BUILD_CREATE_STAGING_REPO_ABSOLUTE_ID.env.libs.repository.id%")
     }
     commonConfigure()
 }.also { buildType(it) }
@@ -181,6 +190,7 @@ fun Project.deploy(platform: Platform, configureBuild: BuildType) = buildType("D
         param(releaseVersionParameter, "${configureBuild.depParamRefs[releaseVersionParameter]}")
         param("bintray-user", bintrayUserName)
         password("bintray-key", bintrayToken)
+        param("env.libs.repository.id", "%dep.$BUILD_CREATE_STAGING_REPO_ABSOLUTE_ID.env.libs.repository.id%")
     }
 
     vcs {

.teamcity/utils.kt

@@ -9,8 +9,9 @@ const val versionSuffixParameter = "versionSuffix"
 const val teamcitySuffixParameter = "teamcitySuffix"
 const val releaseVersionParameter = "releaseVersion"
 
-const val bintrayUserName = "orangy"
-const val bintrayToken = "credentialsJSON:9a48193c-d16d-46c7-8751-2fb434b09e07"
+const val bintrayUserName = "%env.BINTRAY_USER%"
+const val bintrayToken = "%env.BINTRAY_API_KEY%"
+const val libraryStagingRepoDescription = "kotlinx.benchmark"
 
 val platforms = Platform.values()
 const val jdk = "JDK_18_x64"
@@ -37,6 +38,8 @@ const val BUILD_ALL_ID = "Build_All"
 const val DEPLOY_CONFIGURE_VERSION_ID = "Deploy_Configure"
 const val DEPLOY_PUBLISH_ID = "Deploy_Publish"
 
+val BUILD_CREATE_STAGING_REPO_ABSOLUTE_ID = AbsoluteId("KotlinTools_CreateSonatypeStagingRepository")
+
 class KnownBuilds(private val project: Project) {
     private fun buildWithId(id: String): BuildType {
         return project.buildTypes.single { it.id.toString().endsWith(id) }
@@ -103,12 +106,12 @@ fun BuildType.commonConfigure() {
     }
 }
 
-fun BuildType.dependsOn(build: BuildType, configure: Dependency.() -> Unit) =
+fun BuildType.dependsOn(build: IdOwner, configure: Dependency.() -> Unit) =
         apply {
             dependencies.dependency(build, configure)
         }
 
-fun BuildType.dependsOnSnapshot(build: BuildType, onFailure: FailureAction = FailureAction.FAIL_TO_START, configure: SnapshotDependency.() -> Unit = {}) = apply {
+fun BuildType.dependsOnSnapshot(build: IdOwner, onFailure: FailureAction = FailureAction.FAIL_TO_START, configure: SnapshotDependency.() -> Unit = {}) = apply {
     dependencies.dependency(build) {
         snapshot {
             configure()

build.gradle

@@ -16,21 +16,14 @@ apply plugin: 'kotlinx.team.infra'
 
 infra {
     teamcity {
-        bintrayUser = "orangy"
-        bintrayToken = "credentialsJSON:9a48193c-d16d-46c7-8751-2fb434b09e07"
+        libraryStagingRepoDescription = project.name
     }
 
     publishing {
         include(":kotlinx.benchmark.runtime")
 
-        bintray {
-            organization = 'kotlin'
-            repository = 'kotlinx'
-            library = 'kotlinx.benchmark'
-
-            username = findProperty('bintrayUser')
-            password = findProperty('bintrayApiKey')
-        }
+        libraryRepoUrl = "https://github.com/Kotlin/kotlinx-benchmark"
+        sonatype {}
     }
 }
 

gradle.properties

@@ -7,7 +7,7 @@ kotlin_version=1.4.30
 jmhVersion=1.21
 junit_version=4.12
 
-infra_version=0.2.0-dev-55
+infra_version=0.3.0-dev-64
 
 node_version = 8.9.4
 npm_version = 5.7.1

plugin/build.gradle

@@ -20,17 +20,14 @@ apply plugin: 'org.jetbrains.kotlin.jvm'
 apply plugin: 'kotlinx.team.infra'
 
 infra {
+    teamcity {
+        libraryStagingRepoDescription = project.name
+    }
     publishing {
         include(":")
 
-        bintray {
-            organization = 'kotlin'
-            repository = 'kotlinx'
-            library = 'kotlinx.benchmark'
-
-            username = findProperty('bintrayUser')
-            password = findProperty('bintrayApiKey')
-        }
+        libraryRepoUrl = "https://github.com/Kotlin/kotlinx-benchmark"
+        sonatype {}
     }
 }
 

plugin/gradle.properties

@@ -10,5 +10,5 @@ vcs=https://github.com/kotlin/kotlinx-benchmark
 kotlin_version=1.4.30
 jmhVersion=1.21
 junit_version=4.12
-infra_version=0.2.0-dev-55
+infra_version=0.3.0-dev-64