Wizard: migrate tests to Kotlin 1.3.70

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()

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
+}

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<TestWizardService>  = listOf(
+    fun createProjectDependent(project: Project): List<TestWizardService> = listOf(
         GradleProjectImportingTestWizardService(project)
     )
-    val PROJECT_INDEPENDENT = listOf(FormattingTestWizardService())
+
+    val PROJECT_INDEPENDENT = listOf(
+        FormattingTestWizardService(),
+        KotlinVersionProviderTestWizardService()
+    )
 }

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'

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"

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'

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"

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'

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"

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'

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"

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/pom.xml

@@ -31,7 +31,7 @@
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
-                <version>1.3.61</version>
+                <version>1.3.70</version>
                 <executions>
                     <execution>
                         <id>compile</id>
@@ -55,13 +55,13 @@
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-test-junit</artifactId>
-            <version>1.3.61</version>
+            <version>1.3.70</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib-jdk8</artifactId>
-            <version>1.3.61</version>
+            <version>1.3.70</version>
         </dependency>
     </dependencies>
 </project>

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'

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

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'

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"

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'

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"

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'

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"

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'

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"

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'

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"

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'

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"

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/pom.xml

@@ -31,7 +31,7 @@
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
-                <version>1.3.61</version>
+                <version>1.3.70</version>
                 <executions>
                     <execution>
                         <id>compile</id>
@@ -55,13 +55,13 @@
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-test-junit</artifactId>
-            <version>1.3.61</version>
+            <version>1.3.70</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib-jdk8</artifactId>
-            <version>1.3.61</version>
+            <version>1.3.70</version>
         </dependency>
     </dependencies>
 </project>

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'

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"

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'

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"

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/pom.xml

@@ -31,7 +31,7 @@
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
-                <version>1.3.61</version>
+                <version>1.3.70</version>
                 <executions>
                     <execution>
                         <id>compile</id>
@@ -63,13 +63,13 @@
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-test-junit</artifactId>
-            <version>1.3.61</version>
+            <version>1.3.70</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib-jdk8</artifactId>
-            <version>1.3.61</version>
+            <version>1.3.70</version>
         </dependency>
     </dependencies>
 </project>

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'

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"

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'

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"

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'

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"

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 {
+interface TestWizardService : WizardService
-}

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")
     }

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
+    override fun getKotlinVersion(): Version = Versions.KOTLIN
-
-    companion object {
-        val DEFAULT = Version.fromString("1.3.61")
-    }
 }
 
 

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"