diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GroovyBuildScriptManipulator.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GroovyBuildScriptManipulator.kt index df038488fe1..c87d49ba7c4 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GroovyBuildScriptManipulator.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GroovyBuildScriptManipulator.kt @@ -78,7 +78,6 @@ class GroovyBuildScriptManipulator( } } } - addMavenCentralIfMissing() } } else { @@ -97,11 +96,11 @@ class GroovyBuildScriptManipulator( } } } + } - scriptFile.getRepositoriesBlock().apply { - addRepository(version) - addMavenCentralIfMissing() - } + scriptFile.getRepositoriesBlock().apply { + addRepository(version) + addMavenCentralIfMissing() } scriptFile.getDependenciesBlock().apply { diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinBuildScriptManipulator.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinBuildScriptManipulator.kt index f5791b603dd..bd1bfda4a40 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinBuildScriptManipulator.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinBuildScriptManipulator.kt @@ -85,16 +85,15 @@ class KotlinBuildScriptManipulator( } } } - addMavenCentralIfMissing() } } else { script?.blockExpression?.addDeclarationIfMissing("val $GSK_KOTLIN_VERSION_PROPERTY_NAME: String by extra", true) getApplyBlock()?.createPluginIfMissing(kotlinPluginName) getDependenciesBlock()?.addCompileStdlibIfMissing(stdlibArtifactName) - getRepositoriesBlock()?.apply { - addRepositoryIfMissing(version) - addMavenCentralIfMissing() - } + } + getRepositoriesBlock()?.apply { + addRepositoryIfMissing(version) + addMavenCentralIfMissing() } jvmTarget?.let { changeKotlinTaskParameter("jvmTarget", it, forTests = false) diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt index 6a1b36aabc8..b89580dba23 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt @@ -526,6 +526,9 @@ class GradleConfiguratorTest : GradleImportingTestCase() { repositories { mavenCentral() + maven { + url 'http://dl.bintray.com/kotlin/kotlin-eap' + } } dependencies { @@ -615,6 +618,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() { repositories { mavenCentral() + maven { setUrl("http://dl.bintray.com/kotlin/kotlin-eap") } } dependencies { @@ -814,6 +818,9 @@ class GradleConfiguratorTest : GradleImportingTestCase() { repositories { mavenCentral() + maven { + url 'http://dl.bintray.com/kotlin/kotlin-eap' + } } dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib-js" @@ -882,6 +889,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() { repositories { mavenCentral() + maven { setUrl("http://dl.bintray.com/kotlin/kotlin-eap") } } dependencies { compile(kotlin("stdlib-js"))