Move libraryStagingRepoDescription to publishing/sonatype

Author: ilya-g

main/src/kotlinx/team/infra/InfraPlugin.kt

@@ -27,7 +27,7 @@ class InfraPlugin : Plugin<Project> {
 
         // it only creates a task, so no problem with unpopulated extension
         configureTeamCityLogging()
-        configureTeamCityConfigGenerator(extension.teamcity)
+        configureTeamCityConfigGenerator(extension.teamcity, extension.publishing)
 
         extension.afterPublishing {
             configurePublishing(it)

main/src/kotlinx/team/infra/Publishing.kt

@@ -36,15 +36,14 @@ open class PublishingConfiguration @Inject constructor(val objects: ObjectFactor
 }
 
 open class SonatypeConfiguration {
-    // no things to configure here for now
-    // all information is provided with properties or env. variables with known names:
+    var libraryStagingRepoDescription: String? = null
+
+    // other information is provided with properties or env. variables with known names:
     // - libs.repository.id: sonatype staging repository id, 'auto' to open staging implicitly,
     // - libs.sonatype.user: sonatype user name
     // - libs.sonatype.password: sonatype password
     // - libs.sign.key.id, libs.sign.key.private, libs.sign.passphrase: publication signing information
     internal var isSelected: Boolean = false
-
-    public var testProperty: String = "default"
 }
 
 // TODO: Add space configuration

main/src/kotlinx/team/infra/TeamCity.kt

@@ -4,6 +4,7 @@ import org.gradle.api.*
 import java.io.*
 
 open class TeamCityConfiguration {
+    @Deprecated("Configure libraryStagingRepoDescription in infra/publishing/sonatype")
     var libraryStagingRepoDescription: String? = null
 
     var jdk = "JDK_18_x64"
@@ -21,7 +22,7 @@ fun Project.configureTeamCityLogging() {
     }
 }
 
-fun Project.configureTeamCityConfigGenerator(teamcity: TeamCityConfiguration) {
+fun Project.configureTeamCityConfigGenerator(teamcity: TeamCityConfiguration, publishing: PublishingConfiguration) {
     task<DefaultTask>("setupTeamCity") {
         group = "build setup"
         description = "Generates TeamCity project build configuration scripts"
@@ -35,7 +36,7 @@ fun Project.configureTeamCityConfigGenerator(teamcity: TeamCityConfiguration) {
             }
             @Suppress("DEPRECATION")
             copyResource(teamcityDir, "utils.kt") { text ->
-                val libraryStagingRepoDescription = teamcity.libraryStagingRepoDescription
+                val libraryStagingRepoDescription = publishing.sonatype.libraryStagingRepoDescription ?: teamcity.libraryStagingRepoDescription
                     ?: throw KotlinInfrastructureException("TeamCity configuration should specify `libraryStagingRepoDescription`: the library description for staging repositories")
                 text
                     .replace("<<LIBRARY_STAGING_REPO_DESCRIPTION>>", libraryStagingRepoDescription)