Fix tests: do not reference target from common

which isn't allowed anymore in K2. (cherry picked from commit 679ccaf)
google · Nov 15, 2023 · 4c8add1 · 4c8add1
1 parent bc5ec4f
commit 4c8add1
Show file tree

Hide file tree

Showing 27 changed files with 63 additions and 3 deletions.
diff --git a/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/GradleCompilationTest.kt b/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/GradleCompilationTest.kt
@@ -130,7 +130,7 @@ class GradleCompilationTest {
             .build()
         // add a file that needs access to the generated file
         testRule.appModule.addMultiplatformSource(
-            "commonMain", "Foo.kt",
+            "linuxX64Main", "Foo.kt",
             """
             class Foo {
                 val x = ToBeGenerated()

diff --git a/.../src/commonMain/kotlin/com/example/Bar.kt → .../src/androidNativeArm64Main/kotlin/Bar.kt b/.../src/commonMain/kotlin/com/example/Bar.kt → .../src/androidNativeArm64Main/kotlin/Bar.kt
diff --git a/.../src/commonMain/kotlin/com/example/Baz.kt → .../src/androidNativeArm64Main/kotlin/Baz.kt b/.../src/commonMain/kotlin/com/example/Baz.kt → .../src/androidNativeArm64Main/kotlin/Baz.kt
diff --git a/.../src/commonMain/kotlin/com/example/Bar.kt → ...ve/src/androidNativeX64Main/kotlin/Bar.kt b/.../src/commonMain/kotlin/com/example/Bar.kt → ...ve/src/androidNativeX64Main/kotlin/Bar.kt
diff --git a/.../src/commonMain/kotlin/com/example/Baz.kt → ...ve/src/androidNativeX64Main/kotlin/Baz.kt b/.../src/commonMain/kotlin/com/example/Baz.kt → ...ve/src/androidNativeX64Main/kotlin/Baz.kt
diff --git a/integration-tests/src/test/resources/kmp/workload-js/build.gradle.kts b/integration-tests/src/test/resources/kmp/workload-js/build.gradle.kts
@@ -11,7 +11,7 @@ kotlin {
         nodejs()
     }
     sourceSets {
-        val commonMain by getting {
+        val jsMain by getting {
             dependencies {
                 implementation(project(":annotations"))
             }

diff --git a/.../src/commonMain/kotlin/com/example/Bar.kt → ...d-js/src/jsMain/kotlin/com/example/Bar.kt b/.../src/commonMain/kotlin/com/example/Bar.kt → ...d-js/src/jsMain/kotlin/com/example/Bar.kt
diff --git a/.../src/commonMain/kotlin/com/example/Baz.kt → ...d-js/src/jsMain/kotlin/com/example/Baz.kt b/.../src/commonMain/kotlin/com/example/Baz.kt → ...d-js/src/jsMain/kotlin/com/example/Baz.kt
diff --git a/...nMain/kotlin/com/example/ToBeValidated.kt → ...sMain/kotlin/com/example/ToBeValidated.kt b/...nMain/kotlin/com/example/ToBeValidated.kt → ...sMain/kotlin/com/example/ToBeValidated.kt
diff --git a/integration-tests/src/test/resources/kmp/workload-jvm/build.gradle.kts b/integration-tests/src/test/resources/kmp/workload-jvm/build.gradle.kts
@@ -10,7 +10,7 @@ kotlin {
         withJava()
     }
     sourceSets {
-        val commonMain by getting {
+        val jvmMain by getting {
             dependencies {
                 implementation(project(":annotations"))
             }

diff --git a/.../src/commonMain/kotlin/com/example/Bar.kt → ...jvm/src/jvmMain/kotlin/com/example/Bar.kt b/.../src/commonMain/kotlin/com/example/Bar.kt → ...jvm/src/jvmMain/kotlin/com/example/Bar.kt
diff --git a/.../src/commonMain/kotlin/com/example/Baz.kt → ...jvm/src/jvmMain/kotlin/com/example/Baz.kt b/.../src/commonMain/kotlin/com/example/Baz.kt → ...jvm/src/jvmMain/kotlin/com/example/Baz.kt
diff --git a/...nMain/kotlin/com/example/ToBeValidated.kt → ...mMain/kotlin/com/example/ToBeValidated.kt b/...nMain/kotlin/com/example/ToBeValidated.kt → ...mMain/kotlin/com/example/ToBeValidated.kt
diff --git a/.../src/commonMain/kotlin/com/example/Bar.kt → ...d-linuxX64/src/linuxX64Main/kotlin/Bar.kt b/.../src/commonMain/kotlin/com/example/Bar.kt → ...d-linuxX64/src/linuxX64Main/kotlin/Bar.kt
diff --git a/.../src/commonMain/kotlin/com/example/Baz.kt → ...d-linuxX64/src/linuxX64Main/kotlin/Baz.kt b/.../src/commonMain/kotlin/com/example/Baz.kt → ...d-linuxX64/src/linuxX64Main/kotlin/Baz.kt
diff --git a/integration-tests/src/test/resources/kmp/workload/src/androidNativeArm64Main/kotlin/Bar.kt b/integration-tests/src/test/resources/kmp/workload/src/androidNativeArm64Main/kotlin/Bar.kt
@@ -0,0 +1,5 @@
+package com.example
+
+class Bar {
+    val baz = Foo().baz
+}
diff --git a/integration-tests/src/test/resources/kmp/workload/src/androidNativeArm64Main/kotlin/Baz.kt b/integration-tests/src/test/resources/kmp/workload/src/androidNativeArm64Main/kotlin/Baz.kt
@@ -0,0 +1,5 @@
+package com.example
+
+class Baz {
+    val bar = Foo().bar
+}
diff --git a/integration-tests/src/test/resources/kmp/workload/src/androidNativeX64Main/kotlin/Bar.kt b/integration-tests/src/test/resources/kmp/workload/src/androidNativeX64Main/kotlin/Bar.kt
@@ -0,0 +1,5 @@
+package com.example
+
+class Bar {
+    val baz = Foo().baz
+}
diff --git a/integration-tests/src/test/resources/kmp/workload/src/androidNativeX64Main/kotlin/Baz.kt b/integration-tests/src/test/resources/kmp/workload/src/androidNativeX64Main/kotlin/Baz.kt
@@ -0,0 +1,5 @@
+package com.example
+
+class Baz {
+    val bar = Foo().bar
+}
diff --git a/integration-tests/src/test/resources/kmp/workload/src/jsMain/kotlin/Bar.kt b/integration-tests/src/test/resources/kmp/workload/src/jsMain/kotlin/Bar.kt
@@ -0,0 +1,5 @@
+package com.example
+
+class Bar {
+    val baz = Foo().baz
+}
diff --git a/integration-tests/src/test/resources/kmp/workload/src/jsMain/kotlin/Baz.kt b/integration-tests/src/test/resources/kmp/workload/src/jsMain/kotlin/Baz.kt
@@ -0,0 +1,5 @@
+package com.example
+
+class Baz {
+    val bar = Foo().bar
+}
diff --git a/integration-tests/src/test/resources/kmp/workload/src/jvmMain/kotlin/Bar.kt b/integration-tests/src/test/resources/kmp/workload/src/jvmMain/kotlin/Bar.kt
@@ -0,0 +1,5 @@
+package com.example
+
+class Bar {
+    val baz = Foo().baz
+}
diff --git a/integration-tests/src/test/resources/kmp/workload/src/jvmMain/kotlin/Baz.kt b/integration-tests/src/test/resources/kmp/workload/src/jvmMain/kotlin/Baz.kt
@@ -0,0 +1,5 @@
+package com.example
+
+class Baz {
+    val bar = Foo().bar
+}
diff --git a/integration-tests/src/test/resources/kmp/workload/src/linuxX64Main/kotlin/Bar.kt b/integration-tests/src/test/resources/kmp/workload/src/linuxX64Main/kotlin/Bar.kt
@@ -0,0 +1,5 @@
+package com.example
+
+class Bar {
+    val baz = Foo().baz
+}
diff --git a/integration-tests/src/test/resources/kmp/workload/src/linuxX64Main/kotlin/Baz.kt b/integration-tests/src/test/resources/kmp/workload/src/linuxX64Main/kotlin/Baz.kt
@@ -0,0 +1,5 @@
+package com.example
+
+class Baz {
+    val bar = Foo().bar
+}
diff --git a/integration-tests/src/test/resources/kmp/workload/src/mingwX64Main/kotlin/Bar.kt b/integration-tests/src/test/resources/kmp/workload/src/mingwX64Main/kotlin/Bar.kt
@@ -0,0 +1,5 @@
+package com.example
+
+class Bar {
+    val baz = Foo().baz
+}
diff --git a/integration-tests/src/test/resources/kmp/workload/src/mingwX64Main/kotlin/Baz.kt b/integration-tests/src/test/resources/kmp/workload/src/mingwX64Main/kotlin/Baz.kt
@@ -0,0 +1,5 @@
+package com.example
+
+class Baz {
+    val bar = Foo().bar
+}