Merge branch 'main' into fts-demo

Author: joshua-journey-apps

CHANGELOG.md

@@ -1,8 +1,10 @@
 # Changelog
 
-## 1.5.1 (unreleased)
+## 1.5.1
 
 * Update core extension to 0.4.5 ([changelog](https://github.com/powersync-ja/powersync-sqlite-core/releases/tag/v0.4.5))
+* Additional Swift 6 Strict Concurrency Checking declarations added for remaining protocols.
+* Fix issue in legacy sync client where local writes made offline could have their upload delayed until a keepalive event was received. This could also cause downloaded updates to be delayed even further until all uploads were completed.
 
 ## 1.5.0
 

Demo/PowerSyncExample.xcodeproj/project.pbxproj

@@ -661,6 +661,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_STRICT_CONCURRENCY = complete;
 			};
 			name = Debug;
 		};
@@ -717,6 +718,7 @@
 				OTHER_LDFLAGS = "-lsqlite3";
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_STRICT_CONCURRENCY = complete;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -758,7 +760,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "PowerSyncExample/PowerSyncExample-Bridging-Header.h";
 				"SWIFT_OBJC_BRIDGING_HEADER[arch=*]" = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -797,7 +799,7 @@
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "PowerSyncExample/PowerSyncExample-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

Demo/PowerSyncExample/Components/AddListView.swift

@@ -13,9 +13,9 @@ struct AddListView: View {
                 Task {
                     do {
                         try await system.insertList(newList)
-                        await completion(.success(true))
+                        completion(.success(true))
                     } catch {
-                        await completion(.failure(error))
+                        completion(.failure(error))
                         throw error
                     }
                 }

Demo/PowerSyncExample/Components/AddTodoListView.swift

@@ -15,9 +15,9 @@ struct AddTodoListView: View {
                 Task{
                     do {
                         try await system.insertTodo(newTodo, listId)
-                        await completion(.success(true))
+                        completion(.success(true))
                     } catch {
-                        await completion(.failure(error))
+                        completion(.failure(error))
                         throw error
                     }
                 }

Demo/PowerSyncExample/PowerSync/SupabaseConnector.swift

@@ -38,13 +38,14 @@ private enum PostgresFatalCodes {
 }
 
 @Observable
+@MainActor // _session is mutable, limiting to the MainActor satisfies Sendable constraints
 final class SupabaseConnector: PowerSyncBackendConnectorProtocol {
     let powerSyncEndpoint: String = Secrets.powerSyncEndpoint
     let client: SupabaseClient = .init(
         supabaseURL: Secrets.supabaseURL,
         supabaseKey: Secrets.supabaseAnonKey,
     )
-    var session: Session?
+    private(set) var session: Session?
     private var errorCode: String?
 
     @ObservationIgnored

Demo/PowerSyncExample/PowerSync/SupabaseRemoteStorage.swift

@@ -2,7 +2,7 @@ import Foundation
 import PowerSync
 import Supabase
 
-class SupabaseRemoteStorage: RemoteStorageAdapter {
+final class SupabaseRemoteStorage: RemoteStorageAdapter {
     let storage: Supabase.StorageFileApi
 
     init(storage: Supabase.StorageFileApi) {

Demo/PowerSyncExample/PowerSync/SystemManager.swift

@@ -13,13 +13,16 @@ func getAttachmentsDirectoryPath() throws -> String {
 
 let logTag = "SystemManager"
 
+/// We use the MainActor SupabaseConnector synchronously here, this requires specifying that SystemManager runs on the MainActor
+/// We don't actually block the MainActor with anything
 @Observable
-class SystemManager {
+@MainActor
+final class SystemManager {
     let connector = SupabaseConnector()
     let schema = AppSchema
     let db: PowerSyncDatabaseProtocol
 
-    var attachments: AttachmentQueue?
+    let attachments: AttachmentQueue?
 
     init() {
         db = PowerSyncDatabase(
@@ -227,21 +230,21 @@ class SystemManager {
             try await attachments.deleteFile(
                 attachmentId: photoId
             ) { transaction, _ in
-                try self.deleteTodoInTX(
-                    id: todo.id,
-                    tx: transaction
+                try transaction.execute(
+                    sql: "DELETE FROM \(TODOS_TABLE) WHERE id = ?",
+                    parameters: [todo.id]
                 )
             }
         } else {
-            try await db.writeTransaction { transaction in
-                try self.deleteTodoInTX(
-                    id: todo.id,
-                    tx: transaction
+            _ = try await db.writeTransaction { transaction in
+                try transaction.execute(
+                    sql: "DELETE FROM \(TODOS_TABLE) WHERE id = ?",
+                    parameters: [todo.id]
                 )
             }
         }
     }
-    
+
     /// Searches across lists and todos using FTS.
     ///
     /// - Parameter searchTerm: The text to search for.
@@ -338,6 +341,4 @@ class SystemManager {
         }
         return "\(trimmedSearchTerm)*"
     }
-    
-    
 }

Package.swift

@@ -32,8 +32,8 @@ if let kotlinSdkPath = localKotlinSdkOverride {
     // Not using a local build, so download from releases
     conditionalTargets.append(.binaryTarget(
         name: "PowerSyncKotlin",
-        url: "https://github.com/powersync-ja/powersync-kotlin/releases/download/v1.5.0/PowersyncKotlinRelease.zip",
-        checksum: "cb1d717d28411aff0bfdeeaa837ae01514ebf5d64203dc565a9520a2912bae9d"
+        url: "https://github.com/powersync-ja/powersync-kotlin/releases/download/v1.5.1/PowersyncKotlinRelease.zip",
+        checksum: "3a2de1863d2844d49cebf4428d0ab49956ba384dcab9f3cc2ddbc7836013c434"
     ))
 }
 

Sources/PowerSync/Kotlin/KotlinTypes.swift

@@ -8,3 +8,7 @@ extension KotlinPowerSyncBackendConnector: @retroactive @unchecked Sendable {}
 extension KotlinPowerSyncCredentials: @retroactive @unchecked Sendable {}
 extension PowerSyncKotlin.KermitLogger: @retroactive @unchecked Sendable {}
 extension PowerSyncKotlin.SyncStatus: @retroactive @unchecked Sendable {}
+
+extension PowerSyncKotlin.CrudEntry: @retroactive @unchecked Sendable {}
+extension PowerSyncKotlin.CrudBatch: @retroactive @unchecked Sendable {}
+extension PowerSyncKotlin.CrudTransaction: @retroactive @unchecked Sendable {}

Sources/PowerSync/Kotlin/sync/KotlinSyncStatusData.swift

@@ -103,11 +103,17 @@ extension KotlinProgressWithOperationsProtocol {
     }
 }
 
-struct KotlinProgressWithOperations: KotlinProgressWithOperationsProtocol {
+struct KotlinProgressWithOperations: KotlinProgressWithOperationsProtocol,
+    // We can't mark  PowerSyncKotlin.ProgressWithOperations as Sendable
+    @unchecked Sendable
+{
     let base: PowerSyncKotlin.ProgressWithOperations
 }
 
-struct KotlinSyncDownloadProgress: KotlinProgressWithOperationsProtocol, SyncDownloadProgress {
+struct KotlinSyncDownloadProgress: KotlinProgressWithOperationsProtocol, SyncDownloadProgress,
+    // We can't mark  PowerSyncKotlin.SyncDownloadProgress as Sendable
+    @unchecked Sendable
+{
     let progress: PowerSyncKotlin.SyncDownloadProgress
 
     var base: any PowerSyncKotlin.ProgressWithOperations {