From 7c2339bcad7a0aa73e8b1e9a1bb50484b25c9094 Mon Sep 17 00:00:00 2001
From: "Alexander.Likhachev" <Alexander.Likhachev@jetbrains.com>
Date: Tue, 13 Oct 2020 22:41:36 +0300
Subject: [PATCH] [Gradle, K/N] Move compiler version change to separate test

---
 .../kotlin/gradle/native/GeneralNativeIT.kt   | 25 ++++++++++++++++---
 .../native-compiler-version/build.gradle.kts  | 12 +++++++++
 .../native-compiler-version/settings.gradle   | 11 ++++++++
 .../src/hostMain/kotlin/main.kt               |  3 +++
 .../src/commonNative/kotlin/main.kt           | 12 ---------
 5 files changed, 47 insertions(+), 16 deletions(-)
 create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-compiler-version/build.gradle.kts
 create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-compiler-version/settings.gradle
 create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-compiler-version/src/hostMain/kotlin/main.kt
 delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-endorsed/src/commonNative/kotlin/main.kt

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt
index 181b6ebc25c..178823a869b 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt
@@ -686,11 +686,28 @@ class GeneralNativeIT : BaseGradleIT() {
                 assertSuccessful()
                 assertTasksUpToDate(hostLibraryTasks)
             }
+        }
+    }
 
-            build(*hostLibraryTasks.toTypedArray(), "-Porg.jetbrains.kotlin.native.version=1.3.70-dev-13258") {
-                assertSuccessful()
-                assertTasksExecuted(hostLibraryTasks)
-            }
+    @Test
+    fun testCompilerVersionChange() = with(transformNativeTestProjectWithPluginDsl("native-compiler-version")) {
+        val compileTasks = listOf(":compileKotlinHost")
+        val compileTasksArray = compileTasks.toTypedArray()
+
+        build(*compileTasksArray) {
+            assertSuccessful()
+            assertTasksExecuted(compileTasks)
+        }
+
+        build(*compileTasksArray) {
+            assertSuccessful()
+            assertTasksUpToDate(compileTasks)
+        }
+
+        // Check that changing K/N version lead to tasks rerun
+        build(*compileTasksArray, "-Porg.jetbrains.kotlin.native.version=1.4.20-dev-16314") {
+            assertSuccessful()
+            assertTasksExecuted(compileTasks)
         }
     }
 
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-compiler-version/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-compiler-version/build.gradle.kts
new file mode 100644
index 00000000000..4c9c2d998ee
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-compiler-version/build.gradle.kts
@@ -0,0 +1,12 @@
+plugins {
+    id("org.jetbrains.kotlin.multiplatform").version("<pluginMarkerVersion>")
+}
+
+repositories {
+    mavenLocal()
+    jcenter()
+}
+
+kotlin {
+    <SingleNativeTarget>("host")
+}
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-compiler-version/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-compiler-version/settings.gradle
new file mode 100644
index 00000000000..7943b8a7b90
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-compiler-version/settings.gradle
@@ -0,0 +1,11 @@
+pluginManagement {
+    repositories {
+        mavenLocal()
+        jcenter()
+        gradlePluginPortal()
+    }
+}
+
+enableFeaturePreview('GRADLE_METADATA')
+
+rootProject.name = "native-endorsed"
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-compiler-version/src/hostMain/kotlin/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-compiler-version/src/hostMain/kotlin/main.kt
new file mode 100644
index 00000000000..badc625beda
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-compiler-version/src/hostMain/kotlin/main.kt
@@ -0,0 +1,3 @@
+fun main(args: Array<String>) {
+    println("hi")
+}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-endorsed/src/commonNative/kotlin/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-endorsed/src/commonNative/kotlin/main.kt
deleted file mode 100644
index d332977d64a..00000000000
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-endorsed/src/commonNative/kotlin/main.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-import kotlinx.cli.*
-
-fun main(args: Array<String>) {
-    val argParser = ArgParser("test")
-    val mode by argParser.option(
-        ArgType.Choice(listOf("video", "audio", "both")), shortName = "m", description = "Play mode")
-        .default("both")
-    val size by argParser.option(ArgType.Int, shortName = "s", description = "Required size of videoplayer window")
-        .delimiter(",")
-    val fileName by argParser.argument(ArgType.String, description = "File to play")
-    argParser.parse(args)
-}