Enable macOS support

Author: simolus3

PowerSyncKotlin/build.gradle.kts

@@ -19,6 +19,8 @@ kotlin {
         iosX64(),
         iosArm64(),
         iosSimulatorArm64(),
+        macosArm64(),
+        macosX64(),
     ).forEach {
         it.binaries.framework {
             export(project(":core"))

PowerSyncKotlin/src/iosMain/kotlin/com/powersync/SDK.kt renamed to PowerSyncKotlin/src/appleMain/kotlin/com/powersync/SDK.kt

@@ -19,6 +19,8 @@ kotlin {
     iosX64()
     iosArm64()
     iosSimulatorArm64()
+    macosArm64()
+    macosX64()
 
     explicitApi()
 

compose/build.gradle.kts

@@ -27,6 +27,8 @@ kotlin {
     iosX64()
     iosArm64()
     iosSimulatorArm64()
+    macosArm64()
+    macosX64()
 
     explicitApi()
 

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

@@ -156,6 +156,8 @@ kotlin {
     iosX64()
     iosArm64()
     iosSimulatorArm64()
+    macosX64()
+    macosArm64()
 
     targets.withType<KotlinNativeTarget> {
         compilations.named("main") {
@@ -184,16 +186,6 @@ kotlin {
                 linkerOpts("-rpath", frameworkRoot)
             }
         }
-        /*
-        If we ever need macOS support:
-        {
-            binaries.withType<TestExecutable>().configureEach {
-                linkTaskProvider.dependsOn(downloadPowersyncDesktopBinaries)
-                linkerOpts("-lpowersync")
-                linkerOpts("-L", binariesFolder.map { it.dir("powersync") }.get().asFile.path)
-            }
-        }
-         */
     }
 
     explicitApi()
@@ -234,7 +226,7 @@ kotlin {
             implementation(libs.sqlite.jdbc)
         }
 
-        iosMain.dependencies {
+        appleMain.dependencies {
             implementation(libs.ktor.client.ios)
         }
 
@@ -248,11 +240,12 @@ kotlin {
         }
 
         // We're putting the native libraries into our JAR, so integration tests for the JVM can run as part of the unit
-        // tests.
-        jvmTest.get().dependsOn(commonIntegrationTest)
-
-        // We're linking the xcframework for the simulator tests, so they can use integration tests too
-        iosSimulatorArm64Test.orNull?.dependsOn(commonIntegrationTest)
+        // tests. For iOS and macOS targets, we're linking the xcframework into the test executable, so they can use
+        // integration tests too.
+        val canRunIntegrationTestsAsUnitTest = listOf(jvmTest, appleTest)
+        canRunIntegrationTestsAsUnitTest.forEach {
+            it.orNull?.dependsOn(commonIntegrationTest)
+        }
     }
 }
 

connectors/supabase/build.gradle.kts

@@ -25,7 +25,11 @@ public actual class DatabaseDriverFactory {
     private var driver: PsSqlDriver? = null
 
     init {
-        init_powersync_sqlite_extension()
+        val result = init_powersync_sqlite_extension()
+        println("load result $result")
+        if (result != 0) {
+            throw IllegalStateException("Could not load PowerSync extension, status code $result")
+        }
     }
 
     @Suppress("unused", "UNUSED_PARAMETER")

core/build.gradle.kts

@@ -15,13 +15,19 @@ class DatabaseTest {
 
     @BeforeTest
     fun setupDatabase() {
-        database =
-            PowerSyncDatabase(
-                factory = com.powersync.testutils.factory,
-                schema = Schema(UserRow.table),
-                dbFilename = "testdb",
-            )
+        println("Setup")
+        try {
+            database =
+                PowerSyncDatabase(
+                    factory = com.powersync.testutils.factory,
+                    schema = Schema(UserRow.table),
+                    dbFilename = "testdb",
+                )
+        } catch (e: Throwable) {
+            println("Initialization failed: $e")
+        }
 
+        println("Setup done")
         runBlocking {
             database.disconnectAndClear(true)
         }