Fix Gradle tests.

touchlab · Nov 25, 2024 · 93bc432 · 93bc432
1 parent 288113f
commit 93bc432
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/...ugin/src/kgp_1.8.0..2.0.20/kotlin/co/touchlab/skie/shim/ObjCExportMapperShim.kgp_1.8.0.kt b/...ugin/src/kgp_1.8.0..2.0.20/kotlin/co/touchlab/skie/shim/ObjCExportMapperShim.kgp_1.8.0.kt
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.backend.konan.objcexport.getClassIfCategory
 import org.jetbrains.kotlin.backend.konan.objcexport.isObjCProperty
 import org.jetbrains.kotlin.backend.konan.objcexport.isTopLevel
 
-actual object ObjCExportMapperShim {
+internal actual object ObjCExportMapperShim {
     actual fun isSpecialMapped(
         mapper: ObjCExportMapper,
         descriptor: ClassDescriptor

diff --git a/...inker-plugin/src/kgp_2.1.0/kotlin/co/touchlab/skie/shim/ObjCExportMapperShim.kgp_2.1.0.kt b/...inker-plugin/src/kgp_2.1.0/kotlin/co/touchlab/skie/shim/ObjCExportMapperShim.kgp_2.1.0.kt
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.backend.konan.objcexport.getClassIfCategory
 import org.jetbrains.kotlin.backend.konan.objcexport.isObjCProperty
 import org.jetbrains.kotlin.backend.konan.objcexport.isTopLevel
 
-actual object ObjCExportMapperShim {
+internal actual object ObjCExportMapperShim {
     actual fun isSpecialMapped(
         mapper: ObjCExportMapper,
         descriptor: ClassDescriptor

diff --git a/...ompiler/linker-plugin/src/kgp_common/kotlin/co/touchlab/skie/shim/ObjCExportMapperShim.kt b/...ompiler/linker-plugin/src/kgp_common/kotlin/co/touchlab/skie/shim/ObjCExportMapperShim.kt
@@ -5,7 +5,7 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 
-expect object ObjCExportMapperShim {
+internal expect object ObjCExportMapperShim {
     fun isSpecialMapped(mapper: ObjCExportMapper, descriptor: ClassDescriptor): Boolean
 
     fun isTopLevel(mapper: ObjCExportMapper, descriptor: CallableMemberDescriptor): Boolean

diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieMultiCompileRuntime.kt b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieMultiCompileRuntime.kt
@@ -148,17 +148,17 @@ class SkieMultiCompileRuntime: Plugin<Project> {
         smokeTestTmpRepositoryPath: String?,
     ): TaskProvider<Copy> {
         return tasks.register<Copy>("copyProject__$name") {
-            from(extension.sourceDir) {
-                include(extension.sourceIncludes.get())
-                filter(
-                    ReplaceTokens::class,
-                    "tokens" to mapOf(
-                        "targetKotlinVersion" to kotlinVersion.toString(),
-                        "artifactIdSuffix" to artifactIdSuffix,
-                        "targets" to extension.supportedTargetsWithDeclarations(kotlinVersion).joinToString("\n") { (_, declaration) -> declaration },
-                        "dependencies" to extension.dependencies.get().invoke(kotlinVersion),
-                        "smokeTestTmpRepositoryConfiguration" to smokeTestTmpRepositoryPath?.let {
-                            """
+            group = "other"
+            description = "Copy project files for Kotlin $name"
+
+            val tokens = provider {
+                mapOf(
+                    "targetKotlinVersion" to kotlinVersion.toString(),
+                    "artifactIdSuffix" to artifactIdSuffix,
+                    "targets" to extension.supportedTargetsWithDeclarations(kotlinVersion).joinToString("\n") { (_, declaration) -> declaration },
+                    "dependencies" to extension.dependencies.get().invoke(kotlinVersion),
+                    "smokeTestTmpRepositoryConfiguration" to smokeTestTmpRepositoryPath?.let {
+                        """
                             publishing {
                                 repositories {
                                     maven {
@@ -168,8 +168,16 @@ class SkieMultiCompileRuntime: Plugin<Project> {
                                 }
                             }
                         """.trimIndent()
-                        }.orEmpty(),
-                    )
+                    }.orEmpty(),
+                )
+            }
+
+            inputs.property("tokens", tokens)
+            from(extension.sourceDir) {
+                include(extension.sourceIncludes.get())
+                filter(
+                    ReplaceTokens::class,
+                    "tokens" to tokens.get()
                 )
             }
             into(layout.buildDirectory.dir("${this@registerCopyTask.name}_$name"))