Merge branch 'main' into docs/self-hosted-supabase-and-postgre

Author: andinux

.github/workflows/main.yml

@@ -168,7 +168,7 @@ jobs:
           codesign --sign "${{ secrets.APPLE_TEAM_ID }}" --timestamp --options runtime dist/CloudSync.xcframework # Then sign the xcframework wrapper
           ditto -c -k --keepParent dist/CloudSync.xcframework dist/CloudSync.xcframework.zip
           xcrun notarytool submit dist/CloudSync.xcframework.zip --apple-id "${{ secrets.APPLE_ID }}" --password "${{ secrets.APPLE_PASSWORD }}" --team-id "${{ secrets.APPLE_TEAM_ID }}" --wait
-          rm dist/CloudSync.xcframework.zip
+          rm -rf dist/CloudSync.xcframework
 
       - name: cleanup keychain for codesign
         if: matrix.os == 'macos-15'
@@ -380,7 +380,11 @@ jobs:
                 if [[ "$name" != "cloudsync-apple-xcframework" && "$name" != "cloudsync-android-aar" ]]; then
                   tar -czf "${name}-${VERSION}.tar.gz" -C "$folder" .
                 fi
-                if [[ "$name" != "cloudsync-android-aar" ]]; then
+                if [[ "$name" == "cloudsync-apple-xcframework" ]]; then
+                  # Use the ditto-created zip that preserves macOS symlinks and extract for other steps
+                  cp "$folder/CloudSync.xcframework.zip" "${name}-${VERSION}.zip"
+                  unzip -q "$folder/CloudSync.xcframework.zip" -d "$folder/"
+                elif [[ "$name" != "cloudsync-android-aar" ]]; then
                   (cd "$folder" && zip -rq "../../${name}-${VERSION}.zip" .)
                 else
                   cp "$folder"/*.aar "${name}-${VERSION}.aar"
@@ -531,6 +535,23 @@ jobs:
           npm publish --provenance --access public --tag latest
           echo "✓ Published @sqliteai/sqlite-sync-expo@${{ steps.tag.outputs.version }}"
 
+      - name: update Package.swift checksum and version
+        if: steps.tag.outputs.version != ''
+        run: |
+          VERSION=${{ steps.tag.outputs.version }}
+          ZIP="cloudsync-apple-xcframework-${VERSION}.zip"
+          if [ -f "$ZIP" ]; then
+            CHECKSUM=$(swift package compute-checksum "$ZIP")
+            URL="https://github.com/sqliteai/sqlite-sync/releases/download/${VERSION}/${ZIP}"
+            sed -i "s|url: \".*cloudsync-apple-xcframework.*\"|url: \"${URL}\"|" Package.swift
+            sed -i "s|checksum: \".*\"|checksum: \"${CHECKSUM}\"|" Package.swift
+            git config --global user.email "$GITHUB_ACTOR@users.noreply.github.com"
+            git config --global user.name "$GITHUB_ACTOR"
+            git add Package.swift
+            git commit -m "Update Package.swift checksum for ${VERSION} [skip ci]" || true
+            git push origin main || true
+          fi
+
       - uses: softprops/action-gh-release@v2.2.1
         if: steps.tag.outputs.version != ''
         with:

Makefile

@@ -384,7 +384,7 @@ endef
 LIB_NAMES = ios.dylib ios-sim.dylib macos.dylib
 FMWK_NAMES = ios-arm64 ios-arm64_x86_64-simulator macos-arm64_x86_64
 $(DIST_DIR)/%.xcframework: $(LIB_NAMES)
-	@$(foreach i,1 2 3,\
+	@$(foreach i,1 2,\
 		lib=$(word $(i),$(LIB_NAMES)); \
 		fmwk=$(word $(i),$(FMWK_NAMES)); \
 		mkdir -p $(DIST_DIR)/$$fmwk/CloudSync.framework/Headers; \
@@ -395,6 +395,21 @@ $(DIST_DIR)/%.xcframework: $(LIB_NAMES)
 		mv $(DIST_DIR)/$$lib $(DIST_DIR)/$$fmwk/CloudSync.framework/CloudSync; \
 		install_name_tool -id "@rpath/CloudSync.framework/CloudSync" $(DIST_DIR)/$$fmwk/CloudSync.framework/CloudSync; \
 	)
+	@lib=$(word 3,$(LIB_NAMES)); \
+	fmwk=$(word 3,$(FMWK_NAMES)); \
+	mkdir -p $(DIST_DIR)/$$fmwk/CloudSync.framework/Versions/A/Headers; \
+	mkdir -p $(DIST_DIR)/$$fmwk/CloudSync.framework/Versions/A/Modules; \
+	mkdir -p $(DIST_DIR)/$$fmwk/CloudSync.framework/Versions/A/Resources; \
+	cp src/cloudsync.h $(DIST_DIR)/$$fmwk/CloudSync.framework/Versions/A/Headers/CloudSync.h; \
+	printf "$(PLIST)" > $(DIST_DIR)/$$fmwk/CloudSync.framework/Versions/A/Resources/Info.plist; \
+	printf "$(MODULEMAP)" > $(DIST_DIR)/$$fmwk/CloudSync.framework/Versions/A/Modules/module.modulemap; \
+	mv $(DIST_DIR)/$$lib $(DIST_DIR)/$$fmwk/CloudSync.framework/Versions/A/CloudSync; \
+	install_name_tool -id "@rpath/CloudSync.framework/CloudSync" $(DIST_DIR)/$$fmwk/CloudSync.framework/Versions/A/CloudSync; \
+	ln -sf A $(DIST_DIR)/$$fmwk/CloudSync.framework/Versions/Current; \
+	ln -sf Versions/Current/CloudSync $(DIST_DIR)/$$fmwk/CloudSync.framework/CloudSync; \
+	ln -sf Versions/Current/Headers $(DIST_DIR)/$$fmwk/CloudSync.framework/Headers; \
+	ln -sf Versions/Current/Modules $(DIST_DIR)/$$fmwk/CloudSync.framework/Modules; \
+	ln -sf Versions/Current/Resources $(DIST_DIR)/$$fmwk/CloudSync.framework/Resources;
 	xcodebuild -create-xcframework $(foreach fmwk,$(FMWK_NAMES),-framework $(DIST_DIR)/$(fmwk)/CloudSync.framework) -output $@
 	rm -rf $(foreach fmwk,$(FMWK_NAMES),$(DIST_DIR)/$(fmwk))
 

Package.swift

@@ -7,27 +7,20 @@ let package = Package(
     name: "CloudSync",
     platforms: [.macOS(.v11), .iOS(.v11)],
     products: [
-        // Products can be used to vend plugins, making them visible to other packages.
-        .plugin(
-            name: "CloudSyncPlugin",
-            targets: ["CloudSyncPlugin"]),
         .library(
             name: "CloudSync",
             targets: ["CloudSync"])
     ],
     targets: [
-        // Build tool plugin that invokes the Makefile
-        .plugin(
-            name: "CloudSyncPlugin",
-            capability: .buildTool(),
-            path: "packages/swift/plugin"
+        .binaryTarget(
+            name: "CloudSyncBinary",
+            url: "https://github.com/sqliteai/sqlite-sync/releases/download/1.0.5/cloudsync-apple-xcframework-1.0.5.zip",
+            checksum: "8efd5da9e69731f0ed32d0e137314e260c2c8d763c5dc07672092d642418364b"
         ),
-        // CloudSync library target
         .target(
             name: "CloudSync",
-            dependencies: [],
-            path: "packages/swift/extension",
-            plugins: ["CloudSyncPlugin"]
+            dependencies: ["CloudSyncBinary"],
+            path: "packages/swift"
         ),
     ]
-)
+)

README.md

@@ -58,7 +58,7 @@ Download a pre-built binary from the [Releases](https://github.com/sqliteai/sqli
 | Platform | Install |
 |----------|---------|
 | **SQLite CLI / C** | `.load ./cloudsync` or `SELECT load_extension('./cloudsync');` |
-| **Swift** | [Add this repo as a Swift Package dependency](https://developer.apple.com/documentation/xcode/adding-package-dependencies-to-your-app) |
+| **Swift** | [Add this repo as a Swift Package dependency](https://developer.apple.com/documentation/xcode/adding-package-dependencies-to-your-app), follow [steps 4 and 5](https://github.com/sqliteai/sqlite-extensions-guide/blob/main/platforms/ios.md#4-set-up-sqlite-with-extension-loading), and load extension with `CloudSync.path`  |
 | **Android** | `implementation 'ai.sqlite:sync:1.0.0'` ([Maven Central](https://central.sonatype.com/artifact/ai.sqlite/sync)) |
 | **Flutter** | `flutter pub add sqlite_sync` ([pub.dev](https://pub.dev/packages/sqlite_sync)) |
 | **Expo** | `npm install @sqliteai/sqlite-sync-expo` |

packages/swift/CloudSync.swift

@@ -0,0 +1,15 @@
+// CloudSync.swift
+// Provides the path to the CloudSync SQLite extension for use with sqlite3_load_extension.
+
+import Foundation
+
+public struct CloudSync {
+    /// Returns the absolute path to the CloudSync dylib for use with sqlite3_load_extension.
+    public static var path: String {
+        #if os(macOS)
+        return Bundle.main.bundlePath + "/Contents/Frameworks/CloudSync.framework/CloudSync"
+        #else
+        return Bundle.main.bundlePath + "/Frameworks/CloudSync.framework/CloudSync"
+        #endif
+    }
+}

packages/swift/extension/CloudSync.swift

@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#define CLOUDSYNC_VERSION                       "1.0.1"
+#define CLOUDSYNC_VERSION                       "1.0.6"
 #define CLOUDSYNC_MAX_TABLENAME_LEN             512
 
 #define CLOUDSYNC_VALUE_NOTSET                  -1