diff --git a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt index bc0e9fec769..6ae128d070c 100644 --- a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt @@ -336,44 +336,6 @@ class CodeConformanceTest : TestCase() { ) ), 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-eap", root, setOf( - "kotlin-ultimate/ide/android-studio-native/testData/wizard/expected/app/build.gradle.kts", - "kotlin-ultimate/ide/android-studio-native/testData/wizard/expected/shared/build.gradle.kts", - "kotlin-ultimate/ide/android-studio-native/testData/wizard/expected/build.gradle.kts", - "kotlin-ultimate/ide/android-studio-native/testData/wizard/expected/settings.gradle.kts", - "kotlin-ultimate/ide/android-studio-native/src/com/jetbrains/kmm/wizard/templates/buildFile.kt", - "libraries/scripting/dependencies-maven/test/kotlin/script/experimental/test/MavenResolverTest.kt", - "idea/testData/configuration/gradle/eapVersion/build_after.gradle", - "idea/testData/configuration/gradle/rcVersion/build_after.gradle", - "idea/testData/configuration/gradle/m04Version/build_after.gradle", - "idea/testData/configuration/gsk/eapVersion/build_after.gradle.kts", - "idea/testData/configuration/gsk/eap11Version/build_after.gradle.kts", - "idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt", - "gradle/cacheRedirector.gradle.kts", - "idea/idea-maven/testData/configurator/jvm/simpleProjectEAP/pom_after.xml", - "idea/idea-maven/testData/configurator/jvm/simpleProjectRc/pom_after.xml", - "idea/idea-maven/testData/maven-inspections/deprecatedJre.fixed.1.xml", - "idea/idea-maven/testData/maven-inspections/deprecatedJre.xml", - "idea/idea-maven/testData/maven-inspections/deprecatedKotlinxCoroutines.fixed.1.xml", - "idea/idea-maven/testData/maven-inspections/deprecatedKotlinxCoroutines.xml", - "idea/idea-maven/testData/maven-inspections/deprecatedKotlinxCoroutinesNoError.xml", - "idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/build.gradle.after", - "idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/build.gradle.kts.after", - "idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/build.gradle.after", - "idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/build.gradle.kts.after", - "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", - "kotlin-ultimate/gradle/cidrPluginTools.gradle.kts", - "libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/service/KotlinVersionProviderService.kt", - "idea/testData/perfTest/native/_common/build.gradle.kts.header" - ) - ), - RepoAllowList("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap", root, setOf()), RepoAllowList( // Please use cache-redirector for importing in tests "https://dl.bintray.com/kotlin/kotlin-bootstrap", root, setOf( diff --git a/gradle/cacheRedirector.gradle.kts b/gradle/cacheRedirector.gradle.kts index 5424a71d4a4..c41cc504564 100644 --- a/gradle/cacheRedirector.gradle.kts +++ b/gradle/cacheRedirector.gradle.kts @@ -23,7 +23,6 @@ val mirroredUrls = listOf( "https://dl.bintray.com/kodein-framework/Kodein-DI", "https://dl.bintray.com/konsoletyper/teavm", "https://dl.bintray.com/kotlin/kotlin-dev", - "https://dl.bintray.com/kotlin/kotlin-eap", "https://dl.bintray.com/kotlin/kotlinx.html", "https://dl.bintray.com/kotlin/kotlinx", "https://dl.bintray.com/kotlin/ktor", 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 91648ea9aa2..ebabb3c78a2 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 @@ -83,7 +83,6 @@ abstract class MultiplePluginVersionGradleImportingTestCase : GradleImportingTes fun repositories(useKts: Boolean): String { val customRepositories = arrayOf( "https://dl.bintray.com/kotlin/kotlin-dev", - "http://dl.bintray.com/kotlin/kotlin-eap" ) val customMavenRepositories = customRepositories.map { if (useKts) "maven(\"$it\")" else "maven { url '$it' } " }.joinToString("\n") return """ diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt index c68d632d5fd..e3e14621492 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt @@ -59,14 +59,6 @@ val SNAPSHOT_REPOSITORY = RepositoryDescription( isSnapshot = true ) -val EAP_REPOSITORY = RepositoryDescription( - "bintray.kotlin.eap", - "Bintray Kotlin EAP Repository", - "https://dl.bintray.com/kotlin/kotlin-eap", - "https://bintray.com/kotlin/kotlin-eap/kotlin/", - isSnapshot = false -) - val DEFAULT_GRADLE_PLUGIN_REPOSITORY = RepositoryDescription( "default.gradle.plugins", "Default Gradle Plugin Repository", @@ -113,7 +105,6 @@ fun RepositoryDescription.toKotlinRepositorySnippet() = "maven(\"$url\")" fun getRepositoryForVersion(version: String): RepositoryDescription? = when { isSnapshot(version) -> SNAPSHOT_REPOSITORY - isEap(version) -> EAP_REPOSITORY isDev(version) -> devRepository(version) else -> null } diff --git a/idea/idea-maven/testData/configurator/jvm/simpleProjectEAP/pom_after.xml b/idea/idea-maven/testData/configurator/jvm/simpleProjectEAP/pom_after.xml index 06a8a184728..2c7d3159b59 100644 --- a/idea/idea-maven/testData/configurator/jvm/simpleProjectEAP/pom_after.xml +++ b/idea/idea-maven/testData/configurator/jvm/simpleProjectEAP/pom_after.xml @@ -26,34 +26,6 @@ - - - - true - - - false - - bintray.kotlin.eap - Bintray Kotlin EAP Repository - https://dl.bintray.com/kotlin/kotlin-eap - - - - - - - true - - - false - - bintray.kotlin.eap - Bintray Kotlin EAP Repository - https://dl.bintray.com/kotlin/kotlin-eap - - - diff --git a/idea/idea-maven/testData/configurator/jvm/simpleProjectRc/pom_after.xml b/idea/idea-maven/testData/configurator/jvm/simpleProjectRc/pom_after.xml index 156c184c52f..174a9e877f8 100644 --- a/idea/idea-maven/testData/configurator/jvm/simpleProjectRc/pom_after.xml +++ b/idea/idea-maven/testData/configurator/jvm/simpleProjectRc/pom_after.xml @@ -26,34 +26,6 @@ - - - - true - - - false - - bintray.kotlin.eap - Bintray Kotlin EAP Repository - https://dl.bintray.com/kotlin/kotlin-eap - - - - - - - true - - - false - - bintray.kotlin.eap - Bintray Kotlin EAP Repository - https://dl.bintray.com/kotlin/kotlin-eap - - - diff --git a/idea/idea-maven/testData/maven-inspections/deprecatedJre.fixed.1.xml b/idea/idea-maven/testData/maven-inspections/deprecatedJre.fixed.1.xml index 7734d42d7aa..d4739871294 100644 --- a/idea/idea-maven/testData/maven-inspections/deprecatedJre.fixed.1.xml +++ b/idea/idea-maven/testData/maven-inspections/deprecatedJre.fixed.1.xml @@ -26,27 +26,6 @@ - - - - false - - bintray-kotlin-kotlin-eap - bintray - https://dl.bintray.com/kotlin/kotlin-eap - - - - - - false - - bintray-kotlin-kotlin-eap - bintray-plugins - https://dl.bintray.com/kotlin/kotlin-eap - - - diff --git a/idea/idea-maven/testData/maven-inspections/deprecatedJre.xml b/idea/idea-maven/testData/maven-inspections/deprecatedJre.xml index 2a1ba49b659..7062d60bdc9 100644 --- a/idea/idea-maven/testData/maven-inspections/deprecatedJre.xml +++ b/idea/idea-maven/testData/maven-inspections/deprecatedJre.xml @@ -26,27 +26,6 @@ - - - - false - - bintray-kotlin-kotlin-eap - bintray - https://dl.bintray.com/kotlin/kotlin-eap - - - - - - false - - bintray-kotlin-kotlin-eap - bintray-plugins - https://dl.bintray.com/kotlin/kotlin-eap - - - diff --git a/idea/idea-maven/testData/maven-inspections/deprecatedKotlinxCoroutines.fixed.1.xml b/idea/idea-maven/testData/maven-inspections/deprecatedKotlinxCoroutines.fixed.1.xml index 4cb052fcf48..5b020e72b98 100644 --- a/idea/idea-maven/testData/maven-inspections/deprecatedKotlinxCoroutines.fixed.1.xml +++ b/idea/idea-maven/testData/maven-inspections/deprecatedKotlinxCoroutines.fixed.1.xml @@ -27,14 +27,6 @@ - - - false - - bintray-kotlin-kotlin-eap - bintray - https://dl.bintray.com/kotlin/kotlin-eap - false @@ -44,16 +36,6 @@ https://kotlin.bintray.com/kotlinx - - - - false - - bintray-kotlin-kotlin-eap - bintray-plugins - https://dl.bintray.com/kotlin/kotlin-eap - - diff --git a/idea/idea-maven/testData/maven-inspections/deprecatedKotlinxCoroutines.xml b/idea/idea-maven/testData/maven-inspections/deprecatedKotlinxCoroutines.xml index 0155d5e07d8..4d11368714f 100644 --- a/idea/idea-maven/testData/maven-inspections/deprecatedKotlinxCoroutines.xml +++ b/idea/idea-maven/testData/maven-inspections/deprecatedKotlinxCoroutines.xml @@ -27,14 +27,6 @@ - - - false - - bintray-kotlin-kotlin-eap - bintray - https://dl.bintray.com/kotlin/kotlin-eap - false @@ -44,16 +36,6 @@ https://kotlin.bintray.com/kotlinx - - - - false - - bintray-kotlin-kotlin-eap - bintray-plugins - https://dl.bintray.com/kotlin/kotlin-eap - - diff --git a/idea/idea-maven/testData/maven-inspections/deprecatedKotlinxCoroutinesNoError.xml b/idea/idea-maven/testData/maven-inspections/deprecatedKotlinxCoroutinesNoError.xml index c87e4929e90..5eecbdec9d1 100644 --- a/idea/idea-maven/testData/maven-inspections/deprecatedKotlinxCoroutinesNoError.xml +++ b/idea/idea-maven/testData/maven-inspections/deprecatedKotlinxCoroutinesNoError.xml @@ -27,14 +27,6 @@ - - - false - - bintray-kotlin-kotlin-eap - bintray - https://dl.bintray.com/kotlin/kotlin-eap - false @@ -44,16 +36,6 @@ https://kotlin.bintray.com/kotlinx - - - - false - - bintray-kotlin-kotlin-eap - bintray-plugins - https://dl.bintray.com/kotlin/kotlin-eap - - diff --git a/idea/testData/configuration/gradle/eapVersion/build_after.gradle b/idea/testData/configuration/gradle/eapVersion/build_after.gradle index 441bc5941b7..6214f6d9bcb 100644 --- a/idea/testData/configuration/gradle/eapVersion/build_after.gradle +++ b/idea/testData/configuration/gradle/eapVersion/build_after.gradle @@ -6,7 +6,6 @@ version = '1.0' repositories { mavenCentral() - maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } } dependencies { @@ -16,7 +15,6 @@ dependencies { buildscript { ext.kotlin_version = '$VERSION$' repositories { - maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } mavenCentral() } dependencies { diff --git a/idea/testData/configuration/gradle/m04Version/build_after.gradle b/idea/testData/configuration/gradle/m04Version/build_after.gradle index cd1414642c6..3608a69883d 100644 --- a/idea/testData/configuration/gradle/m04Version/build_after.gradle +++ b/idea/testData/configuration/gradle/m04Version/build_after.gradle @@ -6,7 +6,6 @@ version = '1.0' repositories { mavenCentral() - maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } } dependencies { @@ -16,7 +15,6 @@ dependencies { buildscript { ext.kotlin_version = '$VERSION$' repositories { - maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } mavenCentral() } dependencies { diff --git a/idea/testData/configuration/gradle/rcVersion/build_after.gradle b/idea/testData/configuration/gradle/rcVersion/build_after.gradle index 441bc5941b7..6214f6d9bcb 100644 --- a/idea/testData/configuration/gradle/rcVersion/build_after.gradle +++ b/idea/testData/configuration/gradle/rcVersion/build_after.gradle @@ -6,7 +6,6 @@ version = '1.0' repositories { mavenCentral() - maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } } dependencies { @@ -16,7 +15,6 @@ dependencies { buildscript { ext.kotlin_version = '$VERSION$' repositories { - maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } mavenCentral() } dependencies { diff --git a/idea/testData/configuration/gsk/eap11Version/build_after.gradle.kts b/idea/testData/configuration/gsk/eap11Version/build_after.gradle.kts index d95125b5e9b..8067a8c6872 100644 --- a/idea/testData/configuration/gsk/eap11Version/build_after.gradle.kts +++ b/idea/testData/configuration/gsk/eap11Version/build_after.gradle.kts @@ -12,7 +12,6 @@ application { repositories { jcenter() - maven("https://dl.bintray.com/kotlin/kotlin-eap") } dependencies { diff --git a/idea/testData/configuration/gsk/eapVersion/build_after.gradle.kts b/idea/testData/configuration/gsk/eapVersion/build_after.gradle.kts index abadf6019b6..2e989c4de8f 100644 --- a/idea/testData/configuration/gsk/eapVersion/build_after.gradle.kts +++ b/idea/testData/configuration/gsk/eapVersion/build_after.gradle.kts @@ -11,7 +11,6 @@ application { repositories { jcenter() - maven("https://dl.bintray.com/kotlin/kotlin-eap") } dependencies { diff --git a/idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/build.gradle.after b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/build.gradle.after index bb61241e3ab..1f8ca5aee32 100644 --- a/idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/build.gradle.after +++ b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/build.gradle.after @@ -6,8 +6,7 @@ version '1.0-SNAPSHOT' repositories { mavenCentral() - maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } } dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-js" -} +} \ No newline at end of file diff --git a/idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/build.gradle.kts.after b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/build.gradle.kts.after index f52be89aca4..90941f417d0 100644 --- a/idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/build.gradle.kts.after +++ b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/build.gradle.kts.after @@ -6,8 +6,7 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven("https://dl.bintray.com/kotlin/kotlin-eap") } dependencies { implementation(kotlin("stdlib-js")) -} +} \ No newline at end of file diff --git a/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/build.gradle.after b/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/build.gradle.after index 80655e995cb..1ba35bf673f 100644 --- a/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/build.gradle.after +++ b/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/build.gradle.after @@ -10,7 +10,6 @@ sourceCompatibility = 1.8 repositories { mavenCentral() - maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } } dependencies { @@ -26,4 +25,4 @@ compileTestKotlin { kotlinOptions { jvmTarget = "1.8" } -} +} \ No newline at end of file diff --git a/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/build.gradle.kts.after b/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/build.gradle.kts.after index 1d2ec9c5885..0f5a203099d 100644 --- a/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/build.gradle.kts.after +++ b/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/build.gradle.kts.after @@ -10,7 +10,6 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven("https://dl.bintray.com/kotlin/kotlin-eap") } dependencies { diff --git a/idea/testData/gradle/configurator/enableFeatureSupportMultiplatformWithXFlag/settings.gradle b/idea/testData/gradle/configurator/enableFeatureSupportMultiplatformWithXFlag/settings.gradle index 87618c203be..ebdc76086c1 100644 --- a/idea/testData/gradle/configurator/enableFeatureSupportMultiplatformWithXFlag/settings.gradle +++ b/idea/testData/gradle/configurator/enableFeatureSupportMultiplatformWithXFlag/settings.gradle @@ -1,7 +1,6 @@ pluginManagement { repositories { maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap' } } } \ 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 f4f8fae875f..45d27602ee0 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-eap") 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 e9d561aa042..0f4dc7d56f3 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-eap") 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 28ffe236ffb..dfe88e7604c 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-eap") 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 e9d561aa042..0f4dc7d56f3 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-eap") maven("https://dl.bintray.com/kotlin/kotlin-dev") mavenLocal() gradlePluginPortal() diff --git a/idea/testData/perfTest/native/_common/build.gradle.kts.header b/idea/testData/perfTest/native/_common/build.gradle.kts.header index 5f7d7f5a00e..e3774efdd82 100644 --- a/idea/testData/perfTest/native/_common/build.gradle.kts.header +++ b/idea/testData/perfTest/native/_common/build.gradle.kts.header @@ -2,7 +2,6 @@ buildscript { repositories { mavenCentral() maven("https://dl.bintray.com/kotlin/kotlin-dev") - maven("https://dl.bintray.com/kotlin/kotlin-eap") } val kotlin_version: String by rootProject @@ -18,7 +17,6 @@ plugins { repositories { mavenCentral() maven("https://dl.bintray.com/kotlin/kotlin-dev") - maven("https://dl.bintray.com/kotlin/kotlin-eap") } // "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 6d7cb134561..8d36003a9aa 100644 --- a/idea/testData/perfTest/native/_common/settings.gradle.kts +++ b/idea/testData/perfTest/native/_common/settings.gradle.kts @@ -11,6 +11,5 @@ pluginManagement { repositories { gradlePluginPortal() maven("https://dl.bintray.com/kotlin/kotlin-dev") - maven("https://dl.bintray.com/kotlin/kotlin-eap") } } diff --git a/libraries/scripting/dependencies-maven/test/kotlin/script/experimental/test/MavenResolverTest.kt b/libraries/scripting/dependencies-maven/test/kotlin/script/experimental/test/MavenResolverTest.kt index 58d61fa1b3a..9201bb7a84c 100644 --- a/libraries/scripting/dependencies-maven/test/kotlin/script/experimental/test/MavenResolverTest.kt +++ b/libraries/scripting/dependencies-maven/test/kotlin/script/experimental/test/MavenResolverTest.kt @@ -95,11 +95,10 @@ class MavenResolverTest : ResolversTestBase() { ) ) - // @Repository("https://dl.bintray.com/kotlin/kotlin-eap", "https://dl.bintray.com/jakubriegel/kotlin-shell") + // @Repository( "https://dl.bintray.com/jakubriegel/kotlin-shell") val repositories = repositoryConstructor.callBy( mapOf( repositoryConstructor.parameters.first() to arrayOf( - "https://dl.bintray.com/kotlin/kotlin-eap", "https://dl.bintray.com/jakubriegel/kotlin-shell" ) ) diff --git a/libraries/tools/new-project-wizard/build.gradle.kts b/libraries/tools/new-project-wizard/build.gradle.kts index f2b780da3bf..e405bb96e85 100644 --- a/libraries/tools/new-project-wizard/build.gradle.kts +++ b/libraries/tools/new-project-wizard/build.gradle.kts @@ -14,6 +14,7 @@ dependencies { testImplementation(project(":kotlin-test:kotlin-test-junit")) implementation(kotlinxCollectionsImmutable()) + implementation("com.google.code.gson:gson:2.8.6") } sourceSets { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/pom.xml index 00a15b3288c..108a3321035 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/pom.xml @@ -22,19 +22,8 @@ mavenCentral https://repo1.maven.org/maven2/ - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - - src/main/kotlin src/test/kotlin diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/pom.xml index 08beee6bc76..ae4295337fa 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/pom.xml @@ -22,19 +22,8 @@ mavenCentral https://repo1.maven.org/maven2/ - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - - src/main/kotlin src/test/kotlin diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/pom.xml index 0202f7959c0..369b643ca1d 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/pom.xml @@ -22,19 +22,8 @@ mavenCentral https://repo1.maven.org/maven2/ - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - - src/main/kotlin src/test/kotlin diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/pom.xml index 98fb38b2386..cdef8d51cf3 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/pom.xml @@ -22,19 +22,8 @@ mavenCentral https://repo1.maven.org/maven2/ - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - - src/main/kotlin src/test/kotlin diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/pom.xml index ef2d57fa9e3..6bff653011f 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/pom.xml @@ -21,18 +21,8 @@ mavenCentral https://repo1.maven.org/maven2/ - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - a b diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/pom.xml index 94cb3a9b210..81e2fa1dc68 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/pom.xml @@ -22,19 +22,8 @@ mavenCentral https://repo1.maven.org/maven2/ - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - - src/main/kotlin src/test/kotlin diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/pom.xml index a9a8db0cc23..f28f625ac64 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/pom.xml @@ -22,18 +22,8 @@ mavenCentral https://repo1.maven.org/maven2/ - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - src/main/kotlin diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/pom.xml index cb227eb6d45..8d316c88593 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/pom.xml @@ -22,19 +22,8 @@ mavenCentral https://repo1.maven.org/maven2/ - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - - src/main/kotlin src/test/kotlin diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/pom.xml index bdb360f8391..c125181c7d9 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/pom.xml @@ -22,19 +22,8 @@ mavenCentral https://repo1.maven.org/maven2/ - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - - src/main/kotlin src/test/kotlin diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle.kts index f4e23912781..3d3a41b2d80 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle.kts @@ -9,7 +9,6 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { url = uri("KOTLIN_REPO") } } dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/pom.xml index 398ff723610..1fb9049a4dc 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/pom.xml @@ -22,16 +22,12 @@ mavenCentral https://repo1.maven.org/maven2/ - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - bintray.kotlin.kotlin-eap - KOTLIN_REPO + mavenCentral + https://repo1.maven.org/maven2/ diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/settings.gradle.kts index f3088af95cb..fc5c9d6107b 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/settings.gradle.kts @@ -2,7 +2,6 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { url = uri("KOTLIN_REPO") } } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle.kts index 8b24ea2ae9c..5b2b067c043 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle.kts @@ -10,7 +10,6 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { url = uri("KOTLIN_REPO") } } dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/pom.xml index 5a51c9107bd..6942df6d098 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/pom.xml @@ -22,16 +22,12 @@ mavenCentral https://repo1.maven.org/maven2/ - - bintray.kotlin.kotlin-eap - KOTLIN_REPO - - bintray.kotlin.kotlin-eap - KOTLIN_REPO + mavenCentral + https://repo1.maven.org/maven2/ diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/settings.gradle.kts index ab1848222f0..903b8e2214f 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/settings.gradle.kts @@ -2,7 +2,6 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { url = uri("KOTLIN_REPO") } } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle index 7adc9924943..68b4f639160 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle @@ -8,7 +8,6 @@ version = '1.0-SNAPSHOT' repositories { jcenter() mavenCentral() - maven { url 'KOTLIN_REPO' } } dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts index 26ba7cf4943..3f73bd6e7e5 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts @@ -8,7 +8,6 @@ version = "1.0-SNAPSHOT" repositories { jcenter() mavenCentral() - maven { url = uri("KOTLIN_REPO") } } dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle index 840d688c6bb..724f1eddf45 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle @@ -2,7 +2,6 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { url 'KOTLIN_REPO' } } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle.kts index 15cdb5c4ce0..ebb21c133ed 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle.kts @@ -2,7 +2,6 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { url = uri("KOTLIN_REPO") } } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle index e83d16c7f75..61edc3a6071 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle @@ -11,7 +11,6 @@ version = '1.0-SNAPSHOT' repositories { jcenter() mavenCentral() - maven { url 'KOTLIN_REPO' } maven { url 'https://dl.bintray.com/kotlin/kotlin-js-wrappers' } maven { url 'https://dl.bintray.com/kotlin/kotlinx' } maven { url 'https://dl.bintray.com/kotlin/ktor' } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts index cf57f06815d..75eb49fc43e 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts @@ -11,7 +11,6 @@ version = "1.0-SNAPSHOT" repositories { jcenter() mavenCentral() - maven { url = uri("KOTLIN_REPO") } maven { url = uri("https://dl.bintray.com/kotlin/kotlin-js-wrappers") } maven { url = uri("https://dl.bintray.com/kotlin/kotlinx") } maven { url = uri("https://dl.bintray.com/kotlin/ktor") } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle index 1c12eaf0390..cd8a015cf06 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle @@ -2,7 +2,6 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { url 'KOTLIN_REPO' } } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle.kts index 542e67fd1fc..f0432acd02a 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle.kts @@ -2,7 +2,6 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { url = uri("KOTLIN_REPO") } } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle index 7e059b47869..592cea65413 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle @@ -7,7 +7,6 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() - maven { url 'KOTLIN_REPO' } } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle.kts index 3e3efaa4f35..8dbf7fa6d8d 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle.kts @@ -7,7 +7,6 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { url = uri("KOTLIN_REPO") } } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle index 6f7b29c41a3..eaa435d1931 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle @@ -2,7 +2,6 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { url 'KOTLIN_REPO' } } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle.kts index fff457d8347..3c423f85c6f 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle.kts @@ -2,7 +2,6 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { url = uri("KOTLIN_REPO") } } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle index 7bb5a5ad128..db193a12658 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle @@ -9,7 +9,6 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() - maven { url 'KOTLIN_REPO' } } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle.kts index 214ebde603c..54d5ce8ccc5 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle.kts @@ -7,7 +7,6 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { url = uri("KOTLIN_REPO") } } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/settings.gradle index 1da46fa11bc..3dd573b3ec2 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/settings.gradle @@ -2,7 +2,6 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { url 'KOTLIN_REPO' } } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/settings.gradle.kts index 9f5d0628485..c45d64281d5 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/settings.gradle.kts @@ -2,7 +2,6 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { url = uri("KOTLIN_REPO") } } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle index b4534b8a1c2..be368660ada 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle @@ -3,7 +3,7 @@ buildscript { gradlePluginPortal() jcenter() google() - maven { url 'KOTLIN_REPO' } + mavenCentral() } dependencies { classpath('org.jetbrains.kotlin:kotlin-gradle-plugin:KOTLIN_VERSION') @@ -19,6 +19,5 @@ allprojects { google() jcenter() mavenCentral() - maven { url 'KOTLIN_REPO' } } } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle.kts index af13723974b..bef7811f2a7 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle.kts @@ -3,7 +3,7 @@ buildscript { gradlePluginPortal() jcenter() google() - maven { url = uri("KOTLIN_REPO") } + mavenCentral() } dependencies { classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:KOTLIN_VERSION") @@ -19,6 +19,5 @@ allprojects { google() jcenter() mavenCentral() - maven { url = uri("KOTLIN_REPO") } } } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle index 77530fec3a2..a20108a29df 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle @@ -4,7 +4,6 @@ pluginManagement { jcenter() gradlePluginPortal() mavenCentral() - maven { url 'KOTLIN_REPO' } } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle.kts index f85bda775ef..ee1041fbea7 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle.kts @@ -4,7 +4,6 @@ pluginManagement { jcenter() gradlePluginPortal() mavenCentral() - maven { url = uri("KOTLIN_REPO") } } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle index 977a727c227..21d227ef074 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle @@ -11,7 +11,6 @@ repositories { google() jcenter() mavenCentral() - maven { url 'KOTLIN_REPO' } } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts index da271346b3f..8b34a1cc5ed 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts @@ -11,7 +11,6 @@ repositories { google() jcenter() mavenCentral() - maven { url = uri("KOTLIN_REPO") } } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle index 67b7d6f3b1e..c2c8b082326 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle @@ -4,7 +4,6 @@ pluginManagement { jcenter() gradlePluginPortal() mavenCentral() - maven { url 'KOTLIN_REPO' } } resolutionStrategy { eachPlugin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle.kts index fbaac754e27..1488ee1a215 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle.kts @@ -4,7 +4,6 @@ pluginManagement { jcenter() gradlePluginPortal() mavenCentral() - maven { url = uri("KOTLIN_REPO") } } resolutionStrategy { eachPlugin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle index db96d903422..912876d5c86 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle @@ -9,7 +9,6 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() - maven { url 'KOTLIN_REPO' } } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle.kts index ba9d38af011..3a7cf1a6886 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle.kts @@ -7,7 +7,6 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { url = uri("KOTLIN_REPO") } } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle index fe0fbee596d..6b5729d5436 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle @@ -2,7 +2,6 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { url 'KOTLIN_REPO' } } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle.kts index 77ee1055c51..4f5974ac49c 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle.kts @@ -2,7 +2,6 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { url = uri("KOTLIN_REPO") } } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractBuildFileGenerationTest.kt b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractBuildFileGenerationTest.kt index 919e396e7fa..4afbc62d74d 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractBuildFileGenerationTest.kt +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractBuildFileGenerationTest.kt @@ -53,9 +53,7 @@ abstract class AbstractBuildFileGenerationTest : UsefulTestCase() { KOTLIN_VERSION_PLACEHOLDER ).replaceAllTo( listOf( - Repositories.KOTLIN_EAP_BINTRAY.url, Repositories.KOTLIN_DEV_BINTRAY.url, - KotlinVersionProviderTestWizardService.KOTLIN_EAP_BINTRAY_WITH_CACHE_REDIRECTOR.url, KotlinVersionProviderTestWizardService.KOTLIN_DEV_BINTRAY_WITH_CACHE_REDIRECTOR.url, ), KOTLIN_REPO_PLACEHOLDER diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/KotlinVersionProviderTestWizardService.kt b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/KotlinVersionProviderTestWizardService.kt index f4e6797e2eb..aad9bd8b7ff 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/KotlinVersionProviderTestWizardService.kt +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/KotlinVersionProviderTestWizardService.kt @@ -36,15 +36,14 @@ class KotlinVersionProviderTestWizardService() : KotlinVersionProviderService(), private fun getKotlinVersionRepositoryWithCacheRedirector(versionKind: KotlinVersionKind): Repository = when (versionKind) { KotlinVersionKind.STABLE -> DefaultRepository.MAVEN_CENTRAL - KotlinVersionKind.EAP -> KOTLIN_EAP_BINTRAY_WITH_CACHE_REDIRECTOR + KotlinVersionKind.EAP -> DefaultRepository.MAVEN_CENTRAL KotlinVersionKind.DEV -> KOTLIN_DEV_BINTRAY_WITH_CACHE_REDIRECTOR - KotlinVersionKind.M -> KOTLIN_EAP_BINTRAY_WITH_CACHE_REDIRECTOR + KotlinVersionKind.M -> DefaultRepository.MAVEN_CENTRAL } companion object { private const val CACHE_REDIRECTOR_BINTRAY_URL = "https://cache-redirector.jetbrains.com/dl.bintray.com" - val KOTLIN_EAP_BINTRAY_WITH_CACHE_REDIRECTOR = BintrayRepository("kotlin/kotlin-eap", CACHE_REDIRECTOR_BINTRAY_URL) val KOTLIN_DEV_BINTRAY_WITH_CACHE_REDIRECTOR = BintrayRepository("kotlin/kotlin-dev", CACHE_REDIRECTOR_BINTRAY_URL) 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 42daa70fad8..4c152fe8fc6 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 @@ -5,6 +5,8 @@ package org.jetbrains.kotlin.tools.projectWizard.core.service +import com.google.gson.JsonObject +import com.google.gson.JsonParser.parseString import org.jetbrains.annotations.NonNls import org.jetbrains.kotlin.tools.projectWizard.Versions import org.jetbrains.kotlin.tools.projectWizard.core.TaskResult @@ -33,9 +35,7 @@ abstract class KotlinVersionProviderService : WizardService { ) protected open fun getKotlinVersionRepository(versionKind: KotlinVersionKind): Repository = when (versionKind) { - KotlinVersionKind.STABLE -> DefaultRepository.MAVEN_CENTRAL - KotlinVersionKind.EAP -> Repositories.KOTLIN_EAP_BINTRAY - KotlinVersionKind.M -> Repositories.KOTLIN_EAP_BINTRAY + KotlinVersionKind.STABLE, KotlinVersionKind.EAP, KotlinVersionKind.M -> DefaultRepository.MAVEN_CENTRAL KotlinVersionKind.DEV -> Repositories.KOTLIN_DEV_BINTRAY } @@ -69,13 +69,28 @@ val KotlinVersionKind.isStable get() = this == KotlinVersionKind.STABLE object EapVersionDownloader { - fun getLatestEapVersion() = downloadVersions(EAP_URL).firstOrNull() + 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")) } + @Suppress("SameParameterValue") + private fun downloadVersionFromMavenCentral(url: String) = compute { + val (text) = downloadPage(url) + val (versionString) = parseLatestVersionFromJson(text) + if (versionString.isNotEmpty()) + listOf(Version.fromString(versionString)) + else + emptyList() + }.asNullable.orEmpty() + + private fun parseLatestVersionFromJson(text: String) = safe { + val json = parseString(text) as JsonObject + json.get("response").asJsonObject.get("docs").asJsonArray.get(0).asJsonObject.get("latestVersion").asString + } + @Suppress("SameParameterValue") private fun downloadVersions(url: String): List = compute { val (text) = downloadPage(url) @@ -88,7 +103,7 @@ object EapVersionDownloader { }.asNullable.orEmpty() @NonNls - private val EAP_URL = "https://dl.bintray.com/kotlin/kotlin-eap/org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/" + 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/" diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/KotlinPlugin.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/KotlinPlugin.kt index 47b9a904d0a..d777281bb41 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/KotlinPlugin.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/KotlinPlugin.kt @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.BuildFileIR import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.RepositoryIR import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.withIrs import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.ModuleConfigurator -import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.inContextOfModuleConfigurator import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase import org.jetbrains.kotlin.tools.projectWizard.plugins.StructurePlugin import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.BuildSystemPlugin @@ -56,7 +55,7 @@ class KotlinPlugin(context: Context) : Plugin(context) { val version by property( // todo do not hardcode kind & repository - WizardKotlinVersion(Versions.KOTLIN, KotlinVersionKind.M, Repositories.KOTLIN_EAP_BINTRAY) + WizardKotlinVersion(Versions.KOTLIN, KotlinVersionKind.M, Repositories.KOTLIN_EAP_MAVEN_CENTRAL) ) val initKotlinVersions by pipelineTask(GenerationPhase.PREPARE_GENERATION) { diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Repository.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Repository.kt index 5b8402e427d..f4a0fe533c4 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Repository.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Repository.kt @@ -48,7 +48,7 @@ object Repositories { val KTOR_BINTRAY = BintrayRepository("kotlin/ktor") val KOTLINX = BintrayRepository("kotlin/kotlinx") val KOTLIN_JS_WRAPPERS_BINTRAY = BintrayRepository("kotlin/kotlin-js-wrappers") - val KOTLIN_EAP_BINTRAY = BintrayRepository("kotlin/kotlin-eap") + val KOTLIN_EAP_MAVEN_CENTRAL = DefaultRepository.MAVEN_CENTRAL val KOTLIN_DEV_BINTRAY = BintrayRepository("kotlin/kotlin-dev") val JETBRAINS_COMPOSE_DEV = JetBrainsSpace("compose/dev") }