Configure Kotlin: add mavenCentral() to repositories
Since kotlin stdlib depends on artifacts from mavenCentral() we should add it #KT-18719 Fixed
This commit is contained in:
+5
@@ -67,6 +67,7 @@ class GroovyBuildScriptManipulator(private val groovyScript: GroovyFile) : Gradl
|
||||
|
||||
groovyScript.getRepositoriesBlock().apply {
|
||||
addRepository(version)
|
||||
addMavenCentralIfMissing()
|
||||
}
|
||||
|
||||
groovyScript.getDependenciesBlock().apply {
|
||||
@@ -90,6 +91,7 @@ class GroovyBuildScriptManipulator(private val groovyScript: GroovyFile) : Gradl
|
||||
|
||||
getBuildScriptRepositoriesBlock().apply {
|
||||
addRepository(version)
|
||||
addMavenCentralIfMissing()
|
||||
}
|
||||
|
||||
getBuildScriptDependenciesBlock().apply {
|
||||
@@ -211,6 +213,9 @@ class GroovyBuildScriptManipulator(private val groovyScript: GroovyFile) : Gradl
|
||||
return addLastExpressionInBlockIfNeeded(snippet)
|
||||
}
|
||||
|
||||
private fun GrClosableBlock.addMavenCentralIfMissing(): Boolean =
|
||||
if (!isRepositoryConfigured(text)) addLastExpressionInBlockIfNeeded(MAVEN_CENTRAL) else false
|
||||
|
||||
private fun GrStatementOwner.getRepositoriesBlock() = getBlockOrCreate("repositories")
|
||||
|
||||
private fun GrStatementOwner.getDependenciesBlock(): GrClosableBlock = getBlockOrCreate("dependencies")
|
||||
|
||||
+13
-2
@@ -39,7 +39,11 @@ class KotlinBuildScriptManipulator(private val kotlinScript: KtFile) : GradleBui
|
||||
addExpressionAfterIfMissing("$GSK_KOTLIN_VERSION_PROPERTY_NAME = \"$version\"", it)
|
||||
}
|
||||
|
||||
getRepositoriesBlock()?.addRepositoryIfMissing(version)
|
||||
getRepositoriesBlock()?.apply {
|
||||
addRepositoryIfMissing(version)
|
||||
addMavenCentralIfMissing()
|
||||
}
|
||||
|
||||
getDependenciesBlock()?.addPluginToClassPathIfMissing()
|
||||
}
|
||||
|
||||
@@ -57,7 +61,11 @@ class KotlinBuildScriptManipulator(private val kotlinScript: KtFile) : GradleBui
|
||||
script?.blockExpression?.addDeclarationIfMissing("val $GSK_KOTLIN_VERSION_PROPERTY_NAME: String by extra", true)
|
||||
getApplyBlock()?.createPluginIfMissing(kotlinPluginName)
|
||||
getDependenciesBlock()?.addCompileStdlibIfMissing(stdlibArtifactName)
|
||||
getRepositoriesBlock()?.addRepositoryIfMissing(version)
|
||||
getRepositoriesBlock()?.apply {
|
||||
addRepositoryIfMissing(version)
|
||||
addMavenCentralIfMissing()
|
||||
}
|
||||
|
||||
jvmTarget?.let {
|
||||
changeKotlinTaskParameter("jvmTarget", it, forTests = false)
|
||||
changeKotlinTaskParameter("jvmTarget", it, forTests = true)
|
||||
@@ -223,6 +231,9 @@ class KotlinBuildScriptManipulator(private val kotlinScript: KtFile) : GradleBui
|
||||
return addExpressionIfMissing(snippet) as? KtCallExpression
|
||||
}
|
||||
|
||||
private fun KtBlockExpression.addMavenCentralIfMissing(): KtCallExpression? =
|
||||
if (!isRepositoryConfigured(text)) addExpressionIfMissing(MAVEN_CENTRAL) as? KtCallExpression else null
|
||||
|
||||
private fun KtBlockExpression.addPluginToClassPathIfMissing(): KtCallExpression? =
|
||||
addExpressionIfMissing(getKotlinGradlePluginClassPathSnippet()) as? KtCallExpression
|
||||
|
||||
|
||||
Vendored
+2
-1
@@ -8,6 +8,7 @@ buildscript {
|
||||
maven {
|
||||
url 'http://oss.sonatype.org/content/repositories/snapshots'
|
||||
}
|
||||
mavenCentral()
|
||||
}
|
||||
}
|
||||
apply plugin: 'android'
|
||||
@@ -35,4 +36,4 @@ dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
||||
}
|
||||
|
||||
// VERSION: $VERSION$
|
||||
// VERSION: $VERSION$
|
||||
|
||||
@@ -21,6 +21,7 @@ buildscript {
|
||||
maven {
|
||||
url 'http://dl.bintray.com/kotlin/kotlin-eap'
|
||||
}
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
|
||||
@@ -21,6 +21,7 @@ buildscript {
|
||||
maven {
|
||||
url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1'
|
||||
}
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
|
||||
@@ -21,6 +21,7 @@ buildscript {
|
||||
maven {
|
||||
url 'http://dl.bintray.com/kotlin/kotlin-eap'
|
||||
}
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
|
||||
@@ -9,6 +9,7 @@ buildscript {
|
||||
maven {
|
||||
setUrl("http://dl.bintray.com/kotlin/kotlin-eap-1.1")
|
||||
}
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath(kotlinModule("gradle-plugin", kotlin_version))
|
||||
|
||||
@@ -8,6 +8,7 @@ buildscript {
|
||||
maven {
|
||||
setUrl("http://dl.bintray.com/kotlin/kotlin-eap")
|
||||
}
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath(kotlinModule("gradle-plugin", kotlin_version))
|
||||
|
||||
Reference in New Issue
Block a user