azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed extra spaces in new MPP project template

Browse Source 
#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
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSharedMultiplatformModuleBuilder.kt
+2 -2
View File
@@ -191,8 +191,8 @@ class KotlinGradleSharedMultiplatformModuleBuilder : KotlinGradleAbstractMultipl
}
$commonTestName {
dependencies {
implementation 'org.jetbrains.kotlin:kotlin-test-common'
implementation 'org.jetbrains.kotlin:kotlin-test-annotations-common'
implementation 'org.jetbrains.kotlin:kotlin-test-common'
implementation 'org.jetbrains.kotlin:kotlin-test-annotations-common'
}
}
$jvmSourceName {
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleWebMultiplatformModuleBuilder.kt
+2 -2
View File
@@ -155,8 +155,8 @@ class KotlinGradleWebMultiplatformModuleBuilder : KotlinGradleAbstractMultiplatf
}
$commonTestName {
dependencies {
implementation 'org.jetbrains.kotlin:kotlin-test-common'
implementation 'org.jetbrains.kotlin:kotlin-test-annotations-common'
implementation 'org.jetbrains.kotlin:kotlin-test-common'
implementation 'org.jetbrains.kotlin:kotlin-test-annotations-common'
}
}
$jvmSourceName {
idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
+2 -2
View File
@@ -98,9 +98,9 @@ fun DependencyScope.toGradleCompileScope(isAndroidModule: Boolean) = when (this)
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 {
isSnapshot(version) -> SNAPSHOT_REPOSITORY
idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle
Vendored
+2 -6
View File
@@ -2,9 +2,7 @@ buildscript {
ext.kotlin_version = '$VERSION$'
repositories {
mavenCentral()
maven {
url 'http://oss.sonatype.org/content/repositories/snapshots'
}
maven { url 'http://oss.sonatype.org/content/repositories/snapshots' }
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
@@ -16,9 +14,7 @@ apply plugin: 'kotlin-android'
repositories {
mavenCentral()
maven {
url 'http://oss.sonatype.org/content/repositories/snapshots'
}
maven { url 'http://oss.sonatype.org/content/repositories/snapshots' }
}
android {
idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle
Vendored
+2 -6
View File
@@ -5,9 +5,7 @@ buildscript {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
repositories {
maven {
url 'http://oss.sonatype.org/content/repositories/snapshots'
}
maven { url 'http://oss.sonatype.org/content/repositories/snapshots' }
mavenCentral()
}
}
@@ -16,9 +14,7 @@ apply plugin: 'kotlin-android'
repositories {
mavenCentral()
maven {
url 'http://oss.sonatype.org/content/repositories/snapshots'
}
maven { url 'http://oss.sonatype.org/content/repositories/snapshots' }
}
android {
idea/testData/configuration/gradle/eapVersion/build_after.gradle
Vendored
+2 -6
View File
@@ -6,9 +6,7 @@ version = '1.0'
repositories {
mavenCentral()
maven {
url 'http://dl.bintray.com/kotlin/kotlin-eap'
}
maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
}
dependencies {
@@ -18,9 +16,7 @@ dependencies {
buildscript {
ext.kotlin_version = '$VERSION$'
repositories {
maven {
url 'http://dl.bintray.com/kotlin/kotlin-eap'
}
maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
mavenCentral()
}
dependencies {
idea/testData/configuration/gradle/m04Version/build_after.gradle
Vendored
+2 -6
View File
@@ -6,9 +6,7 @@ version = '1.0'
repositories {
mavenCentral()
maven {
url 'http://dl.bintray.com/kotlin/kotlin-eap'
}
maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
}
dependencies {
@@ -18,9 +16,7 @@ dependencies {
buildscript {
ext.kotlin_version = '$VERSION$'
repositories {
maven {
url 'http://dl.bintray.com/kotlin/kotlin-eap'
}
maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
mavenCentral()
}
dependencies {
idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.3.5.after
Vendored
+2 -6
View File
@@ -5,9 +5,7 @@ buildscript {
var kotlin_version: String by extra
kotlin_version = "1.2.60-dev-286"
repositories {
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/")
}
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()
}
dependencies {
@@ -23,9 +21,7 @@ dependencies {
compile(kotlinModule("stdlib-jdk8", kotlin_version))
}
repositories {
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/")
}
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()
}
val compileKotlin: KotlinCompile by tasks
idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.4.9.after
Vendored
+1 -3
View File
@@ -9,9 +9,7 @@ dependencies {
compile(kotlin("stdlib-jdk8"))
}
repositories {
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/")
}
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()
}
val compileKotlin: KotlinCompile by tasks
idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/build.gradle.after
Vendored
+1 -3
View File
@@ -6,9 +6,7 @@ version '1.0-SNAPSHOT'
repositories {
mavenCentral()
maven {
url 'http://dl.bintray.com/kotlin/kotlin-eap'
}
maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-js"
idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/build.gradle.kts.after
Vendored
+1 -3
View File
@@ -6,9 +6,7 @@ version = "1.0-SNAPSHOT"
repositories {
mavenCentral()
maven {
setUrl("http://dl.bintray.com/kotlin/kotlin-eap")
}
maven { setUrl("http://dl.bintray.com/kotlin/kotlin-eap") }
}
dependencies {
compile(kotlin("stdlib-js"))
idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/build.gradle.after
Vendored
+1 -3
View File
@@ -10,9 +10,7 @@ sourceCompatibility = 1.8
repositories {
mavenCentral()
maven {
url 'http://dl.bintray.com/kotlin/kotlin-eap'
}
maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
}
dependencies {
idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/build.gradle.kts.after
Vendored
+1 -3
View File
@@ -10,9 +10,7 @@ version = "1.0-SNAPSHOT"
repositories {
mavenCentral()
maven {
setUrl("http://dl.bintray.com/kotlin/kotlin-eap")
}
maven { setUrl("http://dl.bintray.com/kotlin/kotlin-eap") }
}
dependencies {