Enable testing core on macOS

Author: simolus3

core/build.gradle.kts

@@ -6,6 +6,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.TestExecutable
 import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest
 import org.jetbrains.kotlin.konan.target.Family
+import org.jetbrains.kotlin.konan.target.KonanTarget
 
 
 plugins {
@@ -171,16 +172,21 @@ kotlin {
                 linkerOpts("-rpath", frameworkRoot)
             }
         }
-        /*
-        If we ever need macOS support:
-        {
+
+        if (konanTarget.family == Family.OSX) {
             binaries.withType<TestExecutable>().configureEach {
-                linkTaskProvider.dependsOn(downloadPowersyncDesktopBinaries)
-                linkerOpts("-lpowersync")
-                linkerOpts("-L", binariesFolder.map { it.dir("powersync") }.get().asFile.path)
+                linkTaskProvider.configure { dependsOn(unzipPowersyncFramework) }
+                linkerOpts("-framework", "powersync-sqlite-core")
+                val frameworkRoot =
+                    binariesFolder
+                        .map { it.dir("framework/powersync-sqlite-core.xcframework/macos-arm64_x86_64") }
+                        .get()
+                        .asFile.path
+
+                linkerOpts("-F", frameworkRoot)
+                linkerOpts("-rpath", frameworkRoot)
             }
         }
-         */
     }
 
     explicitApi()
@@ -230,8 +236,9 @@ kotlin {
             implementation(libs.sqlite.jdbc)
         }
 
-        iosMain.dependencies {
-            implementation(libs.ktor.client.ios)
+        appleMain.dependencies {
+            implementation(libs.ktor.client.apple)
+            implementation(libs.kotlinx.io)
         }
 
         commonTest.dependencies {
@@ -251,7 +258,7 @@ kotlin {
         jvmMain.get().dependsOn(commonJDBC)
 
         // We're linking the xcframework for the simulator tests, so they can use integration tests too
-        iosSimulatorArm64Test.orNull?.dependsOn(commonIntegrationTest)
+        appleTest.orNull?.dependsOn(commonIntegrationTest)
     }
 }
 

core/src/iosMain/kotlin/BuildConfig.kt renamed to core/src/appleMain/kotlin/BuildConfig.kt

@@ -26,6 +26,9 @@ import kotlinx.cinterop.staticCFunction
 import kotlinx.cinterop.toKString
 import kotlinx.cinterop.value
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.io.files.Path
+import kotlinx.io.files.SystemFileSystem
+import kotlinx.io.files.SystemPathSeparator
 import platform.Foundation.NSBundle
 
 @Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
@@ -60,13 +63,23 @@ public actual class DatabaseDriverFactory {
         // a pointer for C hooks
         val deferredDriver = DeferredDriver()
 
+        val resultingPath = when(dbDirectory) {
+            null -> dbFilename
+            else -> {
+                val path = Path(dbDirectory)
+                SystemFileSystem.createDirectories(path)
+
+                dbDirectory + SystemPathSeparator + dbFilename
+            }
+        }
+
         val driver =
             PsSqlDriver(
                 driver =
                     NativeSqliteDriver(
                         configuration =
                             DatabaseConfiguration(
-                                name = dbFilename,
+                                name = resultingPath,
                                 version = schema.version.toInt(),
                                 create = { connection ->
                                     wrapConnection(connection) {

core/src/iosMain/kotlin/com/powersync/DatabaseDriverFactory.ios.kt renamed to core/src/appleMain/kotlin/com/powersync/DatabaseDriverFactory.apple.kt

@@ -1,7 +1,6 @@
 package com.powersync
 
 import app.cash.turbine.turbineScope
-import com.powersync.db.getString
 import com.powersync.db.schema.Schema
 import com.powersync.testutils.UserRow
 import kotlinx.coroutines.CompletableDeferred

core/src/iosMain/kotlin/com/powersync/DeferredDriver.kt renamed to core/src/appleMain/kotlin/com/powersync/DeferredDriver.kt

@@ -28,6 +28,7 @@ import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runTest
+import kotlinx.io.files.SystemTemporaryDirectory
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.JsonObject
 import kotlin.test.AfterTest

core/src/iosSimulatorArm64Test/kotlin/com/powersync/testutils/TestUtils.iosSimulatorArm64.kt renamed to core/src/appleTest/kotlin/com/powersync/testutils/TestUtils.apple.kt

@@ -76,7 +76,7 @@ kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.
 uuid = { module = "com.benasher44:uuid", version.ref = "uuid" }
 
 ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
-ktor-client-ios = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" }
+ktor-client-apple = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" }
 ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
 ktor-client-contentnegotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
 ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }