From ab50ccf995114d5c44072d9e1f84a488699d2b21 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Mon, 30 Oct 2017 19:41:06 +0300 Subject: [PATCH] Fix formatting for new kotlin dsl gradle project build script --- .../KotlinDslGradleKotlinFrameworkSupportProvider.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 561734dbeff..fe8c730e136 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 @@ -66,11 +66,13 @@ abstract class KotlinDslGradleKotlinFrameworkSupportProvider( .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\"") + .addBuildscriptPropertyDefinition("var $GSK_KOTLIN_VERSION_PROPERTY_NAME: String by extra\n $GSK_KOTLIN_VERSION_PROPERTY_NAME = \"$kotlinVersion\"") .addDependencyNotation(getRuntimeLibrary(rootModel)) .addBuildscriptDependencyNotation(getKotlinGradlePluginClassPathSnippet()) } + private fun RepositoryDescription.toKotlinRepositorySnippet() = "maven { setUrl(\"$url\") }" + protected abstract fun getRuntimeLibrary(rootModel: ModifiableRootModel): String protected abstract fun getPluginDefinition(): String