diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSharedMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSharedMultiplatformModuleBuilder.kt index b264e69eb56..7b3a0784c90 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSharedMultiplatformModuleBuilder.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSharedMultiplatformModuleBuilder.kt @@ -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 { diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleWebMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleWebMultiplatformModuleBuilder.kt index 07fd56ad416..a529496c7e5 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleWebMultiplatformModuleBuilder.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleWebMultiplatformModuleBuilder.kt @@ -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 { diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt index a063c5397d3..7f8c81dd89a 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt @@ -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 diff --git a/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle b/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle index 42edec8de58..b7f9e534f6b 100644 --- a/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle +++ b/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle @@ -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 { diff --git a/idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle b/idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle index 56940da13de..a685cf21047 100644 --- a/idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle +++ b/idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle @@ -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 { diff --git a/idea/testData/configuration/gradle/eapVersion/build_after.gradle b/idea/testData/configuration/gradle/eapVersion/build_after.gradle index a2a7f49cd23..075a338c1ce 100644 --- a/idea/testData/configuration/gradle/eapVersion/build_after.gradle +++ b/idea/testData/configuration/gradle/eapVersion/build_after.gradle @@ -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 { diff --git a/idea/testData/configuration/gradle/m04Version/build_after.gradle b/idea/testData/configuration/gradle/m04Version/build_after.gradle index 73854d0069c..49c51fbbb7a 100644 --- a/idea/testData/configuration/gradle/m04Version/build_after.gradle +++ b/idea/testData/configuration/gradle/m04Version/build_after.gradle @@ -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 { diff --git a/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.3.5.after b/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.3.5.after index ed59bca8a49..19c478a2dec 100644 --- a/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.3.5.after +++ b/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.3.5.after @@ -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 diff --git a/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.4.9.after b/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.4.9.after index 63b8520e43f..557b0088363 100644 --- a/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.4.9.after +++ b/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.4.9.after @@ -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 diff --git a/idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/build.gradle.after b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/build.gradle.after index 59a32def1d0..de00e21e0d3 100644 --- a/idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/build.gradle.after +++ b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/build.gradle.after @@ -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" diff --git a/idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/build.gradle.kts.after b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/build.gradle.kts.after index fbeb1beb6a0..9c2a3f310db 100644 --- a/idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/build.gradle.kts.after +++ b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/build.gradle.kts.after @@ -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")) diff --git a/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/build.gradle.after b/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/build.gradle.after index 89a1f745e5d..b7009e36e3a 100644 --- a/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/build.gradle.after +++ b/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/build.gradle.after @@ -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 { diff --git a/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/build.gradle.kts.after b/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/build.gradle.kts.after index 16264f56f44..063c7283980 100644 --- a/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/build.gradle.kts.after +++ b/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/build.gradle.kts.after @@ -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 {