Wizard: Do not add bintray repoitory for eap versions

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/pom.xml

@@ -22,19 +22,8 @@
             <id>mavenCentral</id>
             <url>https://repo1.maven.org/maven2/</url>
         </repository>
-        <repository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </repository>
     </repositories>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <build>
         <sourceDirectory>src/main/kotlin</sourceDirectory>
         <testSourceDirectory>src/test/kotlin</testSourceDirectory>

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/pom.xml

@@ -22,19 +22,8 @@
             <id>mavenCentral</id>
             <url>https://repo1.maven.org/maven2/</url>
         </repository>
-        <repository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </repository>
     </repositories>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <build>
         <sourceDirectory>src/main/kotlin</sourceDirectory>
         <testSourceDirectory>src/test/kotlin</testSourceDirectory>

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/pom.xml

@@ -22,19 +22,8 @@
             <id>mavenCentral</id>
             <url>https://repo1.maven.org/maven2/</url>
         </repository>
-        <repository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </repository>
     </repositories>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <build>
         <sourceDirectory>src/main/kotlin</sourceDirectory>
         <testSourceDirectory>src/test/kotlin</testSourceDirectory>

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/pom.xml

@@ -22,19 +22,8 @@
             <id>mavenCentral</id>
             <url>https://repo1.maven.org/maven2/</url>
         </repository>
-        <repository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </repository>
     </repositories>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <build>
         <sourceDirectory>src/main/kotlin</sourceDirectory>
         <testSourceDirectory>src/test/kotlin</testSourceDirectory>

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/pom.xml

@@ -21,18 +21,8 @@
             <id>mavenCentral</id>
             <url>https://repo1.maven.org/maven2/</url>
         </repository>
-        <repository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </repository>
     </repositories>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </pluginRepository>
-    </pluginRepositories>
     <modules>
         <module>a</module>
         <module>b</module>

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/pom.xml

@@ -22,19 +22,8 @@
             <id>mavenCentral</id>
             <url>https://repo1.maven.org/maven2/</url>
         </repository>
-        <repository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </repository>
     </repositories>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <build>
         <sourceDirectory>src/main/kotlin</sourceDirectory>
         <testSourceDirectory>src/test/kotlin</testSourceDirectory>

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/pom.xml

@@ -22,18 +22,8 @@
             <id>mavenCentral</id>
             <url>https://repo1.maven.org/maven2/</url>
         </repository>
-        <repository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </repository>
     </repositories>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </pluginRepository>
-    </pluginRepositories>
 
     <build>
         <sourceDirectory>src/main/kotlin</sourceDirectory>

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/pom.xml

@@ -22,19 +22,8 @@
             <id>mavenCentral</id>
             <url>https://repo1.maven.org/maven2/</url>
         </repository>
-        <repository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </repository>
     </repositories>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <build>
         <sourceDirectory>src/main/kotlin</sourceDirectory>
         <testSourceDirectory>src/test/kotlin</testSourceDirectory>

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/pom.xml

@@ -22,19 +22,8 @@
             <id>mavenCentral</id>
             <url>https://repo1.maven.org/maven2/</url>
         </repository>
-        <repository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </repository>
     </repositories>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <build>
         <sourceDirectory>src/main/kotlin</sourceDirectory>
         <testSourceDirectory>src/test/kotlin</testSourceDirectory>

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 {

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/pom.xml

@@ -22,16 +22,12 @@
             <id>mavenCentral</id>
             <url>https://repo1.maven.org/maven2/</url>
         </repository>
-        <repository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </repository>
     </repositories>
 
     <pluginRepositories>
         <pluginRepository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
+            <id>mavenCentral</id>
+            <url>https://repo1.maven.org/maven2/</url>
         </pluginRepository>
     </pluginRepositories>
 

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") }
     }
 
 }

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 {

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/pom.xml

@@ -22,16 +22,12 @@
             <id>mavenCentral</id>
             <url>https://repo1.maven.org/maven2/</url>
         </repository>
-        <repository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
-        </repository>
     </repositories>
 
     <pluginRepositories>
         <pluginRepository>
-            <id>bintray.kotlin.kotlin-eap</id>
-            <url>KOTLIN_REPO</url>
+            <id>mavenCentral</id>
+            <url>https://repo1.maven.org/maven2/</url>
         </pluginRepository>
     </pluginRepositories>
 

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") }
     }
 
 }

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 {

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 {

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' }
     }
 
 }

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") }
     }
 
 }

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' }

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") }

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' }
     }
 
 }

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") }
     }
 
 }

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 {

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 {

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' }
     }
     
 }

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") }
     }
 
 }

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 {

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 {

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' }
     }
 
 }

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") }
     }
 
 }

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' }
     }
 }

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") }
     }
 }

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' }
     }
 
 }

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") }
     }
 
 }

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 {

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 {

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 {

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 {

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 {

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 {

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' }
     }
 
 }

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") }
     }
 
 }

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

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)