From 44f638e9525c4e61146ee7df510ce087a7b49fbe Mon Sep 17 00:00:00 2001 From: Vladimir Sukharev Date: Mon, 31 Oct 2022 18:31:36 +0100 Subject: [PATCH] Drop K/N dependency to JCenter --- .../tests/samples/html5Canvas/build.gradle.kts | 4 ---- .../backend.native/tests/samples/uikit/build.gradle.kts | 6 ------ .../backend.native/tests/samples/watchos/build.gradle.kts | 6 ------ .../src/main/kotlin/org/jetbrains/kotlin/CopySamples.kt | 1 - kotlin-native/build.gradle | 6 ------ kotlin-native/performance/KotlinVsSwift/build.gradle | 1 - kotlin-native/performance/build.gradle | 2 -- kotlin-native/performance/buildSrc/build.gradle.kts | 2 -- kotlin-native/performance/buildSrc/settings.gradle.kts | 1 - kotlin-native/performance/framework/build.gradle | 8 -------- kotlin-native/tools/benchmarksAnalyzer/build.gradle | 2 -- .../tools/benchmarksAnalyzer/buildSrc/build.gradle.kts | 2 -- .../tools/kotlin-native-gradle-plugin/build.gradle | 1 - .../gradle/plugin/test/MultiplatformSpecification.groovy | 2 -- kotlin-native/tools/performance-server/build.gradle | 2 -- .../tools/performance-server/buildSrc/build.gradle.kts | 2 -- .../tools/performance-server/buildSrc/settings.gradle.kts | 1 - kotlin-native/tools/performance-server/ui/build.gradle | 2 -- .../tools/performance-server/ui/buildSrc/build.gradle.kts | 2 -- .../performance-server/ui/buildSrc/settings.gradle.kts | 1 - 20 files changed, 54 deletions(-) diff --git a/kotlin-native/backend.native/tests/samples/html5Canvas/build.gradle.kts b/kotlin-native/backend.native/tests/samples/html5Canvas/build.gradle.kts index cd8783fe9ec..c9c83a6e1f9 100644 --- a/kotlin-native/backend.native/tests/samples/html5Canvas/build.gradle.kts +++ b/kotlin-native/backend.native/tests/samples/html5Canvas/build.gradle.kts @@ -6,10 +6,6 @@ plugins { kotlin("multiplatform") } -repositories { - jcenter() -} - val hostOs = System.getProperty("os.name") val isWindows = hostOs.startsWith("Windows") diff --git a/kotlin-native/backend.native/tests/samples/uikit/build.gradle.kts b/kotlin-native/backend.native/tests/samples/uikit/build.gradle.kts index 14cb5824654..98b3b45a5f2 100644 --- a/kotlin-native/backend.native/tests/samples/uikit/build.gradle.kts +++ b/kotlin-native/backend.native/tests/samples/uikit/build.gradle.kts @@ -5,12 +5,6 @@ plugins { kotlin("multiplatform") } -allprojects { - repositories { - jcenter() - } -} - val sdkName: String? = System.getenv("SDK_NAME") enum class Target(val simulator: Boolean, val key: String) { diff --git a/kotlin-native/backend.native/tests/samples/watchos/build.gradle.kts b/kotlin-native/backend.native/tests/samples/watchos/build.gradle.kts index b1a0672b5fb..acc26f62604 100644 --- a/kotlin-native/backend.native/tests/samples/watchos/build.gradle.kts +++ b/kotlin-native/backend.native/tests/samples/watchos/build.gradle.kts @@ -5,12 +5,6 @@ plugins { kotlin("multiplatform") } -allprojects { - repositories { - jcenter() - } -} - val sdkName: String? = System.getenv("SDK_NAME") enum class Target(val simulator: Boolean, val key: String) { diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/CopySamples.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/CopySamples.kt index 08cbcd2e2f4..31aae232ee6 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/CopySamples.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/CopySamples.kt @@ -60,6 +60,5 @@ open class CopySamples : Copy() { private val replacements = listOf( "https://plugins.gradle.org/m2" to "https://cache-redirector.jetbrains.com/plugins.gradle.org/m2", "mavenCentral()" to "maven { setUrl(\"https://cache-redirector.jetbrains.com/maven-central\") }", - "jcenter()" to "maven { setUrl(\"https://cache-redirector.jetbrains.com/jcenter\") }" ) } diff --git a/kotlin-native/build.gradle b/kotlin-native/build.gradle index 0fc45a08731..e41ede7b7ec 100644 --- a/kotlin-native/build.gradle +++ b/kotlin-native/build.gradle @@ -33,7 +33,6 @@ buildscript { repositories { mavenCentral() - jcenter() gradlePluginPortal() } @@ -91,11 +90,6 @@ ext { } allprojects { - buildscript { - repositories { - jcenter() - } - } if (path != ":kotlin-native:dependencies") { evaluationDependsOn(":kotlin-native:dependencies") } diff --git a/kotlin-native/performance/KotlinVsSwift/build.gradle b/kotlin-native/performance/KotlinVsSwift/build.gradle index 19ddc7a45b2..276f375974d 100644 --- a/kotlin-native/performance/KotlinVsSwift/build.gradle +++ b/kotlin-native/performance/KotlinVsSwift/build.gradle @@ -4,7 +4,6 @@ buildscript { maven { url 'https://cache-redirector.jetbrains.com/jcenter' } - jcenter() } } diff --git a/kotlin-native/performance/build.gradle b/kotlin-native/performance/build.gradle index 9356ed29e52..246bae2bae9 100644 --- a/kotlin-native/performance/build.gradle +++ b/kotlin-native/performance/build.gradle @@ -26,7 +26,6 @@ buildscript { repositories { maven{ url = "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies" } mavenCentral() - jcenter() } dependencies { @@ -83,7 +82,6 @@ subprojects { proj -> } ?: proj.ext["buildNumber"] proj.buildscript.repositories { - jcenter() maven { url proj.ext["bootstrapKotlinRepo"] } diff --git a/kotlin-native/performance/buildSrc/build.gradle.kts b/kotlin-native/performance/buildSrc/build.gradle.kts index 9d7ece82abe..561958dc665 100644 --- a/kotlin-native/performance/buildSrc/build.gradle.kts +++ b/kotlin-native/performance/buildSrc/build.gradle.kts @@ -22,7 +22,6 @@ buildscript { repositories { maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") - jcenter() mavenCentral() project.bootstrapKotlinRepo?.let { maven(url = it) @@ -47,7 +46,6 @@ plugins { val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true repositories { maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") - jcenter() mavenCentral() gradlePluginPortal() extra["bootstrapKotlinRepo"]?.let { diff --git a/kotlin-native/performance/buildSrc/settings.gradle.kts b/kotlin-native/performance/buildSrc/settings.gradle.kts index 11b1beb9bbc..af5c8428bb5 100644 --- a/kotlin-native/performance/buildSrc/settings.gradle.kts +++ b/kotlin-native/performance/buildSrc/settings.gradle.kts @@ -2,7 +2,6 @@ import java.io.File pluginManagement { repositories { maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") - jcenter() mavenCentral() gradlePluginPortal() } diff --git a/kotlin-native/performance/framework/build.gradle b/kotlin-native/performance/framework/build.gradle index 08899e67a52..3cac0b07461 100644 --- a/kotlin-native/performance/framework/build.gradle +++ b/kotlin-native/performance/framework/build.gradle @@ -6,18 +6,10 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType buildscript { ext.rootBuildDirectory = file('../..') apply from: "$rootProject.projectDir/../gradle/kotlinGradlePlugin.gradle" - - repositories { - jcenter() - } } apply plugin: 'kotlin-multiplatform' -repositories { - jcenter() -} - def toolsPath = '../../tools' def frameworkName = 'benchmarksAnalyzer' diff --git a/kotlin-native/tools/benchmarksAnalyzer/build.gradle b/kotlin-native/tools/benchmarksAnalyzer/build.gradle index dc9507a985d..588174481c3 100644 --- a/kotlin-native/tools/benchmarksAnalyzer/build.gradle +++ b/kotlin-native/tools/benchmarksAnalyzer/build.gradle @@ -23,7 +23,6 @@ buildscript { apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle" repositories { - jcenter() mavenCentral() } @@ -38,7 +37,6 @@ repositories { maven { url project.bootstrapKotlinRepo } - jcenter() mavenCentral() } diff --git a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts index c473279356f..c91e40aa7fb 100644 --- a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts +++ b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts @@ -25,7 +25,6 @@ buildscript { repositories { maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") mavenCentral() - jcenter() project.bootstrapKotlinRepo?.let { maven(url = it) } @@ -49,7 +48,6 @@ plugins { val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true repositories { maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") - jcenter() mavenCentral() gradlePluginPortal() extra["bootstrapKotlinRepo"]?.let { diff --git a/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle b/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle index ed6654f2b3c..322f49a0ded 100644 --- a/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle +++ b/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle @@ -26,7 +26,6 @@ buildscript { maven { url = 'https://cache-redirector.jetbrains.com/jcenter' } - jcenter() maven { url "https://cache-redirector.jetbrains.com/plugins.gradle.org/m2/" } diff --git a/kotlin-native/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/MultiplatformSpecification.groovy b/kotlin-native/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/MultiplatformSpecification.groovy index b5069a5e64d..6e8f75c89e2 100644 --- a/kotlin-native/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/MultiplatformSpecification.groovy +++ b/kotlin-native/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/MultiplatformSpecification.groovy @@ -34,7 +34,6 @@ class MultiplatformSpecification extends BaseKonanSpecification { maven { url = 'https://cache-redirector.jetbrains.com/jcenter' } - jcenter() } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION" @@ -50,7 +49,6 @@ class MultiplatformSpecification extends BaseKonanSpecification { maven { url = 'https://cache-redirector.jetbrains.com/jcenter' } - jcenter() } dependencies { diff --git a/kotlin-native/tools/performance-server/build.gradle b/kotlin-native/tools/performance-server/build.gradle index 3a40ae4c0c7..d495cd26d58 100644 --- a/kotlin-native/tools/performance-server/build.gradle +++ b/kotlin-native/tools/performance-server/build.gradle @@ -25,7 +25,6 @@ buildscript { maven { url 'https://cache-redirector.jetbrains.com/jcenter' } - jcenter() maven { url project.bootstrapKotlinRepo } @@ -45,7 +44,6 @@ repositories { maven { url project.bootstrapKotlinRepo } - jcenter() } kotlin { diff --git a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts index 49920dd6566..c66df39ccbe 100644 --- a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts +++ b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts @@ -22,7 +22,6 @@ buildscript { repositories { maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") - jcenter() project.bootstrapKotlinRepo?.let { maven(url = it) } @@ -47,7 +46,6 @@ plugins { val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true repositories { maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") - jcenter() gradlePluginPortal() extra["bootstrapKotlinRepo"]?.let { maven(url = it) diff --git a/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts b/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts index d2779da5bc0..6762ff93f7e 100644 --- a/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts +++ b/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts @@ -1,7 +1,6 @@ pluginManagement { repositories { maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") - jcenter() mavenCentral() gradlePluginPortal() } diff --git a/kotlin-native/tools/performance-server/ui/build.gradle b/kotlin-native/tools/performance-server/ui/build.gradle index cf66304a60c..695b5dea433 100644 --- a/kotlin-native/tools/performance-server/ui/build.gradle +++ b/kotlin-native/tools/performance-server/ui/build.gradle @@ -27,7 +27,6 @@ buildscript { maven { url 'https://cache-redirector.jetbrains.com/jcenter' } - jcenter() maven { url project.bootstrapKotlinRepo } @@ -42,7 +41,6 @@ repositories { maven { url 'https://cache-redirector.jetbrains.com/jcenter' } - jcenter() maven { url project.bootstrapKotlinRepo } diff --git a/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts index 808a3c53d9a..61986609826 100644 --- a/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts +++ b/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts @@ -22,7 +22,6 @@ buildscript { repositories { maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") - jcenter() project.bootstrapKotlinRepo?.let { maven(url = it) } @@ -46,7 +45,6 @@ plugins { val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true repositories { maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") - jcenter() gradlePluginPortal() extra["bootstrapKotlinRepo"]?.let { maven(url = it) diff --git a/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts b/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts index 243849f4b98..8266b22c175 100644 --- a/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts +++ b/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts @@ -6,7 +6,6 @@ pluginManagement { artifact() } } - jcenter() mavenCentral() gradlePluginPortal() }