Configuration: Add non-release repository to main Gradle buildfile

#KT-24725 Fixed
This commit is contained in:
Alexey Sedunov
2018-06-01 12:50:07 +03:00
parent b826e850fd
commit 48b55edb03
3 changed files with 16 additions and 10 deletions
@@ -78,7 +78,6 @@ class GroovyBuildScriptManipulator(
}
}
}
addMavenCentralIfMissing()
}
}
else {
@@ -97,11 +96,11 @@ class GroovyBuildScriptManipulator(
}
}
}
}
scriptFile.getRepositoriesBlock().apply {
addRepository(version)
addMavenCentralIfMissing()
}
scriptFile.getRepositoriesBlock().apply {
addRepository(version)
addMavenCentralIfMissing()
}
scriptFile.getDependenciesBlock().apply {
@@ -85,16 +85,15 @@ class KotlinBuildScriptManipulator(
}
}
}
addMavenCentralIfMissing()
}
} else {
script?.blockExpression?.addDeclarationIfMissing("val $GSK_KOTLIN_VERSION_PROPERTY_NAME: String by extra", true)
getApplyBlock()?.createPluginIfMissing(kotlinPluginName)
getDependenciesBlock()?.addCompileStdlibIfMissing(stdlibArtifactName)
getRepositoriesBlock()?.apply {
addRepositoryIfMissing(version)
addMavenCentralIfMissing()
}
}
getRepositoriesBlock()?.apply {
addRepositoryIfMissing(version)
addMavenCentralIfMissing()
}
jvmTarget?.let {
changeKotlinTaskParameter("jvmTarget", it, forTests = false)
@@ -526,6 +526,9 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
repositories {
mavenCentral()
maven {
url 'http://dl.bintray.com/kotlin/kotlin-eap'
}
}
dependencies {
@@ -615,6 +618,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
repositories {
mavenCentral()
maven { setUrl("http://dl.bintray.com/kotlin/kotlin-eap") }
}
dependencies {
@@ -814,6 +818,9 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
repositories {
mavenCentral()
maven {
url 'http://dl.bintray.com/kotlin/kotlin-eap'
}
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-js"
@@ -882,6 +889,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
repositories {
mavenCentral()
maven { setUrl("http://dl.bintray.com/kotlin/kotlin-eap") }
}
dependencies {
compile(kotlin("stdlib-js"))