[Gradle, K/N] Move compiler version change to separate test

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") {
+    @Test
-                assertSuccessful()
+    fun testCompilerVersionChange() = with(transformNativeTestProjectWithPluginDsl("native-compiler-version")) {
-                assertTasksExecuted(hostLibraryTasks)
+        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)
         }
     }
 

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

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"

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

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-endorsed/src/commonNative/kotlin/main.kt

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