diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle index 30d755fc35c..ffc585187bb 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle @@ -7,16 +7,6 @@ plugins { group = 'testGroupId' version = '1.0-SNAPSHOT' -repositories { - gradlePluginPortal() - google() - jcenter() - mavenCentral() - maven { - url 'KOTLIN_REPO' - } -} - dependencies { implementation 'com.google.android.material:material:1.2.0' implementation 'androidx.appcompat:appcompat:1.2.0' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts index 553fb4256f5..5d0446af63d 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts @@ -7,16 +7,6 @@ plugins { group = "testGroupId" version = "1.0-SNAPSHOT" -repositories { - gradlePluginPortal() - google() - jcenter() - mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } -} - dependencies { implementation("com.google.android.material:material:1.2.0") implementation("androidx.appcompat:appcompat:1.2.0") 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 150026c182b..8cf43cf2f84 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 @@ -16,9 +16,14 @@ buildscript { group = 'testGroupId' version = '1.0-SNAPSHOT' -repositories { - mavenCentral() - maven { - url 'KOTLIN_REPO' + + +allprojects { + repositories { + google() + mavenCentral() + maven { + url '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 7a1e43355a5..0d0462075b6 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 @@ -16,9 +16,14 @@ buildscript { group = "testGroupId" version = "1.0-SNAPSHOT" -repositories { - mavenCentral() - maven { - url = uri("KOTLIN_REPO") + + +allprojects { + repositories { + google() + mavenCentral() + maven { + url = uri("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 c2ba34b285f..652fb7bbc06 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 @@ -1,9 +1,9 @@ pluginManagement { repositories { - mavenCentral() - gradlePluginPortal() google() jcenter() + gradlePluginPortal() + mavenCentral() maven { url '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 79987897a9e..85a43c462d1 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 @@ -1,9 +1,9 @@ pluginManagement { repositories { - mavenCentral() - gradlePluginPortal() google() jcenter() + gradlePluginPortal() + mavenCentral() maven { url = uri("KOTLIN_REPO") } 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 f86a7344300..f75796befef 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url '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 175b88c79f9..26e0c1b4359 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url = uri("KOTLIN_REPO") } 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 f86a7344300..f75796befef 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url '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 175b88c79f9..26e0c1b4359 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url = uri("KOTLIN_REPO") } 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 f86a7344300..f75796befef 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url '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 175b88c79f9..26e0c1b4359 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url = uri("KOTLIN_REPO") } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle index d68db8fdd7e..e527bef983c 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle @@ -5,13 +5,6 @@ plugins { group = 'testGroupId' version = '1.0-SNAPSHOT' -repositories { - mavenCentral() - maven { - url 'KOTLIN_REPO' - } -} - dependencies { implementation project(':b') implementation project(':c') diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle.kts index e927238438f..37774c1e557 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle.kts @@ -7,13 +7,6 @@ plugins { group = "testGroupId" version = "1.0-SNAPSHOT" -repositories { - mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } -} - dependencies { implementation(project(":b")) implementation(project(":c")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle index 4af14a32883..5c3b3ab30e0 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle @@ -5,13 +5,6 @@ plugins { group = 'testGroupId' version = '1.0-SNAPSHOT' -repositories { - mavenCentral() - maven { - url 'KOTLIN_REPO' - } -} - dependencies { implementation project(':c') implementation project(':d') diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle.kts index 5174d5771a4..427443f3e2c 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle.kts @@ -7,13 +7,6 @@ plugins { group = "testGroupId" version = "1.0-SNAPSHOT" -repositories { - mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } -} - dependencies { implementation(project(":c")) implementation(project(":d")) 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 d5001659f24..ecbb2606f66 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 @@ -1,9 +1,13 @@ group = 'testGroupId' version = '1.0-SNAPSHOT' -repositories { - mavenCentral() - maven { - url 'KOTLIN_REPO' + + +allprojects { + repositories { + mavenCentral() + maven { + url '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 0cc5ecebae8..bba861a8c06 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 @@ -1,9 +1,13 @@ group = "testGroupId" version = "1.0-SNAPSHOT" -repositories { - mavenCentral() - maven { - url = uri("KOTLIN_REPO") + + +allprojects { + repositories { + mavenCentral() + maven { + url = uri("KOTLIN_REPO") + } } } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle index 19ccff7c8d5..497020a29aa 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle @@ -5,13 +5,6 @@ plugins { group = 'testGroupId' version = '1.0-SNAPSHOT' -repositories { - mavenCentral() - maven { - url 'KOTLIN_REPO' - } -} - dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle.kts index cfae3f010ac..99df1607481 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle.kts @@ -7,13 +7,6 @@ plugins { group = "testGroupId" version = "1.0-SNAPSHOT" -repositories { - mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } -} - dependencies { testImplementation(kotlin("test-junit")) } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle index 21dae1db818..a5798128e70 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle @@ -5,13 +5,6 @@ plugins { group = 'testGroupId' version = '1.0-SNAPSHOT' -repositories { - mavenCentral() - maven { - url 'KOTLIN_REPO' - } -} - dependencies { implementation project(':a') testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle.kts index 028045abe73..13e23e87024 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle.kts @@ -7,13 +7,6 @@ plugins { group = "testGroupId" version = "1.0-SNAPSHOT" -repositories { - mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } -} - dependencies { implementation(project(":a")) testImplementation(kotlin("test-junit")) 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 c4d5ed84c18..7a55a95a773 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url '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 5e826dce488..63e1d544abe 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url = uri("KOTLIN_REPO") } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle index 5be79e3b285..3dc20929719 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle @@ -5,13 +5,6 @@ plugins { group = 'testGroupId' version = '1.0-SNAPSHOT' -repositories { - mavenCentral() - maven { - url 'KOTLIN_REPO' - } -} - dependencies { rootProject testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle.kts index c3af60e5c89..36d3844a885 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle.kts @@ -7,13 +7,6 @@ plugins { group = "testGroupId" version = "1.0-SNAPSHOT" -repositories { - mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } -} - dependencies { rootProject testImplementation(kotlin("test-junit")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle index bac4e801c85..15b4d29db6c 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle @@ -5,13 +5,6 @@ plugins { group = 'testGroupId' version = '1.0-SNAPSHOT' -repositories { - mavenCentral() - maven { - url 'KOTLIN_REPO' - } -} - dependencies { implementation project(':b') testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle.kts index ccf709ead03..49e7102d2f4 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle.kts @@ -7,13 +7,6 @@ plugins { group = "testGroupId" version = "1.0-SNAPSHOT" -repositories { - mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } -} - dependencies { implementation(project(":b")) testImplementation(kotlin("test-junit")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle index 19ccff7c8d5..497020a29aa 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle @@ -5,13 +5,6 @@ plugins { group = 'testGroupId' version = '1.0-SNAPSHOT' -repositories { - mavenCentral() - maven { - url 'KOTLIN_REPO' - } -} - dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle.kts index cfae3f010ac..99df1607481 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle.kts @@ -7,13 +7,6 @@ plugins { group = "testGroupId" version = "1.0-SNAPSHOT" -repositories { - mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } -} - dependencies { testImplementation(kotlin("test-junit")) } 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 15b69832354..f7476990c72 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url '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 826b295463a..31826ffb7b1 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url = uri("KOTLIN_REPO") } 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 f86a7344300..f75796befef 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url '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 175b88c79f9..26e0c1b4359 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url = uri("KOTLIN_REPO") } 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 f86a7344300..f75796befef 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url '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 175b88c79f9..26e0c1b4359 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url = uri("KOTLIN_REPO") } 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 a85b76bfa41..33ca73c451c 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url '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 175b88c79f9..26e0c1b4359 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url = uri("KOTLIN_REPO") } 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 f86a7344300..f75796befef 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url '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 175b88c79f9..26e0c1b4359 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url = uri("KOTLIN_REPO") } 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 f86a7344300..f75796befef 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url '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 175b88c79f9..26e0c1b4359 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url = uri("KOTLIN_REPO") } 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 f86a7344300..f75796befef 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url '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 175b88c79f9..26e0c1b4359 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url = uri("KOTLIN_REPO") } 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 1fe02444cd5..176bd82bf58 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url '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 db9f58f74ec..c5ab0a29d40 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url = uri("KOTLIN_REPO") } 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 d126be8b472..71a0b0b02b1 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url '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 b1783242df8..dbd105227b9 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url = uri("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 c7424003e91..0059cba0395 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 @@ -6,8 +6,8 @@ group = 'me.user' version = '1.0-SNAPSHOT' repositories { - mavenCentral() jcenter() + mavenCentral() maven { url 'KOTLIN_REPO' } 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 9543ae13c3a..dfc21799c7e 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 @@ -6,8 +6,8 @@ group = "me.user" version = "1.0-SNAPSHOT" repositories { - mavenCentral() jcenter() + mavenCentral() maven { url = uri("KOTLIN_REPO") } 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 20cc81c2397..14a60b5ee34 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url '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 7864fbb35f2..dbe6f6aeec6 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url = uri("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 263d720a085..c28513315e4 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 @@ -9,19 +9,19 @@ group = 'me.user' version = '1.0-SNAPSHOT' repositories { - mavenCentral() jcenter() - maven { - url 'https://dl.bintray.com/kotlin/ktor' - } + 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/kotlin-js-wrappers' + url 'https://dl.bintray.com/kotlin/ktor' } } 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 b74e15fe9ac..bfcf9e03aad 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 @@ -9,19 +9,19 @@ group = "me.user" version = "1.0-SNAPSHOT" repositories { - mavenCentral() jcenter() - maven { - url = uri("https://dl.bintray.com/kotlin/ktor") - } + 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/kotlin-js-wrappers") + url = uri("https://dl.bintray.com/kotlin/ktor") } } 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 04766bcd2f2..24860ebd4b4 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url '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 c204004aff0..7e6c617fccc 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url = uri("KOTLIN_REPO") } 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 dc40b660d6c..1bff09f8a99 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url '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 525ba9fbcd3..10a73bd288d 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url = uri("KOTLIN_REPO") } 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 b0bf1ed59b5..53a951843fd 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url '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 c53a1e2c243..5fb22937acf 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url = uri("KOTLIN_REPO") } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle index 4be715b2c75..6c85a99f4a3 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle @@ -7,16 +7,6 @@ plugins { group = 'me.user' version = '1.0-SNAPSHOT' -repositories { - gradlePluginPortal() - google() - jcenter() - mavenCentral() - maven { - url 'KOTLIN_REPO' - } -} - dependencies { implementation project(':shared') implementation 'com.google.android.material:material:1.2.0' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts index e15671b0f80..4261a5949c0 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts @@ -7,16 +7,6 @@ plugins { group = "me.user" version = "1.0-SNAPSHOT" -repositories { - gradlePluginPortal() - google() - jcenter() - mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } -} - dependencies { implementation(project(":shared")) implementation("com.google.android.material:material:1.2.0") 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 220c11f9896..fe42ff448c3 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 @@ -16,9 +16,14 @@ buildscript { group = 'me.user' version = '1.0-SNAPSHOT' -repositories { - mavenCentral() - maven { - url 'KOTLIN_REPO' + + +allprojects { + repositories { + google() + mavenCentral() + maven { + url '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 b032fd21c7b..7e048f0577e 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 @@ -16,9 +16,14 @@ buildscript { group = "me.user" version = "1.0-SNAPSHOT" -repositories { - mavenCentral() - maven { - url = uri("KOTLIN_REPO") + + +allprojects { + repositories { + google() + mavenCentral() + maven { + url = uri("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 95f8b4fa050..2255cb0a852 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 @@ -1,9 +1,9 @@ pluginManagement { repositories { - mavenCentral() - gradlePluginPortal() google() jcenter() + gradlePluginPortal() + mavenCentral() maven { url '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 d7a4062d2e6..81dc227d417 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 @@ -1,9 +1,9 @@ pluginManagement { repositories { - mavenCentral() - gradlePluginPortal() google() jcenter() + gradlePluginPortal() + mavenCentral() maven { url = uri("KOTLIN_REPO") } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle index cbaa4950a9e..35348d20d8b 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle @@ -9,16 +9,6 @@ plugins { group = 'me.user' version = '1.0-SNAPSHOT' -repositories { - gradlePluginPortal() - google() - jcenter() - mavenCentral() - maven { - url 'KOTLIN_REPO' - } -} - kotlin { android() ios { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts index e649249a4f4..898520c7891 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts @@ -9,16 +9,6 @@ plugins { group = "me.user" version = "1.0-SNAPSHOT" -repositories { - gradlePluginPortal() - google() - jcenter() - mavenCentral() - maven { - url = uri("KOTLIN_REPO") - } -} - kotlin { android() ios { 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 54ca8b883c4..2b22e23be44 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 @@ -8,9 +8,7 @@ group = 'me.user' version = '1.0-SNAPSHOT' repositories { - gradlePluginPortal() google() - jcenter() mavenCentral() maven { url 'KOTLIN_REPO' 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 84524f6e92a..2b7a1e8f4c6 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 @@ -8,9 +8,7 @@ group = "me.user" version = "1.0-SNAPSHOT" repositories { - gradlePluginPortal() google() - jcenter() mavenCentral() maven { url = uri("KOTLIN_REPO") 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 9a9255fb3c0..b262b139b62 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 @@ -1,9 +1,9 @@ pluginManagement { repositories { - mavenCentral() - gradlePluginPortal() google() jcenter() + gradlePluginPortal() + mavenCentral() maven { url '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 de596824f70..aca8c4872d0 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 @@ -1,9 +1,9 @@ pluginManagement { repositories { - mavenCentral() - gradlePluginPortal() google() jcenter() + gradlePluginPortal() + mavenCentral() maven { url = uri("KOTLIN_REPO") } 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 3666fb85eec..2fe8eaaa916 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url '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 f2814c1ed91..13465a6f644 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 @@ -1,7 +1,7 @@ pluginManagement { repositories { - mavenCentral() gradlePluginPortal() + mavenCentral() maven { url = uri("KOTLIN_REPO") } diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/BuildFileIR.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/BuildFileIR.kt index 54d22ebd9cc..de06b7dd800 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/BuildFileIR.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/BuildFileIR.kt @@ -23,7 +23,8 @@ data class BuildFileIR( val modules: ModulesStructureIR, val fromModules: List, val pom: PomIR, - override val irs: PersistentList + val isRoot: Boolean, + override val irs: PersistentList, ) : FileIR { override fun withReplacedIrs(irs: PersistentList): BuildFileIR = copy(irs = irs) @@ -57,9 +58,10 @@ data class BuildFileIR( } sectionCall("plugins", irsOfType()); nl(lineBreaks = 2) pom.render(this); nl() - - sectionCall("repositories", distinctRepositories()) - nl(lineBreaks = 2) + distinctRepositories().takeIf { it.isNotEmpty() }?.let { repositories -> + sectionCall("repositories", repositories) + nl(lineBreaks = 2) + } modules.render(this) irsOfTypeOrNull()?.let { freeIrs -> nl(2) 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 11fb8ec2ab1..dd7367af25c 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 @@ -1,5 +1,6 @@ package org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem +import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.GradleIR import org.jetbrains.kotlin.tools.projectWizard.plugins.printer.BuildFilePrinter import org.jetbrains.kotlin.tools.projectWizard.plugins.printer.GradlePrinter import org.jetbrains.kotlin.tools.projectWizard.plugins.printer.MavenPrinter @@ -13,6 +14,7 @@ interface RepositoryWrapper { fun List.distinctAndSorted() = distinctBy(RepositoryWrapper::repository) + .sortedBy { it.repository.url } .sortedBy { wrapper -> if (wrapper.repository is DefaultRepository) 0 else 1 } @@ -46,3 +48,14 @@ data class RepositoryIR(override val repository: Repository) : BuildSystemIR, Re else -> Unit } } + + +data class AllProjectsRepositoriesIR(val repositoriesIR: List) : BuildSystemIR, GradleIR, FreeIR { + override fun GradlePrinter.renderGradle() { + sectionCall("allprojects", needIndent = true) { + sectionCall("repositories") { + repositoriesIR.listNl() + } + } + } +} \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt index b59de11a3e7..ba99eae4e4a 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt @@ -70,7 +70,6 @@ interface AndroidModuleConfigurator : ModuleConfigurator, +GradleOnlyPluginByNameIR(reader.createAndroidPlugin(module).pluginName, priority = 1) +GradleOnlyPluginByNameIR("kotlin-android-extensions", priority = 3) - +createRepositories(configurationData.kotlinVersion).map(::RepositoryIR) } fun Reader.createAndroidPlugin(module: Module): AndroidGradlePlugin diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/buildSystem/gradle/GradlePlugin.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/buildSystem/gradle/GradlePlugin.kt index 34a828e8ccd..132a71ff3a7 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/buildSystem/gradle/GradlePlugin.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/buildSystem/gradle/GradlePlugin.kt @@ -1,17 +1,15 @@ package org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.gradle +import kotlinx.collections.immutable.toPersistentList import org.jetbrains.kotlin.tools.projectWizard.Versions import org.jetbrains.kotlin.tools.projectWizard.core.* import org.jetbrains.kotlin.tools.projectWizard.core.entity.PipelineTask import org.jetbrains.kotlin.tools.projectWizard.core.entity.properties.Property import org.jetbrains.kotlin.tools.projectWizard.core.entity.settings.PluginSetting import org.jetbrains.kotlin.tools.projectWizard.core.service.FileSystemWizardService -import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.BuildSystemIR -import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.PluginManagementRepositoryIR -import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.RepositoryIR +import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.* import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.SettingsGradleFileIR -import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.render import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase import org.jetbrains.kotlin.tools.projectWizard.plugins.StructurePlugin import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.* @@ -21,6 +19,9 @@ import org.jetbrains.kotlin.tools.projectWizard.plugins.printer.printBuildFile import org.jetbrains.kotlin.tools.projectWizard.plugins.projectPath import org.jetbrains.kotlin.tools.projectWizard.plugins.templates.TemplatesPlugin import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.DefaultRepository +import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Repository +import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.updateBuildFiles +import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.updateModules import org.jetbrains.kotlin.tools.projectWizard.templates.FileTemplate import org.jetbrains.kotlin.tools.projectWizard.templates.FileTemplateDescriptor @@ -103,6 +104,44 @@ abstract class GradlePlugin(context: Context) : BuildSystemPlugin(context) { } } + val mergeCommonRepositories by pipelineTask(GenerationPhase.PROJECT_GENERATION) { + runBefore(createModules) + runAfter(takeRepositoriesFromDependencies) + runAfter(KotlinPlugin.createPluginRepositories) + + isAvailable = isGradle + + withAction { + val buildFiles = buildFiles.propertyValue + if (buildFiles.size == 1) return@withAction UNIT_SUCCESS + val moduleRepositories = buildFiles.mapNotNull { buildFileIR -> + if (buildFileIR.isRoot) null + else buildFileIR.irs.mapNotNull { it.safeAs()?.repository } + } + + val allRepositories = moduleRepositories.flatMapTo(hashSetOf()) { it } + + val commonRepositories = allRepositories.filterTo( + hashSetOf(KotlinPlugin.version.propertyValue.repository) + ) { repo -> + moduleRepositories.all { repo in it } + } + + updateBuildFiles { buildFile -> + buildFile.withReplacedIrs( + buildFile.irs + .filterNot { it.safeAs()?.repository in commonRepositories } + .toPersistentList() + ).let { + if (it.isRoot && commonRepositories.isNotEmpty()) { + val repositories = commonRepositories.map(::RepositoryIR).distinctAndSorted() + it.withIrs(AllProjectsRepositoriesIR(repositories)) + } else it + }.asSuccess() + } + } + } + val createSettingsFileTask by pipelineTask(GenerationPhase.PROJECT_GENERATION) { runAfter(KotlinPlugin.createModules) @@ -143,6 +182,7 @@ abstract class GradlePlugin(context: Context) : BuildSystemPlugin(context) { createLocalPropertiesFile, initGradleWrapperTask, createSettingsFileTask, + mergeCommonRepositories, ) override val properties: List> = super.properties + listOf( diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/ModulesToIRsConverter.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/ModulesToIRsConverter.kt index 2cd533e4dce..ef578b903b8 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/ModulesToIRsConverter.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/ModulesToIRsConverter.kt @@ -109,6 +109,7 @@ class ModulesToIRsConverter( RootFileModuleStructureIR(persistentListOf()), emptyList(), pomIr, + isRoot = true, rootBuildFileIrs.toPersistentList() ) } @@ -189,6 +190,7 @@ class ModulesToIRsConverter( ), listOf(module), data.pomIr.copy(artifactId = module.name), + isRoot = false, /* TODO */ createBuildFileIRs(module, state) ).also { moduleToBuildFile[module] = it @@ -230,6 +232,7 @@ class ModulesToIRsConverter( ), module.subModules + module, pomIr, + isRoot = false, buildPersistenceList { +createBuildFileIRs(module, state) module.subModules.forEach { +createBuildFileIRs(it, state) }