remove plugin applied twice and teamcity block

Kotlin · Sep 7, 2023 · ea1466b · ea1466b
1 parent 4fb6845
commit ea1466b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -20,17 +20,15 @@ buildscript {
 apply(plugin = "kotlinx.team.infra")
 
 configure<InfraExtension> {
-    teamcity {
-        libraryStagingRepoDescription = project.name
-    }
-
     publishing {
         include(":kotlinx-benchmark-runtime")
 
         libraryRepoUrl = "https://github.com/Kotlin/kotlinx-benchmark"
 
         if (project.findProperty("publication_repository") == "sonatype") {
-            sonatype {}
+            sonatype {
+                libraryStagingRepoDescription = project.name
+            }
         }
     }
 }

diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -28,7 +28,6 @@ plugins {
     kotlin("jvm") version "1.9.0"
 }
 
-apply(plugin = "org.jetbrains.kotlin.jvm")
 apply(plugin = "kotlinx.team.infra")
 
 configure<InfraExtension> {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -2,10 +2,8 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         val kotlin_repo_url: String? by settings
-        kotlin_repo_url?.let { repoUrl ->
-            if (repoUrl.isNotEmpty()) {
-                maven { url = uri(repoUrl) }
-            }
+        kotlin_repo_url?.takeIf { it.isNotEmpty() }?.let { repoUrl ->
+            maven { url = uri(repoUrl) }
         }
     }
 }