From 574d78efce60b400598d9f16947d14512bc020e7 Mon Sep 17 00:00:00 2001 From: Vladimir Sukharev Date: Wed, 9 Nov 2022 13:23:09 +0000 Subject: [PATCH] [K/N] Remove remains of jcenter from kotlin-native/ Revert two special entries Use proper mavenCentral() Remove remains of jcenter from kotlin-native/ Merge-request: KT-MR-7610 Merged-by: Vladimir Sukharev --- kotlin-native/dependencies/build.gradle | 4 +--- kotlin-native/performance/KotlinVsSwift/build.gradle | 4 +--- .../tools/kotlin-native-gradle-plugin/build.gradle | 4 +--- .../gradle/plugin/test/MultiplatformSpecification.groovy | 4 ++-- kotlin-native/tools/performance-server/build.gradle | 8 ++------ kotlin-native/tools/performance-server/ui/build.gradle | 8 ++------ 6 files changed, 9 insertions(+), 23 deletions(-) diff --git a/kotlin-native/dependencies/build.gradle b/kotlin-native/dependencies/build.gradle index 2e23f85148f..faa3540382d 100644 --- a/kotlin-native/dependencies/build.gradle +++ b/kotlin-native/dependencies/build.gradle @@ -17,9 +17,7 @@ buildscript { apply from: "$rootDir/kotlin-native/gradle/kotlinGradlePlugin.gradle" repositories { - maven { - url = 'https://cache-redirector.jetbrains.com/jcenter' - } + mavenCentral() } } diff --git a/kotlin-native/performance/KotlinVsSwift/build.gradle b/kotlin-native/performance/KotlinVsSwift/build.gradle index 276f375974d..880782e4bd0 100644 --- a/kotlin-native/performance/KotlinVsSwift/build.gradle +++ b/kotlin-native/performance/KotlinVsSwift/build.gradle @@ -1,9 +1,7 @@ buildscript { apply from: "$rootProject.projectDir/../gradle/kotlinGradlePlugin.gradle" repositories { - maven { - url 'https://cache-redirector.jetbrains.com/jcenter' - } + mavenCentral() } } diff --git a/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle b/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle index 322f49a0ded..f598417226b 100644 --- a/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle +++ b/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle @@ -23,9 +23,7 @@ buildscript { apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle" repositories { - maven { - url = 'https://cache-redirector.jetbrains.com/jcenter' - } + mavenCentral() 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 6e8f75c89e2..a7a52f42d03 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 @@ -32,7 +32,7 @@ class MultiplatformSpecification extends BaseKonanSpecification { url = '$KOTLIN_REPO' } maven { - url = 'https://cache-redirector.jetbrains.com/jcenter' + url = 'https://cache-redirector.jetbrains.com/maven-central' } } dependencies { @@ -47,7 +47,7 @@ class MultiplatformSpecification extends BaseKonanSpecification { url = '$KOTLIN_REPO' } maven { - url = 'https://cache-redirector.jetbrains.com/jcenter' + url = 'https://cache-redirector.jetbrains.com/maven-central' } } diff --git a/kotlin-native/tools/performance-server/build.gradle b/kotlin-native/tools/performance-server/build.gradle index d495cd26d58..81c5c802eb7 100644 --- a/kotlin-native/tools/performance-server/build.gradle +++ b/kotlin-native/tools/performance-server/build.gradle @@ -22,9 +22,7 @@ buildscript { apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle" repositories { - maven { - url 'https://cache-redirector.jetbrains.com/jcenter' - } + mavenCentral() maven { url project.bootstrapKotlinRepo } @@ -38,9 +36,7 @@ buildscript { apply plugin: 'kotlin-multiplatform' repositories { - maven { - url 'https://cache-redirector.jetbrains.com/jcenter' - } + mavenCentral() maven { url project.bootstrapKotlinRepo } diff --git a/kotlin-native/tools/performance-server/ui/build.gradle b/kotlin-native/tools/performance-server/ui/build.gradle index 695b5dea433..7c21e0f1f09 100644 --- a/kotlin-native/tools/performance-server/ui/build.gradle +++ b/kotlin-native/tools/performance-server/ui/build.gradle @@ -24,9 +24,7 @@ buildscript { apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle" repositories { - maven { - url 'https://cache-redirector.jetbrains.com/jcenter' - } + mavenCentral() maven { url project.bootstrapKotlinRepo } @@ -38,9 +36,7 @@ buildscript { } repositories { - maven { - url 'https://cache-redirector.jetbrains.com/jcenter' - } + mavenCentral() maven { url project.bootstrapKotlinRepo }