fix(swift): use binary target and versioned macOS framework for Xcode 26 compatibility

Author: Gioee

.github/workflows/main.yml

@@ -369,6 +369,22 @@ jobs:
             fi
           done
 
+      - name: update Package.swift checksum and version
+        run: |
+          VERSION=$(make 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
+
       - name: release tag version from cloudsync.h
         id: tag
         run: |

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; \
+	cd $(DIST_DIR)/$$fmwk/CloudSync.framework/Versions && ln -sf A Current; \
+	cd $(DIST_DIR)/$$fmwk/CloudSync.framework && ln -sf Versions/Current/CloudSync CloudSync; \
+	cd $(DIST_DIR)/$$fmwk/CloudSync.framework && ln -sf Versions/Current/Headers Headers; \
+	cd $(DIST_DIR)/$$fmwk/CloudSync.framework && ln -sf Versions/Current/Modules Modules; \
+	cd $(DIST_DIR)/$$fmwk/CloudSync.framework && ln -sf Versions/Current/Resources 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.0/cloudsync-apple-xcframework-1.0.0.zip",
+            checksum: "024b30a6e53e726344e16d83b9583b6524d30b24eac4c0b7d4704f36d84e24f8"
         ),
-        // CloudSync library target
         .target(
             name: "CloudSync",
-            dependencies: [],
-            path: "packages/swift/extension",
-            plugins: ["CloudSyncPlugin"]
+            dependencies: ["CloudSyncBinary"],
+            path: "packages/swift"
         ),
     ]
-)
+)

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.0"
+#define CLOUDSYNC_VERSION                       "1.0.1"
 #define CLOUDSYNC_MAX_TABLENAME_LEN             512
 
 #define CLOUDSYNC_VALUE_NOTSET                  -1