From a88a19a1b9804f5e2b1b7c44916156c1c2c7009d Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Sat, 7 Mar 2020 23:06:39 +0300 Subject: [PATCH] Wizard: migrate tests to Kotlin 1.3.70 --- .../service/IdeaKotlinVersionProviderService.kt | 3 ++- .../KotlinVersionProviderTestWizardService.kt | 17 +++++++++++++++++ .../wizard/services/TestWizardServices.kt | 8 ++++++-- .../android/expected/android/build.gradle | 2 +- .../android/expected/android/build.gradle.kts | 2 +- .../jsNodeAndBrowserTargets/build.gradle | 2 +- .../jsNodeAndBrowserTargets/build.gradle.kts | 2 +- .../buildFileGeneration/jvmTarget/build.gradle | 2 +- .../jvmTarget/build.gradle.kts | 2 +- .../buildFileGeneration/kotlinJvm/build.gradle | 2 +- .../kotlinJvm/build.gradle.kts | 2 +- .../buildFileGeneration/kotlinJvm/pom.xml | 6 +++--- .../nativeForCurrentSystem/build.gradle | 2 +- .../nativeForCurrentSystem/build.gradle.kts | 4 ++-- .../simpleMultiplatform/build.gradle | 2 +- .../simpleMultiplatform/build.gradle.kts | 2 +- .../simpleNativeTarget/build.gradle | 2 +- .../simpleNativeTarget/build.gradle.kts | 2 +- .../singleplatformJs/expected/build.gradle | 2 +- .../singleplatformJs/expected/build.gradle.kts | 2 +- .../expected/app/build.gradle | 2 +- .../expected/app/build.gradle.kts | 2 +- .../emptyMultiplatform/build.gradle | 2 +- .../emptyMultiplatform/build.gradle.kts | 2 +- .../emptySingleplatform/build.gradle | 2 +- .../emptySingleplatform/build.gradle.kts | 2 +- .../emptySingleplatform/pom.xml | 6 +++--- .../jsBrowserApplication/build.gradle | 2 +- .../jsBrowserApplication/build.gradle.kts | 2 +- .../jvmConsoleApplication/build.gradle | 2 +- .../jvmConsoleApplication/build.gradle.kts | 2 +- .../jvmConsoleApplication/pom.xml | 6 +++--- .../jvmServerJsClient/build.gradle | 2 +- .../jvmServerJsClient/build.gradle.kts | 2 +- .../multiplatformLibrary/build.gradle | 2 +- .../multiplatformLibrary/build.gradle.kts | 2 +- .../nativeConsoleApplication/build.gradle | 2 +- .../nativeConsoleApplication/build.gradle.kts | 2 +- .../projectWizard/cli/TestWizardService.kt | 3 +-- .../kotlin/tools/projectWizard/Versions.kt | 2 ++ .../service/KotlinVersionProviderService.kt | 7 ++----- .../plugins/kotlin/KotlinPlugin.kt | 3 ++- 42 files changed, 74 insertions(+), 53 deletions(-) create mode 100644 idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/services/KotlinVersionProviderTestWizardService.kt diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaKotlinVersionProviderService.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaKotlinVersionProviderService.kt index a09d111f90e..ec3b112934e 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaKotlinVersionProviderService.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaKotlinVersionProviderService.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.tools.projectWizard.wizard.service import com.intellij.util.text.VersionComparatorUtil import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.idea.framework.ui.ConfigureDialogWithModulesAndVersion +import org.jetbrains.kotlin.tools.projectWizard.Versions import org.jetbrains.kotlin.tools.projectWizard.core.TaskResult import org.jetbrains.kotlin.tools.projectWizard.core.asNullable import org.jetbrains.kotlin.tools.projectWizard.core.compute @@ -25,7 +26,7 @@ class IdeaKotlinVersionProviderService : KotlinVersionProviderService, IdeaWizar override fun getKotlinVersion(): Version = getKotlinVersionFromCompiler() ?: VersionsDownloader.downloadLatestEapOrStableKotlinVersion() - ?: KotlinVersionProviderServiceImpl.DEFAULT + ?: Versions.KOTLIN private fun getKotlinVersionFromCompiler() = KotlinCompilerVersion.getVersion() diff --git a/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/services/KotlinVersionProviderTestWizardService.kt b/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/services/KotlinVersionProviderTestWizardService.kt new file mode 100644 index 00000000000..3efc37d95bc --- /dev/null +++ b/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/services/KotlinVersionProviderTestWizardService.kt @@ -0,0 +1,17 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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 + +import org.jetbrains.kotlin.tools.projectWizard.Versions +import org.jetbrains.kotlin.tools.projectWizard.cli.TestWizardService +import org.jetbrains.kotlin.tools.projectWizard.core.service.FileFormattingService +import org.jetbrains.kotlin.tools.projectWizard.core.service.KotlinVersionProviderService +import org.jetbrains.kotlin.tools.projectWizard.core.service.KotlinVersionProviderServiceImpl +import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version + +class KotlinVersionProviderTestWizardService : KotlinVersionProviderService, TestWizardService { + override fun getKotlinVersion(): Version = Versions.KOTLIN +} \ No newline at end of file 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 16e557b8b54..01eb38b2b2d 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 @@ -9,8 +9,12 @@ import com.intellij.openapi.project.Project import org.jetbrains.kotlin.tools.projectWizard.cli.TestWizardService object TestWizardServices { - fun createProjectDependent(project: Project): List = listOf( + fun createProjectDependent(project: Project): List = listOf( GradleProjectImportingTestWizardService(project) ) - val PROJECT_INDEPENDENT = listOf(FormattingTestWizardService()) + + val PROJECT_INDEPENDENT = listOf( + FormattingTestWizardService(), + KotlinVersionProviderTestWizardService() + ) } \ No newline at end of file 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 0a169c6cf8b..d7041fc26f3 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.61' + id 'org.jetbrains.kotlin.android' version '1.3.70' id 'kotlin-android-extensions' } group = 'testGroupId' 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 05c3322eb91..b9ec2f18591 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.61" + kotlin("android") version "1.3.70" id("kotlin-android-extensions") } group = "testGroupId" 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 781e4528deb..af742f0e7aa 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,5 +1,5 @@ plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.61' + id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' } group = 'testGroupId' version = '1.0-SNAPSHOT' 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 6037d8dfb04..4a3477a9910 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,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.3.61" + kotlin("multiplatform") version "1.3.70" } group = "testGroupId" version = "1.0-SNAPSHOT" 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 bb4f59df44b..be2b241c62d 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,5 +1,5 @@ plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.61' + id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' } group = 'testGroupId' version = '1.0-SNAPSHOT' 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 c7aaa368f85..90ff42f3c75 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,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.3.61" + kotlin("multiplatform") version "1.3.70" } group = "testGroupId" version = "1.0-SNAPSHOT" 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 0bb3f46648f..0207834cca0 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,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id 'org.jetbrains.kotlin.jvm' version '1.3.61' + id 'org.jetbrains.kotlin.jvm' version '1.3.70' } group = 'testGroupId' version = '1.0-SNAPSHOT' 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 a39ab50a237..dfd59f74260 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,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.3.61" + kotlin("jvm") version "1.3.70" } group = "testGroupId" version = "1.0-SNAPSHOT" 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 b11117b0a48..028af047a1c 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.61 + 1.3.70 compile @@ -55,13 +55,13 @@ org.jetbrains.kotlin kotlin-test-junit - 1.3.61 + 1.3.70 test org.jetbrains.kotlin kotlin-stdlib-jdk8 - 1.3.61 + 1.3.70 \ 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 07f325d1cb5..8d6c4f94e60 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,7 +1,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.61' + id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' } group = 'testGroupId' version = '1.0-SNAPSHOT' 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 769fd58dc14..328f4641bfd 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,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.3.61" + kotlin("multiplatform") version "1.3.70" } group = "testGroupId" version = "1.0-SNAPSHOT" @@ -17,7 +17,7 @@ kotlin { else -> throw GradleException("Host OS is not supported in Kotlin/Native.") } - + sourceSets { val myNativeMain by getting val myNativeTest by getting 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 1dbc8e61846..eff0bac97d8 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,5 +1,5 @@ plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.61' + id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' } group = 'testGroupId' version = '1.0-SNAPSHOT' 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 dacf1be351e..e7299d7ff77 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,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.3.61" + kotlin("multiplatform") version "1.3.70" } group = "testGroupId" version = "1.0-SNAPSHOT" 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 e5a5e25ba51..6fd1cd4b7fd 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,5 +1,5 @@ plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.61' + id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' } group = 'testGroupId' version = '1.0-SNAPSHOT' 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 42c805fec92..2d48b592c30 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,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.3.61" + kotlin("multiplatform") version "1.3.70" } group = "testGroupId" version = "1.0-SNAPSHOT" 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 6cedc3e0d7e..dd070d33708 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,5 +1,5 @@ plugins { - id 'org.jetbrains.kotlin.js' version '1.3.61' + id 'org.jetbrains.kotlin.js' version '1.3.70' } group = 'testGroupId' version = '1.0-SNAPSHOT' 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 421a09531b2..75f1f9af610 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,5 +1,5 @@ plugins { - kotlin("js") version "1.3.61" + kotlin("js") version "1.3.70" } group = "testGroupId" version = "1.0-SNAPSHOT" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/app/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/app/build.gradle index 8b802ad4e5d..10202efd7ef 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/app/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/app/build.gradle @@ -1,6 +1,6 @@ plugins { id 'com.android.application' - id 'org.jetbrains.kotlin.android' version '1.3.61' + id 'org.jetbrains.kotlin.android' version '1.3.70' id 'kotlin-android-extensions' } group = 'me.user' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/app/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/app/build.gradle.kts index 66aa8b504cd..0bae9be20ff 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/app/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/app/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("com.android.application") - kotlin("android") version "1.3.61" + kotlin("android") version "1.3.70" id("kotlin-android-extensions") } group = "me.user" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/build.gradle index 9f0892ff612..8deca81ef0f 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.61' + id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' } group = 'me.user' version = '1.0-SNAPSHOT' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/build.gradle.kts index 8918c7b3238..0535f5111ad 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.3.61" + kotlin("multiplatform") version "1.3.70" } group = "me.user" version = "1.0-SNAPSHOT" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/build.gradle index f3d448b91ba..ca314fb3f0e 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/build.gradle @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id 'org.jetbrains.kotlin.jvm' version '1.3.61' + id 'org.jetbrains.kotlin.jvm' version '1.3.70' } group = 'me.user' version = '1.0-SNAPSHOT' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/build.gradle.kts index 5f54d6599ec..5f506240487 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.3.61" + kotlin("jvm") version "1.3.70" } group = "me.user" version = "1.0-SNAPSHOT" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/pom.xml index 5989d8b5db9..46608fed198 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/pom.xml @@ -31,7 +31,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - 1.3.61 + 1.3.70 compile @@ -55,13 +55,13 @@ org.jetbrains.kotlin kotlin-test-junit - 1.3.61 + 1.3.70 test org.jetbrains.kotlin kotlin-stdlib-jdk8 - 1.3.61 + 1.3.70 \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/build.gradle index 7b0c85260a5..99903dfd68e 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.jetbrains.kotlin.js' version '1.3.61' + id 'org.jetbrains.kotlin.js' version '1.3.70' } group = 'me.user' version = '1.0-SNAPSHOT' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/build.gradle.kts index f203800d41f..633a8deed0b 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("js") version "1.3.61" + kotlin("js") version "1.3.70" } group = "me.user" version = "1.0-SNAPSHOT" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/build.gradle index b57e9762dc5..18612e8d9f4 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/build.gradle @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id 'org.jetbrains.kotlin.jvm' version '1.3.61' + id 'org.jetbrains.kotlin.jvm' version '1.3.70' id 'application' } group = 'me.user' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/build.gradle.kts index a1c20e5d059..27de9ecc626 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.3.61" + kotlin("jvm") version "1.3.70" application } group = "me.user" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/pom.xml index 3f54b38c9ee..caf613e6aca 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/pom.xml +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/pom.xml @@ -31,7 +31,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - 1.3.61 + 1.3.70 compile @@ -63,13 +63,13 @@ org.jetbrains.kotlin kotlin-test-junit - 1.3.61 + 1.3.70 test org.jetbrains.kotlin kotlin-stdlib-jdk8 - 1.3.61 + 1.3.70 \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/build.gradle index d144478a76a..ddb65e48d3a 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/build.gradle @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.61' + id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' id 'application' } group = 'me.user' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/build.gradle.kts index 25c173ea5bc..c1f6dfc2f9a 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack plugins { - kotlin("multiplatform") version "1.3.61" + kotlin("multiplatform") version "1.3.70" application } group = "me.user" 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 e78482cd098..c1d8fdfd48a 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,7 +1,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.61' + id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' } group = 'me.user' version = '1.0-SNAPSHOT' 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 111569f9cf9..bb350c35bdf 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,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.3.61" + kotlin("multiplatform") version "1.3.70" } group = "me.user" version = "1.0-SNAPSHOT" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/build.gradle index bc579149114..b1232ddeeb3 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/build.gradle @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.61' + id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' } group = 'me.user' version = '1.0-SNAPSHOT' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/build.gradle.kts index fe0663df000..a13473142e7 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.3.61" + kotlin("multiplatform") version "1.3.70" } group = "me.user" version = "1.0-SNAPSHOT" 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 13f5b74679f..a9913d989c9 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 @@ -7,5 +7,4 @@ package org.jetbrains.kotlin.tools.projectWizard.cli import org.jetbrains.kotlin.tools.projectWizard.core.service.WizardService -interface TestWizardService : WizardService { -} \ No newline at end of file +interface TestWizardService : WizardService \ No newline at end of file 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 bbc58024c1f..ef320c6ae2b 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,6 +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") + object GradlePlugins { val ANDROID = version("3.5.2") } diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/service/KotlinVersionProviderService.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/service/KotlinVersionProviderService.kt index 72da6083a23..fe0cf394a6c 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/service/KotlinVersionProviderService.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/service/KotlinVersionProviderService.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.tools.projectWizard.core.service +import org.jetbrains.kotlin.tools.projectWizard.Versions import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Repositories import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Repository import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version @@ -14,11 +15,7 @@ interface KotlinVersionProviderService : WizardService { } class KotlinVersionProviderServiceImpl : KotlinVersionProviderService, IdeaIndependentWizardService { - override fun getKotlinVersion(): Version = DEFAULT - - companion object { - val DEFAULT = Version.fromString("1.3.61") - } + override fun getKotlinVersion(): Version = Versions.KOTLIN } diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/KotlinPlugin.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/KotlinPlugin.kt index 1be2bd2c65e..8cfc08f8bf3 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/KotlinPlugin.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/KotlinPlugin.kt @@ -1,5 +1,6 @@ package org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin +import org.jetbrains.kotlin.tools.projectWizard.Versions import org.jetbrains.kotlin.tools.projectWizard.core.context.WritingContext import org.jetbrains.kotlin.tools.projectWizard.core.* import org.jetbrains.kotlin.tools.projectWizard.core.context.ReadingContext @@ -21,7 +22,7 @@ import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version import java.nio.file.Path class KotlinPlugin(context: Context) : Plugin(context) { - val version by property(KotlinVersionProviderServiceImpl.DEFAULT) + val version by property(Versions.KOTLIN) val initKotlinVersions by pipelineTask(GenerationPhase.PREPARE_GENERATION) { title = "Downloading list of Kotlin versions"