fix(ios): static SQLCipher pods, strip system SQLite, refresh deps

- Podfile: use static frameworks; post_install/post_integrate hooks to avoid mixing Apple libsqlite3/SQLite headers with SQLCipher (including stripping aggregate Pods-App xcconfig flags for Swift explicit modules). - Xcode: enable CLANG_ENABLE_MODULES; replace CocoaPods “Embed Pods Frameworks” phase with “Copy Pods Resources”; minor project file hygiene. - Pods: SQLCipher 4.10.0, ZIPFoundation patch bump; Podfile.lock updated. - package.json: allow patch updates for @capacitor-community/sqlite (^6.0.2); regenerate package-lock.json. - Info.plist: reorder keys only (same URL scheme, background modes, BG tasks, notification alert style).
2026-04-09 21:46:32 +08:00
parent 73d595046a
commit 954500cf9d
6 changed files with 819 additions and 620 deletions
--- a/ios/App/App.xcodeproj/project.pbxproj
+++ b/ios/App/App.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 70;
+	objectVersion = 56;
 	objects = {

 /* Begin PBXBuildFile section */
@@ -15,10 +15,10 @@
 		504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; };
 		50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; };
 		97EF2DC6FD76C3643D680B8D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 90DCAFB4D8948F7A50C13800 /* Pods_App.framework */; };
+		B7E1C4F82A9D3E506F1B2C8D /* TimeSafariNativeFetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3F8E2D91B4C5E60718293A4 /* TimeSafariNativeFetcher.swift */; };
 		C86585DF2ED456DE00824752 /* TimeSafariShareExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = C86585D52ED456DE00824752 /* TimeSafariShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		C8C56E142EE0474B00737D0E /* SharedImageUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8C56E132EE0474B00737D0E /* SharedImageUtility.swift */; };
 		C8C56E162EE064CB00737D0E /* SharedImagePlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8C56E152EE064CA00737D0E /* SharedImagePlugin.swift */; };
-		B7E1C4F82A9D3E506F1B2C8D /* TimeSafariNativeFetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3F8E2D91B4C5E60718293A4 /* TimeSafariNativeFetcher.swift */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -56,17 +56,17 @@
 		504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
 		90DCAFB4D8948F7A50C13800 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		A3F8E2D91B4C5E60718293A4 /* TimeSafariNativeFetcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeSafariNativeFetcher.swift; sourceTree = "<group>"; };
 		C86585D52ED456DE00824752 /* TimeSafariShareExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = TimeSafariShareExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		C86585E52ED4577F00824752 /* App.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = App.entitlements; sourceTree = "<group>"; };
 		C8C56E132EE0474B00737D0E /* SharedImageUtility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedImageUtility.swift; sourceTree = "<group>"; };
 		C8C56E152EE064CA00737D0E /* SharedImagePlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedImagePlugin.swift; sourceTree = "<group>"; };
-		A3F8E2D91B4C5E60718293A4 /* TimeSafariNativeFetcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeSafariNativeFetcher.swift; sourceTree = "<group>"; };
 		E2E9297D5D02C549106C77F9 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
 		EAEC6436E595F7CD3A1C9E96 /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
-		C86585E32ED456DE00824752 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
+		C86585E32ED456DE00824752 /* Exceptions for "TimeSafariShareExtension" folder in "TimeSafariShareExtension" target */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
 				Info.plist,
@@ -79,7 +79,7 @@
 		C86585D62ED456DE00824752 /* TimeSafariShareExtension */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
 			exceptions = (
-				C86585E32ED456DE00824752 /* PBXFileSystemSynchronizedBuildFileExceptionSet */,
+				C86585E32ED456DE00824752 /* Exceptions for "TimeSafariShareExtension" folder in "TimeSafariShareExtension" target */,
 			);
 			explicitFileTypes = {
 			};
@@ -177,9 +177,9 @@
 				504EC3011FED79650016851F /* Frameworks */,
 				504EC3021FED79650016851F /* Resources */,
 				012076E8FFE4BF260A79B034 /* Fix Privacy Manifest */,
-				3525031ED1C96EF4CF6E9959 /* [CP] Embed Pods Frameworks */,
 				96A7EF592DF3366D00084D51 /* Fix Privacy Manifest */,
 				C86585E02ED456DE00824752 /* Embed Foundation Extensions */,
+				3FE25897CF40A571D4AC2ACE /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -207,8 +207,6 @@
 				C86585D62ED456DE00824752 /* TimeSafariShareExtension */,
 			);
 			name = TimeSafariShareExtension;
-			packageProductDependencies = (
-			);
 			productName = TimeSafariShareExtension;
 			productReference = C86585D52ED456DE00824752 /* TimeSafariShareExtension.appex */;
 			productType = "com.apple.product-type.app-extension";
@@ -296,19 +294,19 @@
 			shellScript = "\"${PROJECT_DIR}/app_privacy_manifest_fixer/fixer.sh\" \n";
 			showEnvVarsInLog = 0;
 		};
-		3525031ED1C96EF4CF6E9959 /* [CP] Embed Pods Frameworks */ = {
+		3FE25897CF40A571D4AC2ACE /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "[CP] Embed Pods Frameworks";
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		92977BEA1068CC097A57FC77 /* [CP] Check Pods Manifest.lock */ = {
@@ -526,6 +524,7 @@
 			baseConfigurationReference = EAEC6436E595F7CD3A1C9E96 /* Pods-App.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 65;
@@ -554,6 +553,7 @@
 			baseConfigurationReference = E2E9297D5D02C549106C77F9 /* Pods-App.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 65;
--- a/ios/App/App/Info.plist
+++ b/ios/App/App/Info.plist
@@ -2,6 +2,13 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>BGTaskSchedulerPermittedIdentifiers</key>
+	<array>
+		<string>org.timesafari.dailynotification.fetch</string>
+		<string>org.timesafari.dailynotification.notify</string>
+		<string>org.timesafari.dailynotification.content-fetch</string>
+		<string>org.timesafari.dailynotification.notification-delivery</string>
+	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -18,6 +25,17 @@
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>app.timesafari</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>timesafari</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
@@ -26,6 +44,13 @@
 	<string>Time Safari allows you to take photos, and also scan QR codes from contacts.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>Time Safari allows you to upload photos.</string>
+	<key>NSUserNotificationAlertStyle</key>
+	<string>alert</string>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>fetch</string>
+		<string>processing</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -47,30 +72,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleURLName</key>
-			<string>app.timesafari</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>timesafari</string>
-			</array>
-		</dict>
-	</array>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>fetch</string>
-		<string>processing</string>
-	</array>
-	<key>BGTaskSchedulerPermittedIdentifiers</key>
-	<array>
-		<string>org.timesafari.dailynotification.fetch</string>
-		<string>org.timesafari.dailynotification.notify</string>
-		<string>org.timesafari.dailynotification.content-fetch</string>
-		<string>org.timesafari.dailynotification.notification-delivery</string>
-	</array>
-	<key>NSUserNotificationAlertStyle</key>
-	<string>alert</string>
 </dict>
 </plist>
--- a/ios/App/Podfile
+++ b/ios/App/Podfile
@@ -1,7 +1,8 @@
 require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'

 platform :ios, '13.0'
-use_frameworks!
+# Static linkage helps isolate SQLCipher from Apple's system SQLite module/headers.
+use_frameworks! :linkage => :static

 # workaround to avoid Xcode caching of Pods that requires
 # Product -> Clean Build Folder after new Cordova plugins installed
@@ -28,11 +29,92 @@ target 'App' do
  # Add your Pods here
 end

+def merge_sqlite_omit_load_extension_definition(config)
+  defs = config.build_settings['GCC_PREPROCESSOR_DEFINITIONS']
+  if defs.nil?
+    config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = ['$(inherited)', 'SQLITE_OMIT_LOAD_EXTENSION']
+  elsif defs.is_a?(Array)
+    unless defs.any? { |d| d.to_s.include?('SQLITE_OMIT_LOAD_EXTENSION') }
+      config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = defs + ['SQLITE_OMIT_LOAD_EXTENSION']
+    end
+  else
+    s = defs.to_s
+    unless s.include?('SQLITE_OMIT_LOAD_EXTENSION')
+      config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = "#{s} SQLITE_OMIT_LOAD_EXTENSION".squeeze(' ').strip
+    end
+  end
+end
+
+def strip_system_sqlite_from_pod_config(config)
+  bad_header = lambda do |path|
+    p = path.to_s
+    p.include?('/usr/include') || p.include?('/usr/local/include')
+  end
+  %w[HEADER_SEARCH_PATHS USER_HEADER_SEARCH_PATHS].each do |key|
+    paths = config.build_settings[key]
+    next unless paths
+    if paths.is_a?(Array)
+      config.build_settings[key] = paths.reject(&bad_header)
+    else
+      kept = paths.to_s.split(/\s+/).reject(&bad_header)
+      config.build_settings[key] = kept.join(' ')
+    end
+  end
+  %w[OTHER_LDFLAGS OTHER_LIBTOOLFLAGS].each do |key|
+    val = config.build_settings[key]
+    next unless val
+    if val.is_a?(Array)
+      config.build_settings[key] = val.reject do |x|
+        s = x.to_s
+        s.match?(/libsqlite3\.tbd/) || s == '-l"sqlite3"' || s.match?(/-l\s*sqlite3\b/)
+      end
+    else
+      s = val.to_s.gsub(/\s*-l"sqlite3"\s+/, ' ')
+           .gsub(/\s*-l\s*sqlite3\b/, ' ')
+           .gsub(/[^\s]*libsqlite3\.tbd[^\s]*/, ' ')
+      config.build_settings[key] = s.squeeze(' ').strip
+    end
+  end
+end
+
 post_install do |installer|
  assertDeploymentTarget(installer)
  installer.pods_project.targets.each do |target|
    target.build_configurations.each do |config|
      config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'arm64'
+      config.build_settings['CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES'] = 'YES'
+      merge_sqlite_omit_load_extension_definition(config)
+      strip_system_sqlite_from_pod_config(config)
    end
  end
 end
+
+# Aggregate Pods-App xcconfigs merge -l"sqlite3" from dependencies; that pulls in Apple's
+# libsqlite3 alongside SQLCipher. Strip it after CocoaPods writes the files (post_install is too early).
+# Also strip SQLCipher header-guard macros leaked into GCC_PREPROCESSOR_DEFINITIONS: Swift explicit
+# modules build the SDK SQLite3.modulemap PCM with the same -D flags; _SQLITE3_H_=1 empties sqlite3.h
+# and breaks sqlite3ext.h (unknown sqlite3_* types).
+def strip_aggregate_pods_app_xcconfig(contents)
+  # Unlink system libsqlite3 (SQLCipher is the only SQLite).
+  patched = contents.gsub(/\s+-l"sqlite3"\s+/, ' ')
+                    .gsub(/\s+-lsqlite3\b/, ' ')
+  # SQLCipher leaks sqlite3*.h guard macros into GCC_PREPROCESSOR_DEFINITIONS; Swift explicit
+  # modules must not inherit them when building the SDK SQLite3 module.
+  %w[_SQLITE3_H_=1 _FTS5_H=1 _SQLITE3RTREE_H_=1].each do |macro|
+    escaped = Regexp.escape(macro)
+    patched.gsub!(/(?:^|\s)-D#{escaped}(?=\s|$)/, ' ')
+    patched.gsub!(/(?:^|\s)#{escaped}(?=\s|$)/, ' ')
+  end
+  patched.gsub(/[ \t]+/, ' ')
+end
+
+post_integrate do |installer|
+  support = File.join(installer.sandbox.root, 'Target Support Files', 'Pods-App')
+  %w[Pods-App.debug.xcconfig Pods-App.release.xcconfig].each do |name|
+    path = File.join(support, name)
+    next unless File.exist?(path)
+    contents = File.read(path)
+    patched = strip_aggregate_pods_app_xcconfig(contents)
+    File.write(path, patched) if patched != contents
+  end
+end
--- a/ios/App/Podfile.lock
+++ b/ios/App/Podfile.lock
@@ -81,14 +81,14 @@ PODS:
  - nanopb/decode (2.30910.0)
  - nanopb/encode (2.30910.0)
  - PromisesObjC (2.4.0)
-  - SQLCipher (4.9.0):
-    - SQLCipher/standard (= 4.9.0)
-  - SQLCipher/common (4.9.0)
-  - SQLCipher/standard (4.9.0):
+  - SQLCipher (4.10.0):
+    - SQLCipher/standard (= 4.10.0)
+  - SQLCipher/common (4.10.0)
+  - SQLCipher/standard (4.10.0):
    - SQLCipher/common
  - TimesafariDailyNotificationPlugin (3.0.0):
    - Capacitor
-  - ZIPFoundation (0.9.19)
+  - ZIPFoundation (0.9.20)

 DEPENDENCIES:
  - "Capacitor (from `../../node_modules/@capacitor/ios`)"
@@ -171,10 +171,10 @@ SPEC CHECKSUMS:
  MLKitVision: 90922bca854014a856f8b649d1f1f04f63fd9c79
  nanopb: 438bc412db1928dac798aa6fd75726007be04262
  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  SQLCipher: 31878d8ebd27e5c96db0b7cb695c96e9f8ad77da
+  SQLCipher: eb79c64049cb002b4e9fcb30edb7979bf4706dfc
  TimesafariDailyNotificationPlugin: 4a344236630d9209234d46a417d351ac9c27e1b0
-  ZIPFoundation: b8c29ea7ae353b309bc810586181fd073cb3312c
+  ZIPFoundation: dfd3d681c4053ff7e2f7350bc4e53b5dba3f5351

-PODFILE CHECKSUM: 6d92bfa46c6c2d31d19b8c0c38f56a8ae9fd222f
+PODFILE CHECKSUM: bf247ff01f83709ef1010f328f5fb4ab5370cb41

 COCOAPODS: 1.16.2
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -138,7 +138,7 @@
  },
  "dependencies": {
    "@capacitor-community/electron": "^5.0.1",
-    "@capacitor-community/sqlite": "6.0.2",
+    "@capacitor-community/sqlite": "^6.0.2",
    "@capacitor-mlkit/barcode-scanning": "^6.0.0",
    "@capacitor/android": "^6.2.0",
    "@capacitor/app": "^6.0.0",