Removed extra spaces in new MPP project template

#KT-26952  Fixed
This commit is contained in:
Alexander Podkhalyuzin
2018-09-21 12:52:24 +03:00
parent c1013cc198
commit 3142627269
13 changed files with 21 additions and 51 deletions
@@ -191,8 +191,8 @@ class KotlinGradleSharedMultiplatformModuleBuilder : KotlinGradleAbstractMultipl
} }
$commonTestName { $commonTestName {
dependencies { dependencies {
implementation 'org.jetbrains.kotlin:kotlin-test-common' implementation 'org.jetbrains.kotlin:kotlin-test-common'
implementation 'org.jetbrains.kotlin:kotlin-test-annotations-common' implementation 'org.jetbrains.kotlin:kotlin-test-annotations-common'
} }
} }
$jvmSourceName { $jvmSourceName {
@@ -155,8 +155,8 @@ class KotlinGradleWebMultiplatformModuleBuilder : KotlinGradleAbstractMultiplatf
} }
$commonTestName { $commonTestName {
dependencies { dependencies {
implementation 'org.jetbrains.kotlin:kotlin-test-common' implementation 'org.jetbrains.kotlin:kotlin-test-common'
implementation 'org.jetbrains.kotlin:kotlin-test-annotations-common' implementation 'org.jetbrains.kotlin:kotlin-test-annotations-common'
} }
} }
$jvmSourceName { $jvmSourceName {
@@ -98,9 +98,9 @@ fun DependencyScope.toGradleCompileScope(isAndroidModule: Boolean) = when (this)
else -> "compile" else -> "compile"
} }
fun RepositoryDescription.toGroovyRepositorySnippet() = "maven {\n url '$url'\n}" fun RepositoryDescription.toGroovyRepositorySnippet() = "maven { url '$url' }"
fun RepositoryDescription.toKotlinRepositorySnippet() = "maven {\n setUrl(\"$url\")\n}" fun RepositoryDescription.toKotlinRepositorySnippet() = "maven { setUrl(\"$url\") }"
fun getRepositoryForVersion(version: String): RepositoryDescription? = when { fun getRepositoryForVersion(version: String): RepositoryDescription? = when {
isSnapshot(version) -> SNAPSHOT_REPOSITORY isSnapshot(version) -> SNAPSHOT_REPOSITORY
@@ -2,9 +2,7 @@ buildscript {
ext.kotlin_version = '$VERSION$' ext.kotlin_version = '$VERSION$'
repositories { repositories {
mavenCentral() mavenCentral()
maven { maven { url 'http://oss.sonatype.org/content/repositories/snapshots' }
url 'http://oss.sonatype.org/content/repositories/snapshots'
}
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:0.5.+' classpath 'com.android.tools.build:gradle:0.5.+'
@@ -16,9 +14,7 @@ apply plugin: 'kotlin-android'
repositories { repositories {
mavenCentral() mavenCentral()
maven { maven { url 'http://oss.sonatype.org/content/repositories/snapshots' }
url 'http://oss.sonatype.org/content/repositories/snapshots'
}
} }
android { android {
@@ -5,9 +5,7 @@ buildscript {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
repositories { repositories {
maven { maven { url 'http://oss.sonatype.org/content/repositories/snapshots' }
url 'http://oss.sonatype.org/content/repositories/snapshots'
}
mavenCentral() mavenCentral()
} }
} }
@@ -16,9 +14,7 @@ apply plugin: 'kotlin-android'
repositories { repositories {
mavenCentral() mavenCentral()
maven { maven { url 'http://oss.sonatype.org/content/repositories/snapshots' }
url 'http://oss.sonatype.org/content/repositories/snapshots'
}
} }
android { android {
@@ -6,9 +6,7 @@ version = '1.0'
repositories { repositories {
mavenCentral() mavenCentral()
maven { maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
url 'http://dl.bintray.com/kotlin/kotlin-eap'
}
} }
dependencies { dependencies {
@@ -18,9 +16,7 @@ dependencies {
buildscript { buildscript {
ext.kotlin_version = '$VERSION$' ext.kotlin_version = '$VERSION$'
repositories { repositories {
maven { maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
url 'http://dl.bintray.com/kotlin/kotlin-eap'
}
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
@@ -6,9 +6,7 @@ version = '1.0'
repositories { repositories {
mavenCentral() mavenCentral()
maven { maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
url 'http://dl.bintray.com/kotlin/kotlin-eap'
}
} }
dependencies { dependencies {
@@ -18,9 +16,7 @@ dependencies {
buildscript { buildscript {
ext.kotlin_version = '$VERSION$' ext.kotlin_version = '$VERSION$'
repositories { repositories {
maven { maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
url 'http://dl.bintray.com/kotlin/kotlin-eap'
}
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
@@ -5,9 +5,7 @@ buildscript {
var kotlin_version: String by extra var kotlin_version: String by extra
kotlin_version = "1.2.60-dev-286" kotlin_version = "1.2.60-dev-286"
repositories { repositories {
maven { maven { setUrl("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/") }
setUrl("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/")
}
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
@@ -23,9 +21,7 @@ dependencies {
compile(kotlinModule("stdlib-jdk8", kotlin_version)) compile(kotlinModule("stdlib-jdk8", kotlin_version))
} }
repositories { repositories {
maven { maven { setUrl("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/") }
setUrl("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/")
}
mavenCentral() mavenCentral()
} }
val compileKotlin: KotlinCompile by tasks val compileKotlin: KotlinCompile by tasks
@@ -9,9 +9,7 @@ dependencies {
compile(kotlin("stdlib-jdk8")) compile(kotlin("stdlib-jdk8"))
} }
repositories { repositories {
maven { maven { setUrl("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/") }
setUrl("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/")
}
mavenCentral() mavenCentral()
} }
val compileKotlin: KotlinCompile by tasks val compileKotlin: KotlinCompile by tasks
@@ -6,9 +6,7 @@ version '1.0-SNAPSHOT'
repositories { repositories {
mavenCentral() mavenCentral()
maven { maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
url 'http://dl.bintray.com/kotlin/kotlin-eap'
}
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-js" compile "org.jetbrains.kotlin:kotlin-stdlib-js"
@@ -6,9 +6,7 @@ version = "1.0-SNAPSHOT"
repositories { repositories {
mavenCentral() mavenCentral()
maven { maven { setUrl("http://dl.bintray.com/kotlin/kotlin-eap") }
setUrl("http://dl.bintray.com/kotlin/kotlin-eap")
}
} }
dependencies { dependencies {
compile(kotlin("stdlib-js")) compile(kotlin("stdlib-js"))
@@ -10,9 +10,7 @@ sourceCompatibility = 1.8
repositories { repositories {
mavenCentral() mavenCentral()
maven { maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
url 'http://dl.bintray.com/kotlin/kotlin-eap'
}
} }
dependencies { dependencies {
@@ -10,9 +10,7 @@ version = "1.0-SNAPSHOT"
repositories { repositories {
mavenCentral() mavenCentral()
maven { maven { setUrl("http://dl.bintray.com/kotlin/kotlin-eap") }
setUrl("http://dl.bintray.com/kotlin/kotlin-eap")
}
} }
dependencies { dependencies {