Configuration: Add 'mavenCentral() to generated script 'repositories' block

#KT-24586 Fixed
This commit is contained in:
Alexey Sedunov
2018-05-24 16:24:32 +03:00
parent 6d29aab5e2
commit c64f93b052
2 changed files with 4 additions and 4 deletions
@@ -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))
}
@@ -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\") }"