Simplify link logic

Author: simolus3

PowerSyncKotlin/build.gradle.kts

@@ -17,7 +17,6 @@ kotlin {
         macosArm64(),
         macosX64(),
         watchosDeviceArm64(),
-        watchosArm32(),
         watchosArm64(),
         watchosSimulatorArm64(),
         watchosX64(),

plugins/build-plugin/src/main/kotlin/SharedBuildPlugin.kt

@@ -57,42 +57,29 @@ class SharedBuildPlugin : Plugin<Project> {
             .targets
             .withType<KotlinNativeTarget>()
             .configureEach {
-                if (konanTarget.family == Family.IOS &&
-                    konanTarget.name.contains(
-                        "simulator",
-                    )
-                ) {
-                    binaries
-                        .withType<org.jetbrains.kotlin.gradle.plugin.mpp.TestExecutable>()
-                        .configureEach {
-                            linkTaskProvider.configure { dependsOn(unzipPowersyncFramework) }
-                            linkerOpts("-framework", "powersync-sqlite-core")
+                val abiName = when(konanTarget.family) {
+                    Family.OSX -> "macos-arm64_x86_64"
+                    // We're testing on simulators
+                    Family.IOS -> "ios-arm64_x86_64-simulator"
+                    Family.WATCHOS -> "watchos-arm64_x86_64-simulator"
+                    else -> return@configureEach
+                }
 
-                            val frameworkRoot =
-                                binariesFolder
-                                    .map { it.dir("framework/extracted/powersync-sqlite-core.xcframework/ios-arm64_x86_64-simulator") }
-                                    .get()
-                                    .asFile.path
+                binaries
+                    .withType<org.jetbrains.kotlin.gradle.plugin.mpp.TestExecutable>()
+                    .configureEach {
+                        linkTaskProvider.configure { dependsOn(unzipPowersyncFramework) }
+                        linkerOpts("-framework", "powersync-sqlite-core")
 
-                            linkerOpts("-F", frameworkRoot)
-                            linkerOpts("-rpath", frameworkRoot)
-                        }
-                } else if (konanTarget.family == Family.OSX) {
-                    binaries
-                        .withType<org.jetbrains.kotlin.gradle.plugin.mpp.TestExecutable>()
-                        .configureEach {
-                            linkTaskProvider.configure { dependsOn("unzipPowersyncFramework") }
-                            linkerOpts("-framework", "powersync-sqlite-core")
-                            var frameworkRoot =
-                                binariesFolder
-                                    .map { it.dir("framework/extracted/powersync-sqlite-core.xcframework/macos-arm64_x86_64") }
-                                    .get()
-                                    .asFile.path
+                        val frameworkRoot =
+                            binariesFolder
+                                .map { it.dir("framework/extracted/powersync-sqlite-core.xcframework/$abiName") }
+                                .get()
+                                .asFile.path
 
-                            linkerOpts("-F", frameworkRoot)
-                            linkerOpts("-rpath", frameworkRoot)
-                        }
-                }
+                        linkerOpts("-F", frameworkRoot)
+                        linkerOpts("-rpath", frameworkRoot)
+                    }
             }
     }
 }

plugins/sonatype/src/main/kotlin/com/powersync/plugins/utils/KmpUtils.kt

@@ -41,7 +41,6 @@ public fun KotlinTargetContainerWithPresetFunctions.powersyncTargets(
 
             if (watchOS) {
                 watchosDeviceArm64() // aarch64-apple-watchos
-                watchosArm32() // armv7k-apple-watchos
                 watchosArm64() // arm64_32-apple-watchos
 
                 watchosSimulatorArm64() // aarch64-apple-watchos-simulator