remove plugin applied twice and teamcity block

wldeh · wldeh · commit 80c8241c3b17 · 2023-09-06T23:31:21.000-07:00
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) }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ plugins {`
`28`	`28`	`kotlin("jvm") version "1.9.0"`
`29`	`29`	`}`
`30`	`30`
`31`		`-apply(plugin = "org.jetbrains.kotlin.jvm")`
`32`	`31`	`apply(plugin = "kotlinx.team.infra")`
`33`	`32`
`34`	`33`	`configure<InfraExtension> {`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,8 @@ pluginManagement {`
`2`	`2`	`repositories {`
`3`	`3`	`gradlePluginPortal()`
`4`	`4`	`val kotlin_repo_url: String? by settings`
`5`		`- kotlin_repo_url?.let { repoUrl ->`
`6`		`- if (repoUrl.isNotEmpty()) {`
`7`		`- maven { url = uri(repoUrl) }`
`8`		`- }`
	`5`	`+ kotlin_repo_url?.takeIf { it.isNotEmpty() }?.let { repoUrl ->`
	`6`	`+ maven { url = uri(repoUrl) }`
`9`	`7`	`}`
`10`	`8`	`}`
`11`	`9`	`}`