From c64f93b0528cfa1ad3cfd51b7f4b6b327a76a3d0 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 24 May 2018 16:24:32 +0300 Subject: [PATCH] Configuration: Add 'mavenCentral() to generated script 'repositories' block #KT-24586 Fixed --- .../configuration/GradleKotlinFrameworkSupportProvider.kt | 5 ++--- .../KotlinDslGradleKotlinFrameworkSupportProvider.kt | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt index d3dcf236715..242bc669829 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt @@ -101,13 +101,12 @@ abstract class GradleKotlinFrameworkSupportProvider( buildScriptData .addPluginDefinition(KotlinWithGradleConfigurator.getGroovyApplyPluginDirective(getPluginId())) - .addBuildscriptRepositoriesDefinition("mavenCentral()") - .addRepositoriesDefinition("mavenCentral()") - .addBuildscriptPropertyDefinition("ext.kotlin_version = '$kotlinVersion'") } + buildScriptData.addRepositoriesDefinition("mavenCentral()") + for (dependency in getDependencies(sdk)) { buildScriptData.addDependencyNotation(KotlinWithGradleConfigurator.getGroovyDependencySnippet(dependency, "compile", !useNewSyntax)) } diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt index 8d80f5d4901..07eb89e483e 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt @@ -87,12 +87,13 @@ abstract class KotlinDslGradleKotlinFrameworkSupportProvider( .addPropertyDefinition("val $GSK_KOTLIN_VERSION_PROPERTY_NAME: String by extra") .addPluginDefinition(getOldSyntaxPluginDefinition()) .addBuildscriptRepositoriesDefinition("mavenCentral()") - .addRepositoriesDefinition("mavenCentral()") // TODO: in gradle > 4.1 this could be single declaration e.g. 'val kotlin_version: String by extra { "1.1.11" }' .addBuildscriptPropertyDefinition("var $GSK_KOTLIN_VERSION_PROPERTY_NAME: String by extra\n $GSK_KOTLIN_VERSION_PROPERTY_NAME = \"$kotlinVersion\"") .addDependencyNotation(getRuntimeLibrary(rootModel, "\$$GSK_KOTLIN_VERSION_PROPERTY_NAME")) .addBuildscriptDependencyNotation(getKotlinGradlePluginClassPathSnippet()) } + + buildScriptData.addRepositoriesDefinition("mavenCentral()") } private fun RepositoryDescription.toKotlinRepositorySnippet() = "maven { setUrl(\"$url\") }"