diff --git a/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/services/TestWizardServices.kt b/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/services/TestWizardServices.kt index 01eb38b2b2d..ebf0b3ff030 100644 --- a/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/services/TestWizardServices.kt +++ b/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/services/TestWizardServices.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.tools.projectWizard.wizard.services import com.intellij.openapi.project.Project +import org.jetbrains.kotlin.tools.projectWizard.cli.KotlinVersionProviderTestWizardService import org.jetbrains.kotlin.tools.projectWizard.cli.TestWizardService object TestWizardServices { 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 d7041fc26f3..838812c88e0 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 @@ -1,6 +1,6 @@ plugins { id 'com.android.application' - id 'org.jetbrains.kotlin.android' version '1.3.70' + id 'org.jetbrains.kotlin.android' version 'KOTLIN_VERSION' id 'kotlin-android-extensions' } group = 'testGroupId' @@ -11,6 +11,9 @@ repositories { google() jcenter() mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } dependencies { implementation 'androidx.core:core-ktx:1.1.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 b9ec2f18591..2c57f4d674a 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 @@ -1,6 +1,6 @@ plugins { id("com.android.application") - kotlin("android") version "1.3.70" + kotlin("android") version "KOTLIN_VERSION" id("kotlin-android-extensions") } group = "testGroupId" @@ -11,6 +11,9 @@ repositories { google() jcenter() mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } dependencies { implementation("androidx.core:core-ktx:1.1.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 dafeb336c4d..ce970238205 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,4 +3,7 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } \ 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 bba1c3579c5..1300eaf36a6 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,4 +3,7 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } \ 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 0da50d861fa..d2f538b6609 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,12 @@ pluginManagement { repositories { + mavenCentral() gradlePluginPortal() google() jcenter() - mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } resolutionStrategy { eachPlugin { 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 45d181d12c7..207aa9309b2 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,12 @@ pluginManagement { repositories { + mavenCentral() gradlePluginPortal() google() jcenter() - mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } resolutionStrategy { eachPlugin { 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 af742f0e7aa..bd95afe80c6 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 @@ -1,11 +1,14 @@ plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' + id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' } group = 'testGroupId' version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } kotlin { js('nodeJs') { 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 4a3477a9910..f2fa76929f5 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 @@ -1,11 +1,14 @@ plugins { - kotlin("multiplatform") version "1.3.70" + kotlin("multiplatform") version "KOTLIN_VERSION" } group = "testGroupId" version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } kotlin { js("nodeJs") { 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 c8f757733f2..1e012637a18 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } + } + +} rootProject.name = 'generatedProject' \ No newline at end of file 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 b9c39b1ab0d..12cf172684f 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } + } + +} rootProject.name = "generatedProject" \ No newline at end of file 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 be2b241c62d..a29574bc223 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 @@ -1,11 +1,14 @@ plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' + id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' } group = 'testGroupId' version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } kotlin { jvm { 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 90ff42f3c75..8c64f65dc73 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 @@ -1,11 +1,14 @@ plugins { - kotlin("multiplatform") version "1.3.70" + kotlin("multiplatform") version "KOTLIN_VERSION" } group = "testGroupId" version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } kotlin { jvm { 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 c8f757733f2..1e012637a18 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } + } + +} rootProject.name = 'generatedProject' \ No newline at end of file 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 b9c39b1ab0d..12cf172684f 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } + } + +} rootProject.name = "generatedProject" \ No newline at end of file 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 1b98f9df0c3..d6f4677ad3b 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 @@ -1,11 +1,14 @@ plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' + id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' } group = 'testGroupId' version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } kotlin { jvm { 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 91dc9330366..b70935d8e0a 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 @@ -1,11 +1,14 @@ plugins { - kotlin("multiplatform") version "1.3.70" + kotlin("multiplatform") version "KOTLIN_VERSION" } group = "testGroupId" version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } kotlin { jvm { 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 c8f757733f2..1e012637a18 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } + } + +} rootProject.name = 'generatedProject' \ No newline at end of file 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 b9c39b1ab0d..12cf172684f 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } + } + +} rootProject.name = "generatedProject" \ No newline at end of file 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 93d656ba4c1..4a3c78687b4 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 @@ -1,13 +1,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id 'org.jetbrains.kotlin.jvm' version '1.3.70' + id 'org.jetbrains.kotlin.jvm' version 'KOTLIN_VERSION' } group = 'testGroupId' version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } dependencies { implementation project(':b') 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 385ef311cd0..072e348b52b 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 @@ -1,13 +1,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.3.70" + kotlin("jvm") version "KOTLIN_VERSION" } group = "testGroupId" version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } dependencies { implementation(project(":b")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/pom.xml index 5eeca73624d..c42a9c43a6f 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/pom.xml @@ -22,8 +22,19 @@ mavenCentral https://repo1.maven.org/maven2/ + + bintray.kotlin.kotlin-dev + https://dl.bintray.com/kotlin/kotlin-dev + + + + bintray.kotlin.kotlin-dev + https://dl.bintray.com/kotlin/kotlin-dev + + + src/main/kotlin src/test/kotlin @@ -31,7 +42,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - 1.3.70 + KOTLIN_VERSION compile @@ -65,13 +76,13 @@ org.jetbrains.kotlin kotlin-test-junit - 1.3.70 + KOTLIN_VERSION test org.jetbrains.kotlin kotlin-stdlib-jdk8 - 1.3.70 + KOTLIN_VERSION \ No newline at end of file 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 77487eb2a40..6cd161bad29 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 @@ -1,13 +1,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id 'org.jetbrains.kotlin.jvm' version '1.3.70' + id 'org.jetbrains.kotlin.jvm' version 'KOTLIN_VERSION' } group = 'testGroupId' version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } dependencies { implementation project(':c') 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 06a6020b2dc..b8f96ad63cb 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 @@ -1,13 +1,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.3.70" + kotlin("jvm") version "KOTLIN_VERSION" } group = "testGroupId" version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } dependencies { implementation(project(":c")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/pom.xml index 97199d88b0a..806e8e7b87d 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/pom.xml @@ -22,8 +22,19 @@ mavenCentral https://repo1.maven.org/maven2/ + + bintray.kotlin.kotlin-dev + https://dl.bintray.com/kotlin/kotlin-dev + + + + bintray.kotlin.kotlin-dev + https://dl.bintray.com/kotlin/kotlin-dev + + + src/main/kotlin src/test/kotlin @@ -31,7 +42,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - 1.3.70 + KOTLIN_VERSION compile @@ -65,13 +76,13 @@ org.jetbrains.kotlin kotlin-test-junit - 1.3.70 + KOTLIN_VERSION test org.jetbrains.kotlin kotlin-stdlib-jdk8 - 1.3.70 + KOTLIN_VERSION \ No newline at end of file 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 dafeb336c4d..ce970238205 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 @@ -3,4 +3,7 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } \ 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 bba1c3579c5..1300eaf36a6 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 @@ -3,4 +3,7 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } \ 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 c2ed6dbd653..485e799760e 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 @@ -1,13 +1,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id 'org.jetbrains.kotlin.jvm' version '1.3.70' + id 'org.jetbrains.kotlin.jvm' version 'KOTLIN_VERSION' } group = 'testGroupId' version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } 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 60f35107652..7c4bccc9cb4 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 @@ -1,13 +1,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.3.70" + kotlin("jvm") version "KOTLIN_VERSION" } group = "testGroupId" version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } dependencies { testImplementation(kotlin("test-junit")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/pom.xml index 0db6968ad53..fc79d2705da 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/pom.xml @@ -22,8 +22,19 @@ mavenCentral https://repo1.maven.org/maven2/ + + bintray.kotlin.kotlin-dev + https://dl.bintray.com/kotlin/kotlin-dev + + + + bintray.kotlin.kotlin-dev + https://dl.bintray.com/kotlin/kotlin-dev + + + src/main/kotlin src/test/kotlin @@ -31,7 +42,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - 1.3.70 + KOTLIN_VERSION compile @@ -55,13 +66,13 @@ org.jetbrains.kotlin kotlin-test-junit - 1.3.70 + KOTLIN_VERSION test org.jetbrains.kotlin kotlin-stdlib-jdk8 - 1.3.70 + KOTLIN_VERSION \ No newline at end of file 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 5b0ca4a5346..74b80611d5d 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 @@ -1,13 +1,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id 'org.jetbrains.kotlin.jvm' version '1.3.70' + id 'org.jetbrains.kotlin.jvm' version 'KOTLIN_VERSION' } group = 'testGroupId' version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } dependencies { implementation project(':a') 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 f191f963633..5112ba04fcb 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 @@ -1,13 +1,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.3.70" + kotlin("jvm") version "KOTLIN_VERSION" } group = "testGroupId" version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } dependencies { implementation(project(":a")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/pom.xml index 8094ef7f599..bf555762061 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/pom.xml @@ -22,8 +22,19 @@ mavenCentral https://repo1.maven.org/maven2/ + + bintray.kotlin.kotlin-dev + https://dl.bintray.com/kotlin/kotlin-dev + + + + bintray.kotlin.kotlin-dev + https://dl.bintray.com/kotlin/kotlin-dev + + + src/main/kotlin src/test/kotlin @@ -31,7 +42,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - 1.3.70 + KOTLIN_VERSION compile @@ -60,13 +71,13 @@ org.jetbrains.kotlin kotlin-test-junit - 1.3.70 + KOTLIN_VERSION test org.jetbrains.kotlin kotlin-stdlib-jdk8 - 1.3.70 + KOTLIN_VERSION \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/pom.xml index 4c5644b0629..c04fce5f299 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/pom.xml @@ -21,7 +21,18 @@ mavenCentral https://repo1.maven.org/maven2/ + + bintray.kotlin.kotlin-dev + https://dl.bintray.com/kotlin/kotlin-dev + + + + + bintray.kotlin.kotlin-dev + https://dl.bintray.com/kotlin/kotlin-dev + + a b 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 fdd1dd6a2b0..77dae0f1f2b 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,9 +1,16 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } + } +} rootProject.name = 'generatedProject' include(':a') include(':b') include(':c') -include(':d') - +include(':d') \ No newline at end of file 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 db599418e37..f6bb6c34657 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,9 +1,16 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } + } +} rootProject.name = "generatedProject" include(":a") include(":b") include(":c") -include(":d") - +include(":d") \ No newline at end of file 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 2b957b85802..1061b219efd 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 @@ -8,6 +8,9 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } dependencies { rootProject 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 c7e1454c8aa..ffa0d6cf3b2 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 @@ -8,6 +8,9 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } dependencies { rootProject 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 5898594cd3d..18f687975f7 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 @@ -8,6 +8,9 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } dependencies { implementation project(':b') 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 a9df99c2655..8abc17c5133 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 @@ -8,6 +8,9 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } dependencies { implementation(project(":b")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/pom.xml index 33f48980c05..a529785f7f0 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/pom.xml @@ -22,8 +22,19 @@ mavenCentral https://repo1.maven.org/maven2/ + + bintray.kotlin.kotlin-dev + https://dl.bintray.com/kotlin/kotlin-dev + + + + bintray.kotlin.kotlin-dev + https://dl.bintray.com/kotlin/kotlin-dev + + + src/main/kotlin src/test/kotlin @@ -31,7 +42,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - 1.3.70 + KOTLIN_VERSION compile @@ -60,13 +71,13 @@ org.jetbrains.kotlin kotlin-test-junit - 1.3.70 + KOTLIN_VERSION test org.jetbrains.kotlin kotlin-stdlib-jdk8 - 1.3.70 + KOTLIN_VERSION \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/pom.xml index 73cac23ad20..e3928c674b7 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/pom.xml @@ -22,8 +22,19 @@ mavenCentral https://repo1.maven.org/maven2/ + + bintray.kotlin.kotlin-dev + https://dl.bintray.com/kotlin/kotlin-dev + + + + bintray.kotlin.kotlin-dev + https://dl.bintray.com/kotlin/kotlin-dev + + + src/main/kotlin src/test/kotlin @@ -31,7 +42,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - 1.3.70 + KOTLIN_VERSION compile @@ -60,13 +71,13 @@ org.jetbrains.kotlin kotlin-test-junit - 1.3.70 + KOTLIN_VERSION test org.jetbrains.kotlin kotlin-stdlib-jdk8 - 1.3.70 + KOTLIN_VERSION \ No newline at end of file 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 c2ed6dbd653..485e799760e 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 @@ -1,13 +1,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id 'org.jetbrains.kotlin.jvm' version '1.3.70' + id 'org.jetbrains.kotlin.jvm' version 'KOTLIN_VERSION' } group = 'testGroupId' version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } 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 60f35107652..7c4bccc9cb4 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 @@ -1,13 +1,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.3.70" + kotlin("jvm") version "KOTLIN_VERSION" } group = "testGroupId" version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } dependencies { testImplementation(kotlin("test-junit")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/pom.xml index ac7ca4d9f43..0df8c3eee88 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/pom.xml @@ -22,8 +22,19 @@ mavenCentral https://repo1.maven.org/maven2/ + + bintray.kotlin.kotlin-dev + https://dl.bintray.com/kotlin/kotlin-dev + + + + bintray.kotlin.kotlin-dev + https://dl.bintray.com/kotlin/kotlin-dev + + + src/main/kotlin src/test/kotlin @@ -31,7 +42,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - 1.3.70 + KOTLIN_VERSION compile @@ -55,13 +66,13 @@ org.jetbrains.kotlin kotlin-test-junit - 1.3.70 + KOTLIN_VERSION test org.jetbrains.kotlin kotlin-stdlib-jdk8 - 1.3.70 + KOTLIN_VERSION \ No newline at end of file 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 54d5e027a92..9aea69aa051 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,14 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } + } +} rootProject.name = 'generatedProject' include(':b:c') -include(':b') - +include(':b') \ No newline at end of file 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 7396c6bc77e..eb93e933b1c 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,14 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } + } +} rootProject.name = "generatedProject" include(":b:c") -include(":b") - +include(":b") \ No newline at end of file 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 0207834cca0..d0a3d6ad616 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 @@ -1,13 +1,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id 'org.jetbrains.kotlin.jvm' version '1.3.70' + id 'org.jetbrains.kotlin.jvm' version 'KOTLIN_VERSION' } group = 'testGroupId' version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' 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 dfd59f74260..9e108f45939 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 @@ -1,13 +1,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.3.70" + kotlin("jvm") version "KOTLIN_VERSION" } group = "testGroupId" version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } dependencies { testImplementation(kotlin("test-junit")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/pom.xml index 028af047a1c..372185f1dfd 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/pom.xml @@ -31,7 +31,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - 1.3.70 + KOTLIN_VERSION compile @@ -55,13 +55,13 @@ org.jetbrains.kotlin kotlin-test-junit - 1.3.70 + KOTLIN_VERSION test org.jetbrains.kotlin kotlin-stdlib-jdk8 - 1.3.70 + KOTLIN_VERSION \ No newline at end of file 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 c8f757733f2..1e012637a18 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } + } + +} rootProject.name = 'generatedProject' \ No newline at end of file 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 b9c39b1ab0d..12cf172684f 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } + } + +} rootProject.name = "generatedProject" \ No newline at end of file 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 8d6c4f94e60..b277cacd8d8 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 @@ -1,13 +1,16 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' + id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' } group = 'testGroupId' version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } kotlin { def hostOs = System.getProperty("os.name") 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 328f4641bfd..da17c3c120b 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 @@ -1,11 +1,14 @@ plugins { - kotlin("multiplatform") version "1.3.70" + kotlin("multiplatform") version "KOTLIN_VERSION" } group = "testGroupId" version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } kotlin { val hostOs = System.getProperty("os.name") 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 c8f757733f2..1e012637a18 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } + } + +} rootProject.name = 'generatedProject' \ No newline at end of file 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 b9c39b1ab0d..12cf172684f 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } + } + +} rootProject.name = "generatedProject" \ No newline at end of file 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 eff0bac97d8..43196b7ab15 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 @@ -1,11 +1,14 @@ plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' + id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' } group = 'testGroupId' version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } kotlin { jvm { 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 e7299d7ff77..a94bd88b938 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 @@ -1,11 +1,14 @@ plugins { - kotlin("multiplatform") version "1.3.70" + kotlin("multiplatform") version "KOTLIN_VERSION" } group = "testGroupId" version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } kotlin { jvm { 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 c8f757733f2..4dbe07ec7d9 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } + } + +} rootProject.name = 'generatedProject' \ No newline at end of file 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 b9c39b1ab0d..12cf172684f 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } + } + +} rootProject.name = "generatedProject" \ No newline at end of file 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 6fd1cd4b7fd..25e19fd96ca 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 @@ -1,11 +1,14 @@ plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' + id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' } group = 'testGroupId' version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } kotlin { linuxX64() 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 2d48b592c30..29c48fda8d6 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 @@ -1,11 +1,14 @@ plugins { - kotlin("multiplatform") version "1.3.70" + kotlin("multiplatform") version "KOTLIN_VERSION" } group = "testGroupId" version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } kotlin { linuxX64() 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 c8f757733f2..1e012637a18 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } + } + +} rootProject.name = 'generatedProject' \ No newline at end of file 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 b9c39b1ab0d..12cf172684f 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } + } + +} rootProject.name = "generatedProject" \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/build.gradle index dd070d33708..5de1e6ec62a 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/build.gradle @@ -1,11 +1,14 @@ plugins { - id 'org.jetbrains.kotlin.js' version '1.3.70' + id 'org.jetbrains.kotlin.js' version 'KOTLIN_VERSION' } group = 'testGroupId' version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-js' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/build.gradle.kts index 75f1f9af610..4e03dc3f541 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/build.gradle.kts @@ -1,11 +1,14 @@ plugins { - kotlin("js") version "1.3.70" + kotlin("js") version "KOTLIN_VERSION" } group = "testGroupId" version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } dependencies { testImplementation(kotlin("test-js")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/settings.gradle index c8f757733f2..1e012637a18 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/settings.gradle @@ -1 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } + } + +} rootProject.name = 'generatedProject' \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/settings.gradle.kts index b9c39b1ab0d..12cf172684f 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/settings.gradle.kts @@ -1 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } + } + +} rootProject.name = "generatedProject" \ No newline at end of file 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 ca314fb3f0e..35dbe30de50 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 @@ -1,13 +1,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id 'org.jetbrains.kotlin.jvm' version '1.3.70' + id 'org.jetbrains.kotlin.jvm' version 'KOTLIN_VERSION' } group = 'me.user' version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' 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 5f506240487..d7d5adfe77d 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 @@ -1,13 +1,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.3.70" + kotlin("jvm") version "KOTLIN_VERSION" } group = "me.user" version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } dependencies { testImplementation(kotlin("test-junit")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/pom.xml index 46608fed198..e280dac5135 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/pom.xml @@ -31,7 +31,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - 1.3.70 + KOTLIN_VERSION compile @@ -55,13 +55,13 @@ org.jetbrains.kotlin kotlin-test-junit - 1.3.70 + KOTLIN_VERSION test org.jetbrains.kotlin kotlin-stdlib-jdk8 - 1.3.70 + KOTLIN_VERSION \ No newline at end of file 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 96aa3bf410d..791bd49e765 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } + } + +} rootProject.name = 'BackendApplication' \ No newline at end of file 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 917496846d5..714afad5431 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } + } + +} rootProject.name = "BackendApplication" \ No newline at end of file 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 18612e8d9f4..0618177ae0a 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 @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id 'org.jetbrains.kotlin.jvm' version '1.3.70' + id 'org.jetbrains.kotlin.jvm' version 'KOTLIN_VERSION' id 'application' } group = 'me.user' @@ -9,6 +9,9 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' 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 27de9ecc626..a745162b3ac 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 @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.3.70" + kotlin("jvm") version "KOTLIN_VERSION" application } group = "me.user" @@ -9,6 +9,9 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } dependencies { testImplementation(kotlin("test-junit")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/pom.xml index caf613e6aca..89ecd927505 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/pom.xml @@ -31,7 +31,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - 1.3.70 + KOTLIN_VERSION compile @@ -63,13 +63,13 @@ org.jetbrains.kotlin kotlin-test-junit - 1.3.70 + KOTLIN_VERSION test org.jetbrains.kotlin kotlin-stdlib-jdk8 - 1.3.70 + KOTLIN_VERSION \ No newline at end of file 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 cd1904a2a86..a4149c0ca59 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } + } + +} rootProject.name = 'ConsoleApplication' \ No newline at end of file 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 30416383d23..777838ac49b 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } + } + +} rootProject.name = "ConsoleApplication" \ No newline at end of file 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 99903dfd68e..6ba9ac47f29 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 @@ -1,5 +1,5 @@ plugins { - id 'org.jetbrains.kotlin.js' version '1.3.70' + id 'org.jetbrains.kotlin.js' version 'KOTLIN_VERSION' } group = 'me.user' version = '1.0-SNAPSHOT' @@ -7,6 +7,9 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() jcenter() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } maven { url 'https://dl.bintray.com/kotlin/kotlin-js-wrappers' } 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 633a8deed0b..a299f1c7a9f 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 @@ -1,5 +1,5 @@ plugins { - kotlin("js") version "1.3.70" + kotlin("js") version "KOTLIN_VERSION" } group = "me.user" version = "1.0-SNAPSHOT" @@ -7,6 +7,9 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() jcenter() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } maven { url = uri("https://dl.bintray.com/kotlin/kotlin-js-wrappers") } 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 ceaddd4efbc..edcab32f86f 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } + } + +} rootProject.name = 'FrontendApplication' \ No newline at end of file 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 bb6dfe60569..9367e950ea4 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } + } + +} rootProject.name = "FrontendApplication" \ No newline at end of file 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 ddb65e48d3a..7dfe7c67208 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 @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' + id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' id 'application' } group = 'me.user' @@ -13,6 +13,9 @@ repositories { maven { url 'https://dl.bintray.com/kotlin/ktor' } + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } maven { url 'https://dl.bintray.com/kotlin/kotlin-js-wrappers' } 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 c1f6dfc2f9a..706210fa794 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 @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack plugins { - kotlin("multiplatform") version "1.3.70" + kotlin("multiplatform") version "KOTLIN_VERSION" application } group = "me.user" @@ -13,6 +13,9 @@ repositories { maven { url = uri("https://dl.bintray.com/kotlin/ktor") } + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } maven { url = uri("https://dl.bintray.com/kotlin/kotlin-js-wrappers") } 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 0aefdcede68..54db695b9d7 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } + } + +} rootProject.name = 'FullStackWebApplication' \ No newline at end of file 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 a54f67a8bea..cb69a36ddd3 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } + } + +} rootProject.name = "FullStackWebApplication" \ No newline at end of file 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 8deca81ef0f..558f9361b2e 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 @@ -1,11 +1,14 @@ plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' + id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' } group = 'me.user' version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } 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 0535f5111ad..a8412d9b617 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 @@ -1,14 +1,17 @@ plugins { - kotlin("multiplatform") version "1.3.70" + kotlin("multiplatform") version "KOTLIN_VERSION" } group = "me.user" version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } kotlin { - + sourceSets { val commonMain by getting { dependencies { 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 42b0fa88e9c..b279ef20a76 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } + } + +} rootProject.name = 'MultiplatformApplication' \ No newline at end of file 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 4dc9d554d96..39dab3114d7 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } + } + +} rootProject.name = "MultiplatformApplication" \ No newline at end of file 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 c1d8fdfd48a..c02450ca1db 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 @@ -1,13 +1,16 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' + id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' } group = 'me.user' version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } kotlin { jvm { 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 bb350c35bdf..588aedd407c 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 @@ -1,11 +1,14 @@ plugins { - kotlin("multiplatform") version "1.3.70" + kotlin("multiplatform") version "KOTLIN_VERSION" } group = "me.user" version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } kotlin { jvm { 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 cae69c13f94..7891ff1fa0b 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } + } + +} rootProject.name = 'MultiplatformLibrary' \ No newline at end of file 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 d8696eecd38..1409b541cda 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } + } + +} rootProject.name = "MultiplatformLibrary" \ No newline at end of file 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 ee12111f509..f7f0c84a94b 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 @@ -1,6 +1,6 @@ plugins { id 'com.android.application' - id 'org.jetbrains.kotlin.android' version '1.3.70' + id 'org.jetbrains.kotlin.android' version 'KOTLIN_VERSION' id 'kotlin-android-extensions' } group = 'me.user' @@ -11,6 +11,9 @@ repositories { google() jcenter() mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } dependencies { implementation project(':shared') 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 0b5d7929d6f..cb375affc15 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 @@ -1,6 +1,6 @@ plugins { id("com.android.application") - kotlin("android") version "1.3.70" + kotlin("android") version "KOTLIN_VERSION" id("kotlin-android-extensions") } group = "me.user" @@ -11,6 +11,9 @@ repositories { google() jcenter() mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } dependencies { implementation(project(":shared")) 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 f8f8ab86d18..7ae05bcc6c6 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 @@ -4,4 +4,7 @@ version = '1.0-SNAPSHOT' repositories { mavenCentral() -} + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } +} \ 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 19d87fa6ba3..80ed2f2f9b9 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 @@ -1,7 +1,9 @@ - group = "me.user" version = "1.0-SNAPSHOT" repositories { mavenCentral() -} + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } +} \ 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 5d9aff1fa79..d865c44a5c0 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,12 @@ pluginManagement { repositories { + mavenCentral() gradlePluginPortal() google() jcenter() - mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } resolutionStrategy { eachPlugin { 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 e97cad0b27e..8ec501b2117 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,12 @@ pluginManagement { repositories { + mavenCentral() gradlePluginPortal() google() jcenter() - mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } resolutionStrategy { eachPlugin { 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 eb5bd6179be..ad44543745b 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 @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' + id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' id 'com.android.library' id 'kotlin-android-extensions' } @@ -13,6 +13,9 @@ repositories { google() jcenter() mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } kotlin { android() 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 9ad1198c77a..5000e53a56f 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 @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget plugins { - kotlin("multiplatform") version "1.3.70" + kotlin("multiplatform") version "KOTLIN_VERSION" id("com.android.library") id("kotlin-android-extensions") } @@ -13,6 +13,9 @@ repositories { google() jcenter() mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } kotlin { android() 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 5c12f06db67..dd0afceb1e6 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 @@ -1,5 +1,5 @@ plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' + id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' id 'com.android.library' id 'kotlin-android-extensions' } @@ -11,6 +11,9 @@ repositories { google() jcenter() mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } kotlin { android() 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 a546b10d6f9..1fe6bb0bd4e 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 @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.3.70" + kotlin("multiplatform") version "KOTLIN_VERSION" id("com.android.library") id("kotlin-android-extensions") } @@ -11,6 +11,9 @@ repositories { google() jcenter() mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } kotlin { android() 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 8972d257daf..4d5ab198931 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,12 @@ pluginManagement { repositories { + mavenCentral() gradlePluginPortal() google() jcenter() - mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } resolutionStrategy { eachPlugin { 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 ff45fdbde97..41cae7e92ed 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,12 @@ pluginManagement { repositories { + mavenCentral() gradlePluginPortal() google() jcenter() - mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } resolutionStrategy { eachPlugin { @@ -13,5 +16,4 @@ pluginManagement { } } } -rootProject.name = "MultiplatformMobileLibrary" - +rootProject.name = "MultiplatformMobileLibrary" \ No newline at end of file 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 b1232ddeeb3..a86b11ae8be 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 @@ -1,13 +1,16 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' + id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION' } group = 'me.user' version = '1.0-SNAPSHOT' repositories { mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } } kotlin { def hostOs = System.getProperty("os.name") 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 a13473142e7..7032453d8c8 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 @@ -1,11 +1,14 @@ plugins { - kotlin("multiplatform") version "1.3.70" + kotlin("multiplatform") version "KOTLIN_VERSION" } group = "me.user" version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } } kotlin { val hostOs = System.getProperty("os.name") 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 a272e232532..1c22e6faedd 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } + } + +} rootProject.name = 'NativeApplication' \ No newline at end of file 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 896c89ad3ba..f959837d166 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 +1,10 @@ +pluginManagement { + repositories { + mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } + } + +} rootProject.name = "NativeApplication" \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractBuildFileGenerationTest.kt b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractBuildFileGenerationTest.kt index c6884624566..21bc9b7f8e4 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractBuildFileGenerationTest.kt +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractBuildFileGenerationTest.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.tools.projectWizard.cli import com.intellij.testFramework.UsefulTestCase +import org.jetbrains.kotlin.tools.projectWizard.Versions import org.jetbrains.kotlin.tools.projectWizard.core.div import org.jetbrains.kotlin.tools.projectWizard.core.service.Services import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase @@ -44,7 +45,13 @@ abstract class AbstractBuildFileGenerationTest : UsefulTestCase() { compareFilesAndGenerateMissing( expectedDirectory.allBuildFiles(buildSystem), expectedDirectory, tempDirectory.allBuildFiles(buildSystem), tempDirectory - ) + ) { path -> + val fileContent = path.readFile() + fileContent.replace( + KotlinVersionProviderTestWizardService.TEST_KOTLIN_VERSION.toString(), + KOTLIN_VERSION_PLACEHOLDER + ) + } } private fun Path.allBuildFiles(buildSystem: BuildSystem) = @@ -55,5 +62,6 @@ abstract class AbstractBuildFileGenerationTest : UsefulTestCase() { companion object { private const val EXPECTED_DIRECTORY_NAME = "expected" + private const val KOTLIN_VERSION_PLACEHOLDER = "KOTLIN_VERSION" } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractProjectTemplateBuildFileGenerationTest.kt b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractProjectTemplateBuildFileGenerationTest.kt index 9eff32bdb2e..8f11322c907 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractProjectTemplateBuildFileGenerationTest.kt +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractProjectTemplateBuildFileGenerationTest.kt @@ -11,6 +11,6 @@ import java.nio.file.Path abstract class AbstractProjectTemplateBuildFileGenerationTest : AbstractBuildFileGenerationTest() { override fun createWizard(directory: Path, buildSystem: BuildSystem, projectDirectory: Path): Wizard = - ProjectTemplateBasedTestWizard.createByDirectory(directory, buildSystem, projectDirectory, YamlWizard.CLI_SERVICES_MANAGER) + ProjectTemplateBasedTestWizard.createByDirectory(directory, buildSystem, projectDirectory, CLI_WIZARD_TEST_SERVICES_MANAGER) } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractYamlBuildFileGenerationTest.kt b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractYamlBuildFileGenerationTest.kt index 04195618392..2eb19690661 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractYamlBuildFileGenerationTest.kt +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractYamlBuildFileGenerationTest.kt @@ -13,6 +13,12 @@ import java.nio.file.Path abstract class AbstractYamlBuildFileGenerationTest : AbstractBuildFileGenerationTest() { override fun createWizard(directory: Path, buildSystem: BuildSystem, projectDirectory: Path): Wizard { val yaml = readSettingsYaml(directory, buildSystem) ?: error("settings.yaml should exists in $directory") - return YamlWizard(yaml, projectDirectory, Plugins.allPlugins, isUnitTestMode = true) + return YamlWizard( + yaml, + projectDirectory, + Plugins.allPlugins, + isUnitTestMode = true, + servicesManager = CLI_WIZARD_TEST_SERVICES_MANAGER + ) } } \ No newline at end of file diff --git a/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/services/KotlinVersionProviderTestWizardService.kt b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/KotlinVersionProviderTestWizardService.kt similarity index 65% rename from idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/services/KotlinVersionProviderTestWizardService.kt rename to libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/KotlinVersionProviderTestWizardService.kt index 2c2cf450a83..24c2d2552ec 100644 --- a/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/services/KotlinVersionProviderTestWizardService.kt +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/KotlinVersionProviderTestWizardService.kt @@ -3,13 +3,15 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.tools.projectWizard.wizard.services +package org.jetbrains.kotlin.tools.projectWizard.cli -import org.jetbrains.kotlin.tools.projectWizard.Versions -import org.jetbrains.kotlin.tools.projectWizard.cli.TestWizardService import org.jetbrains.kotlin.tools.projectWizard.core.service.KotlinVersionProviderService import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version class KotlinVersionProviderTestWizardService : KotlinVersionProviderService, TestWizardService { - override fun getKotlinVersion(): Version = Versions.KOTLIN + override fun getKotlinVersion(): Version = TEST_KOTLIN_VERSION + + companion object { + val TEST_KOTLIN_VERSION = Version("1.4.0-dev-5730") + } } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/TestWizardService.kt b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/TestWizardService.kt index a9913d989c9..7caed0bb2ca 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/TestWizardService.kt +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/TestWizardService.kt @@ -5,6 +5,22 @@ package org.jetbrains.kotlin.tools.projectWizard.cli +import org.jetbrains.kotlin.tools.projectWizard.core.service.Services +import org.jetbrains.kotlin.tools.projectWizard.core.service.ServicesManager import org.jetbrains.kotlin.tools.projectWizard.core.service.WizardService +import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull -interface TestWizardService : WizardService \ No newline at end of file +interface TestWizardService : WizardService { + companion object { + val SERVICES = listOf( + KotlinVersionProviderTestWizardService() + ) + } +} + +val CLI_WIZARD_TEST_SERVICES_MANAGER = ServicesManager( + Services.IDEA_INDEPENDENT_SERVICES + TestWizardService.SERVICES +) { services -> + services.firstIsInstanceOrNull() + ?: services.firstOrNull() +} diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/testUtils.kt b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/testUtils.kt index ebbc8b71d83..e1cd9913043 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/testUtils.kt +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/testUtils.kt @@ -28,7 +28,8 @@ internal fun Path.listFiles(filter: (Path) -> Boolean) = internal fun compareFilesAndGenerateMissing( expectedFiles: List, expectedDir: Path, - actualFiles: List, actualDir: Path + actualFiles: List, actualDir: Path, + readActualFile: (Path) -> String ) { val expectedFilesSorted = expectedFiles.sorted() val actualFilesSorted = actualFiles.sorted() @@ -46,7 +47,7 @@ internal fun compareFilesAndGenerateMissing( } for ((actualFile, expectedFile) in actualFilesSorted zip expectedFilesSorted) { - KotlinTestUtils.assertEqualsToFile(expectedFile.toFile(), actualFile.readFile()) + KotlinTestUtils.assertEqualsToFile(expectedFile.toFile(), readActualFile(actualFile)) } } diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt index e033be748c7..d02d83f6211 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt @@ -8,7 +8,8 @@ package org.jetbrains.kotlin.tools.projectWizard import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version object Versions { - val KOTLIN = version("1.3.70") + val KOTLIN = version("1.4-M1") //used in tests and as fallback version + val GRADLE = version("6.3") val KTOR = version("1.2.6")