diff --git a/build.gradle.kts b/build.gradle.kts index 0666366b22b..3b44f0ece96 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -426,7 +426,7 @@ allprojects { jcenter() maven(protobufRepo) maven(intellijRepo) - maven("https://kotlin.bintray.com/kotlin-dependencies") + maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") maven("https://jetbrains.bintray.com/intellij-third-party-dependencies") maven("https://dl.google.com/dl/android/maven2") bootstrapKotlinRepo?.let(::maven) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 2ae3bb8fe71..c8979e1aa73 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -12,10 +12,10 @@ buildscript { repositories { if (cacheRedirectorEnabled) { maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com") - maven("https://cache-redirector.jetbrains.com/kotlin.bintray.com/kotlin-dependencies") + maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") } else { jcenter() - maven("https://kotlin.bintray.com/kotlin-dependencies") + maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") } project.bootstrapKotlinRepo?.let { @@ -88,7 +88,7 @@ extra["customDepsOrg"] = "kotlin.build" repositories { jcenter() maven("https://jetbrains.bintray.com/intellij-third-party-dependencies/") - maven("https://kotlin.bintray.com/kotlin-dependencies") + maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") gradlePluginPortal() extra["bootstrapKotlinRepo"]?.let { diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle index 04df243f589..1bb5591b541 100644 --- a/buildSrc/settings.gradle +++ b/buildSrc/settings.gradle @@ -14,9 +14,9 @@ pluginManagement { buildscript { repositories { if (cacheRedirectorEnabled == 'true') { - maven { url "https://cache-redirector.jetbrains.com/kotlin.bintray.com/kotlin-dependencies" } + maven { url "https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies" } } else { - maven { url "https://kotlin.bintray.com/kotlin-dependencies" } + maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies" } } } dependencies { diff --git a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt index ad43a40c0c4..bf7ac274d12 100644 --- a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt @@ -309,11 +309,9 @@ class CodeConformanceTest : TestCase() { RepoAllowList( "https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev", root, setOf() ), - RepoAllowList( - "kotlin/ktor", root, setOf( - "gradle/cacheRedirector.gradle.kts" - ) - ), + RepoAllowList("kotlin/ktor", root, setOf("gradle/cacheRedirector.gradle.kts")), + RepoAllowList("bintray.com/kotlin-dependencies", root, setOf("gradle/cacheRedirector.gradle.kts")), + RepoAllowList("api.bintray.com/maven/kotlin/kotlin-dependencies", root, setOf()), RepoAllowList( // Please use cache-redirector for importing in tests "https://dl.bintray.com/kotlin/kotlin-dev", root, setOf( diff --git a/dependencies/kotlin-build-gradle-plugin/build.gradle.kts b/dependencies/kotlin-build-gradle-plugin/build.gradle.kts index 6a48f0c8e2c..6a45def015b 100644 --- a/dependencies/kotlin-build-gradle-plugin/build.gradle.kts +++ b/dependencies/kotlin-build-gradle-plugin/build.gradle.kts @@ -42,18 +42,9 @@ publishing { repositories { maven { - name = "bintray" - url = uri("https://api.bintray.com/maven/kotlin/kotlin-dependencies/kotlin-build-gradle-plugin") - authentication { - val mavenUser = findProperty("kotlin.bintray.user") as String? - val mavenPass = findProperty("kotlin.bintray.password") as String? - if (mavenUser != null && mavenPass != null) { - credentials { - username = mavenUser - password = mavenPass - } - } - } + name = "kotlinSpace" + url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") + credentials(org.gradle.api.artifacts.repositories.PasswordCredentials::class) } } } diff --git a/dependencies/publishing.gradle.kts b/dependencies/publishing.gradle.kts index 99278f17b1a..a6125644c28 100644 --- a/dependencies/publishing.gradle.kts +++ b/dependencies/publishing.gradle.kts @@ -1,17 +1,10 @@ -import com.jfrog.bintray.gradle.BintrayExtension - buildscript { repositories { maven("https://plugins.gradle.org/m2") } - - dependencies { - classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4") - } } apply(plugin = "maven-publish") -apply(plugin = "com.jfrog.bintray") val archives by configurations @@ -24,20 +17,9 @@ configure { repositories { maven { - url = uri("${rootProject.buildDir}/internal/repo") + name = "kotlinSpace" + url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") + credentials(org.gradle.api.artifacts.repositories.PasswordCredentials::class) } } -} - -configure { - user = findProperty("bintray.user") as String? - key = findProperty("bintray.apikey") as String? - - setPublications("maven") - - pkg.apply { - repo = "kotlin-dependencies" - name = project.name - userOrg = "kotlin" - } } \ No newline at end of file diff --git a/gradle/cacheRedirector.gradle.kts b/gradle/cacheRedirector.gradle.kts index c41cc504564..4f968d6c225 100644 --- a/gradle/cacheRedirector.gradle.kts +++ b/gradle/cacheRedirector.gradle.kts @@ -53,6 +53,8 @@ val mirroredUrls = listOf( "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev", "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap", "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/eap", + "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies", + "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide", "https://kotlin.bintray.com/dukat", "https://kotlin.bintray.com/kotlin-dependencies", "https://oss.sonatype.org/content/repositories/releases", diff --git a/settings.gradle b/settings.gradle index 761b6d7ab2d..65f5704ac74 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,10 +10,10 @@ pluginManagement { if (cacheRedirectorEnabled == 'true') { logger.info("Using cache redirector for settings.gradle pluginManagement") maven { url "https://cache-redirector.jetbrains.com/plugins.gradle.org/m2" } - maven { url "https://cache-redirector.jetbrains.com/kotlin.bintray.com/kotlin-dependencies" } + maven { url "https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies" } } else { gradlePluginPortal() - maven { url "https://kotlin.bintray.com/kotlin-dependencies" } + maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies" } } } } @@ -21,9 +21,9 @@ pluginManagement { buildscript { repositories { if (cacheRedirectorEnabled == 'true') { - maven { url "https://cache-redirector.jetbrains.com/kotlin.bintray.com/kotlin-dependencies" } + maven { url "https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies" } } else { - maven { url "https://kotlin.bintray.com/kotlin-dependencies" } + maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies" } } } dependencies {