diff --git a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt index 268ca045d9b..e03aacdeb65 100644 --- a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt @@ -322,35 +322,6 @@ class CodeConformanceTest : TestCase() { 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( - "libraries/tools/new-project-wizard/new-project-wizard-cli/testData", - "gradle/cacheRedirector.gradle.kts", - "kotlin-ultimate/prepare/mobile-plugin/build.gradle.kts", - "kotlin-ultimate/gradle/cidrPluginTools.gradle.kts", - "libraries/tools/kotlin-gradle-plugin-integration-tests/build/resources/test/testProject/native-fat-framework/smoke/build.gradle.kts", - "libraries/tools/kotlin-gradle-plugin-integration-tests/build/resources/test/testProject/kotlin2JsProjectWithSourceMapInline/build.gradle", - "libraries/tools/kotlin-gradle-plugin-integration-tests/build/resources/test/testProject/new-mpp-android/build.gradle", - "libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-fat-framework/smoke/build.gradle.kts", - "libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithSourceMapInline/build.gradle", - "libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/build.gradle", - "libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt", - "libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/service/KotlinVersionProviderService.kt", - "idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/build.gradle.kts", - "idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/settings.gradle.kts", - "idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/build.gradle.kts", - "idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/settings.gradle.kts", - "idea/testData/perfTest/native/_common/settings.gradle.kts", - "idea/testData/gradle/nativeLibraries/commonIOSWithDisabledPropagation/settings.gradle.kts", - "idea/testData/gradle/packagePrefixImport/packagePrefixNonMPP/build.gradle", - "idea/testData/gradle/gradleFacetImportTest/jvmImportWithCustomSourceSets_1_1_2/build.gradle", - "idea/testData/gradle/gradleFacetImportTest/jvmImport_1_1_2/build.gradle", - "idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt", - "idea/testData/perfTest/native/_common/build.gradle.kts.header" - ) - ), - RepoAllowList("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev", root, setOf()), RepoAllowList( // Please use cache-redirector for importing in tests "https://dl.bintray.com/kotlin/kotlin-bootstrap", root, setOf( diff --git a/dependencies/kotlin-build-gradle-plugin/src/Bootstrap.kt b/dependencies/kotlin-build-gradle-plugin/src/Bootstrap.kt index 0a25d88ced1..77523c6c061 100644 --- a/dependencies/kotlin-build-gradle-plugin/src/Bootstrap.kt +++ b/dependencies/kotlin-build-gradle-plugin/src/Bootstrap.kt @@ -65,14 +65,6 @@ sealed class BootstrapOption { } } - /** Get bootstrap from kotlin-dev bintray repo */ - class BintrayDev(kotlinVersion: String, cacheRedirector: Boolean = false) : - Custom(kotlinVersion, "https://dl.bintray.com/kotlin/kotlin-dev", cacheRedirector) - - /** Get bootstrap from kotlin-bootstrap bintray repo, where bootstraps are published */ - class BintrayBootstrap(kotlinVersion: String, cacheRedirector: Boolean = false) : - Custom(kotlinVersion, "https://dl.bintray.com/kotlin/kotlin-bootstrap", cacheRedirector) - /** Get bootstrap from kotlin bootstrap space repo, where bootstraps are published */ class SpaceBootstrap(kotlinVersion: String, cacheRedirector: Boolean = false) : Custom(kotlinVersion, "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap", cacheRedirector) diff --git a/gradle.properties b/gradle.properties index 916d3a7285c..56bc2f0a4ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ kotlin.build.useIR=true #kotlin.build.useIRForLibraries=true #maven.repository.mirror=http://repository.jetbrains.com/remote-repos/ -#bootstrap.kotlin.repo=https://dl.bintray.com/kotlin/kotlin-dev +#bootstrap.kotlin.repo=https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap #bootstrap.kotlin.version=1.1.50-dev-1451 bootstrap.kotlin.default.version=1.5.20-dev-2613 diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt index 223663d669a..c373357449a 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt @@ -81,16 +81,12 @@ abstract class MultiplePluginVersionGradleImportingTestCase : GradleImportingTes } fun repositories(useKts: Boolean): String { - val customRepositories = arrayOf( - "https://dl.bintray.com/kotlin/kotlin-dev", - ) - val customMavenRepositories = customRepositories.map { if (useKts) "maven(\"$it\")" else "maven { url '$it' } " }.joinToString("\n") return """ - mavenCentral() mavenLocal() + mavenCentral() + gradlePluginPortal() google() jcenter() - $customMavenRepositories """.trimIndent() } diff --git a/idea/testData/gradle/nativeLibraries/commonIOSWithDisabledPropagation/settings.gradle.kts b/idea/testData/gradle/nativeLibraries/commonIOSWithDisabledPropagation/settings.gradle.kts index 891ddc4234b..d40f8dad6e4 100644 --- a/idea/testData/gradle/nativeLibraries/commonIOSWithDisabledPropagation/settings.gradle.kts +++ b/idea/testData/gradle/nativeLibraries/commonIOSWithDisabledPropagation/settings.gradle.kts @@ -2,6 +2,5 @@ pluginManagement { repositories { jcenter() gradlePluginPortal() - maven { setUrl("https://dl.bintray.com/kotlin/kotlin-dev") } } } \ No newline at end of file diff --git a/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/build.gradle.kts b/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/build.gradle.kts index 45d27602ee0..43eaa19f775 100644 --- a/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/build.gradle.kts +++ b/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/build.gradle.kts @@ -2,7 +2,6 @@ plugins { id("org.jetbrains.kotlin.multiplatform") version ("{{kotlin_plugin_version}}") } repositories { - maven("https://dl.bintray.com/kotlin/kotlin-dev") mavenLocal() } diff --git a/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/settings.gradle.kts b/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/settings.gradle.kts index 0f4dc7d56f3..68b50deb4b7 100644 --- a/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/settings.gradle.kts +++ b/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/settings.gradle.kts @@ -1,6 +1,5 @@ pluginManagement { repositories { - maven("https://dl.bintray.com/kotlin/kotlin-dev") mavenLocal() gradlePluginPortal() } diff --git a/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/build.gradle.kts b/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/build.gradle.kts index dfe88e7604c..7be5ae91a84 100644 --- a/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/build.gradle.kts +++ b/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/build.gradle.kts @@ -2,7 +2,6 @@ plugins { id("org.jetbrains.kotlin.multiplatform") version ("{{kotlin_plugin_version}}") } repositories { - maven("https://dl.bintray.com/kotlin/kotlin-dev") mavenLocal() } diff --git a/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/settings.gradle.kts b/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/settings.gradle.kts index 0f4dc7d56f3..68b50deb4b7 100644 --- a/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/settings.gradle.kts +++ b/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/settings.gradle.kts @@ -1,6 +1,5 @@ pluginManagement { repositories { - maven("https://dl.bintray.com/kotlin/kotlin-dev") mavenLocal() gradlePluginPortal() } diff --git a/idea/testData/gradle/packagePrefixImport/packagePrefixNonMPP/build.gradle b/idea/testData/gradle/packagePrefixImport/packagePrefixNonMPP/build.gradle index 68b2f43bab3..3c8f30bdeb7 100644 --- a/idea/testData/gradle/packagePrefixImport/packagePrefixNonMPP/build.gradle +++ b/idea/testData/gradle/packagePrefixImport/packagePrefixNonMPP/build.gradle @@ -12,7 +12,6 @@ apply plugin: 'kotlin' repositories { mavenCentral() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } compileKotlin { diff --git a/idea/testData/perfTest/native/_common/build.gradle.kts.header b/idea/testData/perfTest/native/_common/build.gradle.kts.header index e3774efdd82..2e51ebdabe7 100644 --- a/idea/testData/perfTest/native/_common/build.gradle.kts.header +++ b/idea/testData/perfTest/native/_common/build.gradle.kts.header @@ -1,7 +1,6 @@ buildscript { repositories { mavenCentral() - maven("https://dl.bintray.com/kotlin/kotlin-dev") } val kotlin_version: String by rootProject @@ -16,7 +15,6 @@ plugins { repositories { mavenCentral() - maven("https://dl.bintray.com/kotlin/kotlin-dev") } // "kotlin" section goes under this line diff --git a/idea/testData/perfTest/native/_common/settings.gradle.kts b/idea/testData/perfTest/native/_common/settings.gradle.kts index 8d36003a9aa..0f723f081d7 100644 --- a/idea/testData/perfTest/native/_common/settings.gradle.kts +++ b/idea/testData/perfTest/native/_common/settings.gradle.kts @@ -10,6 +10,5 @@ pluginManagement { repositories { gradlePluginPortal() - maven("https://dl.bintray.com/kotlin/kotlin-dev") } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt index 8d1d3eda094..cef75893cec 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt @@ -333,8 +333,8 @@ class VariantAwareDependenciesIT : BaseGradleIT() { gradleBuildScript().appendText( "\n" + """ configurations.create("custom") - repositories.maven { setUrl("https://dl.bintray.com/kotlin/kotlin-dev") } - dependencies { custom("org.jetbrains.kotlinx:kotlinx-cli:0.2.0-dev-7") } + repositories.maven { setUrl("https://dl.bintray.com/kotlin/kotlinx") } + dependencies { custom("org.jetbrains.kotlinx:kotlinx-cli:0.3.2") } tasks.register("resolveCustom") { doLast { println("###" + configurations.custom.toList()) } } """.trimIndent() ) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithSourceMapInline/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithSourceMapInline/build.gradle index 782e1478c60..f051a873ec8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithSourceMapInline/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithSourceMapInline/build.gradle @@ -14,7 +14,6 @@ allprojects { repositories { mavenLocal() mavenCentral() - maven { url "https://dl.bintray.com/kotlin/kotlin-dev/" } } dependencies { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-fat-framework/smoke/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-fat-framework/smoke/build.gradle.kts index 325c8c06b7e..3409808e8a9 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-fat-framework/smoke/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-fat-framework/smoke/build.gradle.kts @@ -8,7 +8,6 @@ plugins { repositories { mavenLocal() mavenCentral() - maven { setUrl("https://dl.bintray.com/kotlin/kotlin-dev") } } kotlin { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/build.gradle index f030f981704..3966a504934 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/build.gradle @@ -5,7 +5,6 @@ buildscript { mavenLocal() google() mavenCentral() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } maven { url = uri("https://jcenter.bintray.com/") } } dependencies { diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/service/KotlinVersionProviderService.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/service/KotlinVersionProviderService.kt index 40597674e77..2e84df4d608 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/service/KotlinVersionProviderService.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/service/KotlinVersionProviderService.kt @@ -100,7 +100,6 @@ val KotlinVersionKind.isStable object EapVersionDownloader { fun getLatestEapVersion() = downloadVersionFromMavenCentral(EAP_URL).firstOrNull() - fun getLatestDevVersion() = downloadVersions(DEV_URL).firstOrNull() private fun downloadPage(url: String): TaskResult = safe { BufferedReader(InputStreamReader(URL(url).openStream())).lines().collect(Collectors.joining("\n")) @@ -135,9 +134,6 @@ object EapVersionDownloader { @NonNls private val EAP_URL = "https://search.maven.org/solrsearch/select?q=g:org.jetbrains.kotlin%20AND%20a:kotlin-gradle-plugin" - @NonNls - private val DEV_URL = "https://dl.bintray.com/kotlin/kotlin-dev/org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/" - @NonNls private val versionRegexp = """href="([^"\\]+)"""".toRegex() } \ No newline at end of file