Drop bintray kotlin-dev (KTI-528)

2021-03-23 23:12:47 +03:00
parent 1cedc7e93e
commit 5631481747
17 changed files with 5 additions and 62 deletions
@@ -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(
@@ -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)
@@ -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

@@ -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()
    }

@@ -2,6 +2,5 @@ pluginManagement {
    repositories {
        jcenter()
        gradlePluginPortal()
-        maven { setUrl("https://dl.bintray.com/kotlin/kotlin-dev") }
    }
 }
@@ -2,7 +2,6 @@ plugins {
    id("org.jetbrains.kotlin.multiplatform") version ("{{kotlin_plugin_version}}")
 }
 repositories {
-    maven("https://dl.bintray.com/kotlin/kotlin-dev")
    mavenLocal()
 }

@@ -1,6 +1,5 @@
 pluginManagement {
    repositories {
-        maven("https://dl.bintray.com/kotlin/kotlin-dev")
        mavenLocal()
        gradlePluginPortal()
    }
@@ -2,7 +2,6 @@ plugins {
    id("org.jetbrains.kotlin.multiplatform") version ("{{kotlin_plugin_version}}")
 }
 repositories {
-    maven("https://dl.bintray.com/kotlin/kotlin-dev")
    mavenLocal()
 }

@@ -1,6 +1,5 @@
 pluginManagement {
    repositories {
-        maven("https://dl.bintray.com/kotlin/kotlin-dev")
        mavenLocal()
        gradlePluginPortal()
    }
@@ -12,7 +12,6 @@ apply plugin: 'kotlin'

 repositories {
    mavenCentral()
-    maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
 }

 compileKotlin {
@@ -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
@@ -10,6 +10,5 @@ pluginManagement {

    repositories {
        gradlePluginPortal()
-        maven("https://dl.bintray.com/kotlin/kotlin-dev")
    }
 }
@@ -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()
        )
@@ -14,7 +14,6 @@ allprojects {
    repositories {
        mavenLocal()
        mavenCentral()
-        maven { url "https://dl.bintray.com/kotlin/kotlin-dev/" }
    }

    dependencies {
@@ -8,7 +8,6 @@ plugins {
 repositories {
    mavenLocal()
    mavenCentral()
-    maven { setUrl("https://dl.bintray.com/kotlin/kotlin-dev") }
 }

 kotlin {
@@ -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 {
@@ -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<String> = 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()
 }