From 855ddf96fd2d90190eca3a7b1a13dfff20c0027a Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 24 May 2016 19:53:59 +0200 Subject: [PATCH] Kotlin with Gradle: generate 'repositories' call, use kotlin_version property #KT-11841 Fixed --- .../GradleKotlinJavaFrameworkSupportProvider.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinJavaFrameworkSupportProvider.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinJavaFrameworkSupportProvider.kt index 66e57153993..f161bc57262 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinJavaFrameworkSupportProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinJavaFrameworkSupportProvider.kt @@ -67,9 +67,10 @@ class GradleKotlinJavaFrameworkSupportProvider() : GradleFrameworkSupportProvide .addPluginDefinition(KotlinGradleModuleConfigurator.APPLY_KOTLIN) .addBuildscriptRepositoriesDefinition("mavenCentral()") + .addRepositoriesDefinition("mavenCentral()") - // TODO: once IDEA-148110 is fixed, define kotlin_version property in buildscript - .addDependencyNotation(KotlinWithGradleConfigurator.LIBRARY.replace("\$kotlin_version", kotlinVersion)) - .addBuildscriptDependencyNotation(KotlinWithGradleConfigurator.CLASSPATH.replace("\$kotlin_version", kotlinVersion)) + .addBuildscriptPropertyDefinition("ext.kotlin_version = '$kotlinVersion'") + .addDependencyNotation(KotlinWithGradleConfigurator.LIBRARY) + .addBuildscriptDependencyNotation(KotlinWithGradleConfigurator.CLASSPATH) } }