stragler fixes

Author: stevensJourney

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 6.1
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -54,14 +54,14 @@ let package = Package(
     platforms: [
         .iOS(.v13),
         .macOS(.v10_15),
-        .watchOS(.v9),
+        .watchOS(.v9)
     ],
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.
         .library(
             name: packageName,
             targets: ["PowerSync"]
-        ),
+        )
     ],
     dependencies: conditionalDependencies,
     targets: [
@@ -71,12 +71,12 @@ let package = Package(
             name: packageName,
             dependencies: [
                 kotlinTargetDependency,
-                .product(name: "PowerSyncSQLiteCore", package: corePackageName),
+                .product(name: "PowerSyncSQLiteCore", package: corePackageName)
             ]
         ),
         .testTarget(
             name: "PowerSyncTests",
-            dependencies: ["PowerSync"],
-        ),
+            dependencies: ["PowerSync"]
+        )
     ] + conditionalTargets
 )

Sources/PowerSync/Kotlin/KotlinPowerSyncDatabaseImpl.swift

@@ -1,9 +1,11 @@
 import Foundation
 import PowerSyncKotlin
 
-final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol, @unchecked Sendable {
+final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol,
+    // `PowerSyncKotlin.PowerSyncDatabase` cannot be marked as Sendable
+    @unchecked Sendable
+{
     let logger: any LoggerProtocol
-
     private let kotlinDatabase: PowerSyncKotlin.PowerSyncDatabase
     private let encoder = JSONEncoder()
     let currentStatus: SyncStatus
@@ -270,7 +272,7 @@ final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol, @unchecked S
     }
 
     func writeLock<R: Sendable>(
-        callback: @escaping (any ConnectionContext) throws -> R
+        callback: @Sendable @escaping (any ConnectionContext) throws -> R
     ) async throws -> R {
         return try await wrapPowerSyncException {
             try safeCast(
@@ -283,7 +285,7 @@ final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol, @unchecked S
     }
 
     func writeTransaction<R: Sendable>(
-        callback: @escaping (any Transaction) throws -> R
+        callback: @Sendable @escaping (any Transaction) throws -> R
     ) async throws -> R {
         return try await wrapPowerSyncException {
             try safeCast(
@@ -311,7 +313,7 @@ final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol, @unchecked S
     }
 
     func readTransaction<R: Sendable>(
-        callback: @escaping (any Transaction) throws -> R
+        callback: @Sendable @escaping (any Transaction) throws -> R
     ) async throws -> R {
         return try await wrapPowerSyncException {
             try safeCast(
@@ -417,7 +419,7 @@ extension Error {
 }
 
 func wrapLockContext(
-    callback: @escaping (any ConnectionContext) throws -> Any
+    callback: @Sendable @escaping (any ConnectionContext) throws -> Any
 ) throws -> PowerSyncKotlin.ThrowableLockCallback {
     PowerSyncKotlin.wrapContextHandler { kotlinContext in
         do {
@@ -436,7 +438,7 @@ func wrapLockContext(
 }
 
 func wrapTransactionContext(
-    callback: @escaping (any Transaction) throws -> Any
+    callback: @Sendable @escaping (any Transaction) throws -> Any
 ) throws -> PowerSyncKotlin.ThrowableTransactionCallback {
     PowerSyncKotlin.wrapTransactionContextHandler { kotlinContext in
         do {

Sources/PowerSync/attachments/SyncingService.swift

@@ -148,9 +148,6 @@ public actor SyncingService: SyncingServiceProtocol {
                 )
                 .sink { _ in continuation.yield(()) }
 
-            continuation.onTermination = { _ in
-                cancellable.cancel()
-            }
             self.cancellables.insert(cancellable)
         }
     }