diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinMavenConfigurator.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinMavenConfigurator.kt index a7d3799bc10..032b0db3a91 100644 --- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinMavenConfigurator.kt +++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinMavenConfigurator.kt @@ -133,7 +133,7 @@ abstract class KotlinMavenConfigurator pom.addLibraryRepository(SNAPSHOT_REPOSITORY) pom.addPluginRepository(SNAPSHOT_REPOSITORY) } - else if (is11Prerelease(version)) { + else if (useEap11Repository(version)) { pom.addLibraryRepository(EAP_11_REPOSITORY) pom.addPluginRepository(EAP_11_REPOSITORY) } diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt index 14922c562a0..8c4389c52b9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt @@ -166,6 +166,6 @@ fun isEap(version: String): Boolean { return version.contains("rc") || version.contains("eap") } -fun is11Prerelease(version: String): Boolean { - return Regex("1\\.1-[A-Za-z][A-Za-z0-9-]*").matches(version) && !version.startsWith("1.1-dev") +fun useEap11Repository(version: String): Boolean { + return Regex("1\\.1(\\.\\d)?-[A-Za-z][A-Za-z0-9-]*").matches(version) && !version.startsWith("1.1.0-dev") } diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinJavaFrameworkSupportProvider.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinJavaFrameworkSupportProvider.kt index 45c2d17a6eb..3ca4c644cc4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinJavaFrameworkSupportProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinJavaFrameworkSupportProvider.kt @@ -47,7 +47,7 @@ class GradleKotlinJavaFrameworkSupportProvider : GradleFrameworkSupportProvider( kotlinVersion = "1.1-SNAPSHOT" KotlinWithGradleConfigurator.SNAPSHOT_REPOSITORY_SNIPPET } - is11Prerelease(kotlinVersion) -> { + useEap11Repository(kotlinVersion) -> { KotlinWithGradleConfigurator.EAP_11_REPOSITORY_SNIPPET } isEap(kotlinVersion) -> { diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.kt index 75ff7bc6917..356a490ff20 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.kt +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.kt @@ -399,7 +399,7 @@ abstract class KotlinWithGradleConfigurator : KotlinProjectConfigurator { private fun addRepository(repositoriesBlock: GrClosableBlock, version: String): Boolean { val snippet = when { isSnapshot(version) -> SNAPSHOT_REPOSITORY_SNIPPET - is11Prerelease(version) -> EAP_11_REPOSITORY_SNIPPET + useEap11Repository(version) -> EAP_11_REPOSITORY_SNIPPET isEap(version) -> EAP_REPOSITORY_SNIPPET !isRepositoryConfigured(repositoriesBlock) -> MAVEN_CENTRAL else -> return false diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinUtilTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinUtilTest.kt index 792f57425f5..363b383d418 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinUtilTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinUtilTest.kt @@ -21,13 +21,16 @@ import org.junit.Assert class ConfigureKotlinUtilTest : UsefulTestCase() { fun test11Prerelease() { - Assert.assertTrue(is11Prerelease("1.1-M04")) - Assert.assertTrue(is11Prerelease("1.1-beta")) - Assert.assertTrue(is11Prerelease("1.1-beta-2")) - Assert.assertTrue(is11Prerelease("1.1-rc2")) - Assert.assertFalse(is11Prerelease("1.1")) - Assert.assertFalse(is11Prerelease("1.1.2")) - Assert.assertFalse(is11Prerelease("1.1.2-3")) - Assert.assertFalse(is11Prerelease("1.1-dev-1234")) + Assert.assertTrue(useEap11Repository("1.1-M04")) + Assert.assertTrue(useEap11Repository("1.1-beta")) + Assert.assertTrue(useEap11Repository("1.1.0-beta")) + Assert.assertTrue(useEap11Repository("1.1-beta-2")) + Assert.assertTrue(useEap11Repository("1.1-rc2")) + Assert.assertTrue(useEap11Repository("1.1.0-RC")) + Assert.assertTrue(useEap11Repository("1.1.1-eap-22")) + Assert.assertFalse(useEap11Repository("1.1")) + Assert.assertFalse(useEap11Repository("1.1.2")) + Assert.assertFalse(useEap11Repository("1.1.2-3")) + Assert.assertFalse(useEap11Repository("1.1-dev-1234")) } } \ No newline at end of file