Merge branch 'pre-update-kotlin' into grdb-csqlite

Author: stevensJourney

.github/workflows/build_and_test.yaml

@@ -14,13 +14,25 @@ jobs:
         uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: latest-stable
-
-      - name: Test on iOS simulator
+      - name: Build and Test
         run: |
           xcodebuild test -scheme PowerSync-Package -destination "platform=iOS Simulator,name=iPhone 16"
-      - name: Test on macOS
-        run: |
           xcodebuild test -scheme PowerSync-Package -destination "platform=macOS,arch=arm64,name=My Mac"
-      - name: Test on watchOS simulator
-        run: |
           xcodebuild test -scheme PowerSync-Package -destination "platform=watchOS Simulator,arch=arm64,name=Apple Watch Ultra 2 (49mm)"
+
+  buildSwift6:
+    name: Build and test with Swift 6
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up XCode
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest-stable
+      - name: Use Swift 6
+        run: |
+          sed -i '' 's|^// swift-tools-version:.*$|// swift-tools-version:6.1|' Package.swift
+      - name: Build and Test
+        run: |
+          swift build -Xswiftc -strict-concurrency=complete
+          swift test -Xswiftc -strict-concurrency=complete

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version: 6.1
+// swift-tools-version: 5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -20,9 +20,7 @@ let encryption = true
 // a binary target.
 // With a local SDK, we point to a `Package.swift` within the Kotlin SDK containing a target pointing
 // towards a local framework build
-var conditionalDependencies: [Package.Dependency] = [
-]
-
+var conditionalDependencies: [Package.Dependency] = []
 var conditionalTargets: [Target] = []
 var kotlinTargetDependency = Target.Dependency.target(name: "PowerSyncKotlin")
 
@@ -40,11 +38,13 @@ if let kotlinSdkPath = localKotlinSdkOverride {
     kotlinTargetDependency = .product(name: "PowerSyncKotlin", package: "PowerSyncKotlin")
 } else {
     // 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.8.0/PowersyncKotlinRelease.zip",
-        checksum: "31ac7c5e11d747e11bceb0b34f30438d37033e700c621b0a468aa308d887587f"
-    ))
+    conditionalTargets.append(
+        .binaryTarget(
+            name: "PowerSyncKotlin",
+            url:
+            "https://github.com/powersync-ja/powersync-kotlin/releases/download/v1.9.0/PowersyncKotlinRelease.zip",
+            checksum: "6d9847391ab2bbbca1f6a7abe163f0682ddca4a559ef5a1d2567b3e62e7d9979"
+        ))
 }
 
 var corePackageName = "powersync-sqlite-core-swift"
@@ -53,18 +53,19 @@ if let corePath = localCoreExtension {
     corePackageName = "powersync-sqlite-core"
 } else {
     // Not using a local build, so download from releases
-    conditionalDependencies.append(.package(
-        url: "https://github.com/powersync-ja/powersync-sqlite-core-swift.git",
-        exact: "0.4.8"
-    ))
+    conditionalDependencies.append(
+        .package(
+            url: "https://github.com/powersync-ja/powersync-sqlite-core-swift.git",
+            exact: "0.4.10"
+        ))
 }
 
 let package = Package(
     name: packageName,
     platforms: [
         .iOS(.v15),
         .macOS(.v12),
-        .watchOS(.v9)
+        .watchOS(.v9),
     ],
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.
@@ -88,7 +89,8 @@ let package = Package(
         )
     ],
     dependencies: conditionalDependencies + [
-        .package(url: "https://github.com/groue/GRDB.swift.git", from: "7.7.0")
+        .package(url: "https://github.com/groue/GRDB.swift.git", from: "7.7.0"),
+        .package(url: "git@github.com:powersync-ja/CSQLite.git", revision: "init")
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.
@@ -108,7 +110,6 @@ let package = Package(
             dependencies: [
                 .target(name: "PowerSync"),
                 .product(name: "GRDB", package: "GRDB.swift")
-              
             ]
         ),
         .testTarget(

Package.swift

@@ -50,7 +50,7 @@ enum KotlinAdapter {
                 name: table.name,
                 put: translateStatement(table.put),
                 delete: translateStatement(table.delete),
-                clear: table.clear,
+                clear: table.clear
             );
         }