From d3e99bd7a79a6490b3aa5d3a79c2ac9f419c656e Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Sat, 10 Oct 2020 23:35:31 +0300 Subject: [PATCH] Wizard: simplify custom maven repository syntax for Gradle --- .../android/expected/build.gradle | 8 ++------ .../android/expected/build.gradle.kts | 8 ++------ .../android/expected/settings.gradle | 4 +--- .../android/expected/settings.gradle.kts | 4 +--- .../jsNodeAndBrowserTargets/build.gradle | 4 +--- .../jsNodeAndBrowserTargets/build.gradle.kts | 4 +--- .../jsNodeAndBrowserTargets/settings.gradle | 4 +--- .../jsNodeAndBrowserTargets/settings.gradle.kts | 4 +--- .../buildFileGeneration/jvmTarget/build.gradle | 4 +--- .../jvmTarget/build.gradle.kts | 4 +--- .../jvmTarget/settings.gradle | 4 +--- .../jvmTarget/settings.gradle.kts | 4 +--- .../jvmTargetWithJava/build.gradle | 4 +--- .../jvmTargetWithJava/build.gradle.kts | 4 +--- .../jvmTargetWithJava/settings.gradle | 4 +--- .../jvmTargetWithJava/settings.gradle.kts | 4 +--- .../jvmToJvmDependency/expected/build.gradle | 4 +--- .../jvmToJvmDependency/expected/build.gradle.kts | 4 +--- .../jvmToJvmDependency/expected/settings.gradle | 4 +--- .../expected/settings.gradle.kts | 4 +--- .../expected/settings.gradle | 4 +--- .../expected/settings.gradle.kts | 4 +--- .../buildFileGeneration/kotlinJvm/build.gradle | 4 +--- .../kotlinJvm/build.gradle.kts | 4 +--- .../kotlinJvm/settings.gradle | 4 +--- .../kotlinJvm/settings.gradle.kts | 4 +--- .../nativeForCurrentSystem/build.gradle | 4 +--- .../nativeForCurrentSystem/build.gradle.kts | 4 +--- .../nativeForCurrentSystem/settings.gradle | 4 +--- .../nativeForCurrentSystem/settings.gradle.kts | 4 +--- .../simpleMultiplatform/build.gradle | 4 +--- .../simpleMultiplatform/build.gradle.kts | 4 +--- .../simpleMultiplatform/settings.gradle | 4 +--- .../simpleMultiplatform/settings.gradle.kts | 4 +--- .../simpleNativeTarget/build.gradle | 4 +--- .../simpleNativeTarget/build.gradle.kts | 4 +--- .../simpleNativeTarget/settings.gradle | 4 +--- .../simpleNativeTarget/settings.gradle.kts | 4 +--- .../expected/build.gradle | 4 +--- .../expected/build.gradle.kts | 4 +--- .../expected/settings.gradle | 4 +--- .../expected/settings.gradle.kts | 4 +--- .../singlePlatformJsNode/expected/build.gradle | 4 +--- .../expected/build.gradle.kts | 4 +--- .../expected/settings.gradle | 4 +--- .../expected/settings.gradle.kts | 4 +--- .../backendApplication/build.gradle | 4 +--- .../backendApplication/build.gradle.kts | 4 +--- .../backendApplication/settings.gradle | 4 +--- .../backendApplication/settings.gradle.kts | 4 +--- .../consoleApplication/build.gradle | 4 +--- .../consoleApplication/build.gradle.kts | 4 +--- .../consoleApplication/settings.gradle | 4 +--- .../consoleApplication/settings.gradle.kts | 4 +--- .../frontendApplication/build.gradle | 4 +--- .../frontendApplication/build.gradle.kts | 4 +--- .../frontendApplication/settings.gradle | 4 +--- .../frontendApplication/settings.gradle.kts | 4 +--- .../fullStackWebApplication/build.gradle | 16 ++++------------ .../fullStackWebApplication/build.gradle.kts | 16 ++++------------ .../fullStackWebApplication/settings.gradle | 4 +--- .../fullStackWebApplication/settings.gradle.kts | 4 +--- .../multiplatformApplication/build.gradle | 4 +--- .../multiplatformApplication/build.gradle.kts | 4 +--- .../multiplatformApplication/settings.gradle | 4 +--- .../multiplatformApplication/settings.gradle.kts | 4 +--- .../multiplatformLibrary/build.gradle | 4 +--- .../multiplatformLibrary/build.gradle.kts | 4 +--- .../multiplatformLibrary/settings.gradle | 4 +--- .../multiplatformLibrary/settings.gradle.kts | 4 +--- .../expected/build.gradle | 8 ++------ .../expected/build.gradle.kts | 8 ++------ .../expected/settings.gradle | 4 +--- .../expected/settings.gradle.kts | 4 +--- .../expected/build.gradle | 4 +--- .../expected/build.gradle.kts | 4 +--- .../expected/settings.gradle | 4 +--- .../expected/settings.gradle.kts | 4 +--- .../nativeApplication/build.gradle | 4 +--- .../nativeApplication/build.gradle.kts | 4 +--- .../nativeApplication/settings.gradle | 4 +--- .../nativeApplication/settings.gradle.kts | 4 +--- .../projectWizard/ir/buildsystem/RepositoryIR.kt | 10 +--------- 83 files changed, 93 insertions(+), 285 deletions(-) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/build.gradle index 8cf43cf2f84..0703117eb80 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/build.gradle @@ -3,9 +3,7 @@ buildscript { gradlePluginPortal() jcenter() google() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } dependencies { classpath('org.jetbrains.kotlin:kotlin-gradle-plugin:KOTLIN_VERSION') @@ -22,8 +20,6 @@ allprojects { repositories { google() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/build.gradle.kts index 0d0462075b6..9298dc3bd07 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/build.gradle.kts @@ -3,9 +3,7 @@ buildscript { gradlePluginPortal() jcenter() google() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } dependencies { classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:KOTLIN_VERSION") @@ -22,8 +20,6 @@ allprojects { repositories { google() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/settings.gradle index 652fb7bbc06..3fb3183d8f3 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/settings.gradle @@ -4,9 +4,7 @@ pluginManagement { jcenter() gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/settings.gradle.kts index 85a43c462d1..c02893ee21b 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/settings.gradle.kts @@ -4,9 +4,7 @@ pluginManagement { jcenter() gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle index b9bc92a0709..60654b1bce9 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle @@ -7,9 +7,7 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle.kts index a99930d9526..9a0af6dada1 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle.kts @@ -7,9 +7,7 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/settings.gradle index f75796befef..4b331f57991 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/settings.gradle @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/settings.gradle.kts index 26e0c1b4359..4129219f182 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/settings.gradle.kts @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle index 06f33ece647..50a1abd1cbe 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle @@ -7,9 +7,7 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle.kts index ed3489ce62c..3ec78bf517a 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle.kts @@ -7,9 +7,7 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/settings.gradle index f75796befef..4b331f57991 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/settings.gradle @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/settings.gradle.kts index 26e0c1b4359..4129219f182 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/settings.gradle.kts @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle index 5513f041d26..77c0436b648 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle @@ -7,9 +7,7 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle.kts index 04884124b75..1d46ff95676 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle.kts @@ -7,9 +7,7 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/settings.gradle index f75796befef..4b331f57991 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/settings.gradle @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/settings.gradle.kts index 26e0c1b4359..4129219f182 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/settings.gradle.kts @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/build.gradle index ecbb2606f66..260220fbecd 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/build.gradle @@ -6,8 +6,6 @@ version = '1.0-SNAPSHOT' allprojects { repositories { mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/build.gradle.kts index bba861a8c06..7bc7eccf24a 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/build.gradle.kts @@ -6,8 +6,6 @@ version = "1.0-SNAPSHOT" allprojects { repositories { mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/settings.gradle index 7a55a95a773..6aefd464550 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/settings.gradle @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/settings.gradle.kts index 63e1d544abe..d26320032b1 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/settings.gradle.kts @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/settings.gradle index f7476990c72..9b6c44e32f4 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/settings.gradle @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/settings.gradle.kts index 31826ffb7b1..82f2f2d5ca1 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/settings.gradle.kts @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle index 2217ef626f4..8d8730c6449 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle @@ -7,9 +7,7 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle.kts index 706f010352b..28db71a5024 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle.kts @@ -9,9 +9,7 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/settings.gradle index f75796befef..4b331f57991 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/settings.gradle @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/settings.gradle.kts index 26e0c1b4359..4129219f182 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/settings.gradle.kts @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle index 02873b9d33b..4bc5d63561e 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle @@ -9,9 +9,7 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle.kts index 96a10a1bb40..612967134c5 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle.kts @@ -7,9 +7,7 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/settings.gradle index f75796befef..4b331f57991 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/settings.gradle @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/settings.gradle.kts index 26e0c1b4359..4129219f182 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/settings.gradle.kts @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle index 016834dce43..daf432f7952 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle @@ -7,9 +7,7 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle.kts index 1ef97d25daf..ff2e48a225b 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle.kts @@ -7,9 +7,7 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/settings.gradle index 33ca73c451c..2132e4f8a9b 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/settings.gradle @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/settings.gradle.kts index 26e0c1b4359..4129219f182 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/settings.gradle.kts @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle index effd1237b21..95ffe092641 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle @@ -7,9 +7,7 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle.kts index e8ec7d7eb09..46002c04a1b 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/build.gradle.kts @@ -7,9 +7,7 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/settings.gradle index f75796befef..4b331f57991 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/settings.gradle @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/settings.gradle.kts index 26e0c1b4359..4129219f182 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/settings.gradle.kts @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/build.gradle index ca53dae9d44..9eb6e562f89 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/build.gradle @@ -7,9 +7,7 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/build.gradle.kts index 75fc262e559..867952b7d6e 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/build.gradle.kts @@ -7,9 +7,7 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/settings.gradle index f75796befef..4b331f57991 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/settings.gradle @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/settings.gradle.kts index 26e0c1b4359..4129219f182 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/expected/settings.gradle.kts @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle index 227f7a273c8..62c05345ad5 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle @@ -7,9 +7,7 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle.kts index 3c570c9188e..38dec6c9359 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle.kts @@ -7,9 +7,7 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/settings.gradle index f75796befef..4b331f57991 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/settings.gradle @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/settings.gradle.kts index 26e0c1b4359..4129219f182 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/settings.gradle.kts @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle index d33f4ccfb7d..daf85830c7a 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle @@ -7,9 +7,7 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle.kts index cc31b9f4912..5c6870fc2e9 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle.kts @@ -9,9 +9,7 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/settings.gradle index 176bd82bf58..42b11a492e2 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/settings.gradle @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/settings.gradle.kts index c5ab0a29d40..5e4bdbd879e 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/settings.gradle.kts @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle index ee678e1ff4c..af19ae8e0fd 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle @@ -8,9 +8,7 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle.kts index 893caf308dd..15bcc460da3 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle.kts @@ -10,9 +10,7 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/settings.gradle index 71a0b0b02b1..3478a16a6bb 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/settings.gradle @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/settings.gradle.kts index dbd105227b9..b3e3b0c9044 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/settings.gradle.kts @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle index 0059cba0395..7b09c535d1b 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle @@ -8,9 +8,7 @@ version = '1.0-SNAPSHOT' repositories { jcenter() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts index dfc21799c7e..da3f28be59e 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts @@ -8,9 +8,7 @@ version = "1.0-SNAPSHOT" repositories { jcenter() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle index 14a60b5ee34..26d8ffd9a75 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle.kts index dbe6f6aeec6..03a39b4221f 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle.kts @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle index c28513315e4..7a661fec6a8 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle @@ -11,18 +11,10 @@ version = '1.0-SNAPSHOT' repositories { jcenter() mavenCentral() - maven { - url 'KOTLIN_REPO' - } - maven { - url 'https://dl.bintray.com/kotlin/kotlin-js-wrappers' - } - maven { - url 'https://dl.bintray.com/kotlin/kotlinx' - } - maven { - url 'https://dl.bintray.com/kotlin/ktor' - } + maven('KOTLIN_REPO') + maven('https://dl.bintray.com/kotlin/kotlin-js-wrappers') + maven('https://dl.bintray.com/kotlin/kotlinx') + maven('https://dl.bintray.com/kotlin/ktor') } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts index bfcf9e03aad..cac85453aa0 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts @@ -11,18 +11,10 @@ version = "1.0-SNAPSHOT" repositories { jcenter() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } - maven { - url = uri("https://dl.bintray.com/kotlin/kotlin-js-wrappers") - } - maven { - url = uri("https://dl.bintray.com/kotlin/kotlinx") - } - maven { - url = uri("https://dl.bintray.com/kotlin/ktor") - } + maven("KOTLIN_REPO") + maven("https://dl.bintray.com/kotlin/kotlin-js-wrappers") + maven("https://dl.bintray.com/kotlin/kotlinx") + maven("https://dl.bintray.com/kotlin/ktor") } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle index 24860ebd4b4..12987142b9d 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle.kts index 7e6c617fccc..efc5c5064ce 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle.kts @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle index ab145107dac..910884cd72d 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle @@ -7,9 +7,7 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle.kts index b040137f2e4..436f03f148c 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle.kts @@ -7,9 +7,7 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle index 1bff09f8a99..6e12e5110eb 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle.kts index 10a73bd288d..c083166e6ca 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle.kts @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle index c92cb9e1d43..485cebba98d 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle @@ -9,9 +9,7 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle.kts index 74d4574fc70..c956f59e6c6 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle.kts @@ -7,9 +7,7 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/settings.gradle index 53a951843fd..273534d1119 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/settings.gradle @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/settings.gradle.kts index 5fb22937acf..341f7ee2536 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/settings.gradle.kts @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle index fe42ff448c3..23e0ced7f75 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle @@ -3,9 +3,7 @@ buildscript { gradlePluginPortal() jcenter() google() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } dependencies { classpath('org.jetbrains.kotlin:kotlin-gradle-plugin:KOTLIN_VERSION') @@ -22,8 +20,6 @@ allprojects { repositories { google() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle.kts index 7e048f0577e..ac2aac8c149 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle.kts @@ -3,9 +3,7 @@ buildscript { gradlePluginPortal() jcenter() google() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } dependencies { classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:KOTLIN_VERSION") @@ -22,8 +20,6 @@ allprojects { repositories { google() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle index 2255cb0a852..48766b63f72 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle @@ -4,9 +4,7 @@ pluginManagement { jcenter() gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle.kts index 81dc227d417..8004607d757 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle.kts @@ -4,9 +4,7 @@ pluginManagement { jcenter() gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle index 9d1b6b5a587..de032ae0dd2 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle @@ -10,9 +10,7 @@ version = '1.0-SNAPSHOT' repositories { google() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts index 6d678245488..45a31cc6ea7 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts @@ -10,9 +10,7 @@ version = "1.0-SNAPSHOT" repositories { google() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle index b262b139b62..e4480d54617 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle @@ -4,9 +4,7 @@ pluginManagement { jcenter() gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle.kts index aca8c4872d0..0939701eeac 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle.kts @@ -4,9 +4,7 @@ pluginManagement { jcenter() gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle index 01a491ce237..7bdeb539548 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle @@ -9,9 +9,7 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle.kts index a4f93936a9e..117d0a833da 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle.kts @@ -7,9 +7,7 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle index 2fe8eaaa916..9f0cc93ad1c 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url 'KOTLIN_REPO' - } + maven('KOTLIN_REPO') } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle.kts index 13465a6f644..bb621791884 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle.kts @@ -2,9 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } + maven("KOTLIN_REPO") } } diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/RepositoryIR.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/RepositoryIR.kt index dd7367af25c..4f461812dc1 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/RepositoryIR.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/RepositoryIR.kt @@ -27,15 +27,7 @@ data class RepositoryIR(override val repository: Repository) : BuildSystemIR, Re +"()" } is CustomMavenRepository -> { - sectionCall("maven", needIndent = true) { - assignmentOrCall("url") { - val url = repository.url.quotified - when (dsl) { - GradlePrinter.GradleDsl.KOTLIN -> call("uri") { +url } - GradlePrinter.GradleDsl.GROOVY -> +url - } - } - } + call("maven", forceBrackets = true) { +repository.url.quotified } } else -> Unit }