Merge pull request '16kb-pages' (#232) from 16kb-pages into master

Reviewed-on: #232
2026-05-25 20:01:18 +00:00
parent 9713313a40 a3a2d97b9a
commit cd4b279703
21 changed files with 4725 additions and 3728 deletions
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-18.19.0
+20.18.1
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-18.19.0
+20.18.1
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -1140,7 +1140,7 @@ export GEM_PATH=$shortened_path
 ##### 1. Bump the version in package.json & CHANGELOG.md for `MARKETING_VERSION`, then `grep CURRENT_PROJECT_VERSION ios/App/App.xcodeproj/project.pbxproj` and add 1 for the numbered version here:

 ```bash
-cd ios/App && xcrun agvtool new-version 67 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.3.12;/g" App.xcodeproj/project.pbxproj && cd -
+cd ios/App && xcrun agvtool new-version 68 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.4.2;/g" App.xcodeproj/project.pbxproj && cd -
 # Unfortunately this edits Info.plist directly.
 #xcrun agvtool new-marketing-version 0.4.5
 ```
@@ -1419,8 +1419,8 @@ The recommended way to build for Android is using the automated build script:
 ##### 1. Bump the version in package.json, then update these versions & run:

 ```bash
-perl -p -i -e 's/versionCode .*/versionCode 67/g' android/app/build.gradle
-perl -p -i -e 's/versionName .*/versionName "1.3.12"/g' android/app/build.gradle
+perl -p -i -e 's/versionCode .*/versionCode 68/g' android/app/build.gradle
+perl -p -i -e 's/versionName .*/versionName "1.4.2"/g' android/app/build.gradle
 ```

 ##### 2. Build
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).


+## [1.4.2] - 2026.05.24
+### Changed
+- Support 16 KB page sizes
+
+
 ## [1.3.13] - 2026.04.05
 ### Added
 - Ability to select project that the current one fulfills
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -29,16 +29,16 @@ android {
    compileSdk rootProject.ext.compileSdkVersion

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
    }

    defaultConfig {
        applicationId "app.timesafari.app"
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 67
-        versionName "1.3.12"
+        versionCode 68
+        versionName "1.4.2"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        aaptOptions {
             // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
@@ -72,13 +72,14 @@ android {
    }
    packagingOptions {
        jniLibs {
+            // Required for 16 KB page-size support: keep native libs uncompressed and
+            // page-aligned inside the APK (default on AGP 8.x with minSdk 23+, set
+            // explicitly so it does not regress).
+            useLegacyPackaging = false
            pickFirsts += ['**/lib/x86_64/libbarhopper_v3.so', '**/lib/x86_64/libimage_processing_util_jni.so', '**/lib/x86_64/libsqlcipher.so']
        }
    }

-    // Configure for 16 KB page size compatibility
-
-
    // Enable bundle builds (without which it doesn't work right for bundleDebug vs bundleRelease)
    bundle {
        language {
--- a/android/app/capacitor.build.gradle
+++ b/android/app/capacitor.build.gradle
@@ -2,8 +2,8 @@

 android {
  compileOptions {
-      sourceCompatibility JavaVersion.VERSION_17
-      targetCompatibility JavaVersion.VERSION_17
+      sourceCompatibility JavaVersion.VERSION_21
+      targetCompatibility JavaVersion.VERSION_21
  }
 }

--- a/android/app/src/main/assets/capacitor.config.json
+++ b/android/app/src/main/assets/capacitor.config.json
@@ -1,6 +1,6 @@
 {
 	"appId": "app.timesafari",
-	"appName": "TimeSafari",
+	"appName": "Giftopia",
 	"webDir": "dist",
 	"server": {
 		"cleartext": true
@@ -34,12 +34,12 @@
 			"iosIsEncryption": false,
 			"iosBiometric": {
 				"biometricAuth": false,
-				"biometricTitle": "Biometric login for TimeSafari"
+				"biometricTitle": "Biometric login for Giftopia"
 			},
 			"androidIsEncryption": false,
 			"androidBiometric": {
 				"biometricAuth": false,
-				"biometricTitle": "Biometric login for TimeSafari"
+				"biometricTitle": "Biometric login for Giftopia"
 			},
 			"electronIsEncryption": false
 		},
@@ -100,7 +100,7 @@
 		},
 		"buildOptions": {
 			"appId": "app.timesafari",
-			"productName": "TimeSafari",
+			"productName": "Giftopia",
 			"directories": {
 				"output": "dist-electron-packages"
 			},
--- a/android/capacitor-cordova-android-plugins/build.gradle
+++ b/android/capacitor-cordova-android-plugins/build.gradle
@@ -1,5 +1,5 @@
 ext {
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
    cordovaAndroidVersion = project.hasProperty('cordovaAndroidVersion') ? rootProject.ext.cordovaAndroidVersion : '10.1.1'
 }

@@ -9,7 +9,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.1'
+        classpath 'com.android.tools.build:gradle:8.7.2'
    }
 }

@@ -17,10 +17,10 @@ apply plugin: 'com.android.library'

 android {
    namespace "capacitor.cordova.android.plugins"
-    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
+    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
    defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
+        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
        versionCode 1
        versionName "1.0"
    }
@@ -28,8 +28,8 @@ android {
        abortOnError false
    }
    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
    }
 }

--- a/android/capacitor-cordova-android-plugins/cordova.variables.gradle
+++ b/android/capacitor-cordova-android-plugins/cordova.variables.gradle
@@ -1,6 +1,6 @@
 // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 ext {
-  cdvMinSdkVersion = project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
+  cdvMinSdkVersion = project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
  // Plugin gradle extensions can append to this to have code run at the end.
  cdvPluginPostBuildExtras = []
  cordovaConfig = [:]
--- a/android/variables.gradle
+++ b/android/variables.gradle
@@ -13,4 +13,11 @@ ext {
    androidxJunitVersion = '1.1.5'
    androidxEspressoCoreVersion = '3.5.1'
    cordovaAndroidVersion = '10.1.1'
+
+    // Pin CameraX to 1.4.2: first stable line shipping a 16 KB page-size-aligned
+    // libimage_processing_util_jni.so. The barcode-scanning plugin still defaults to 1.1.0.
+    androidxCameraCamera2Version = '1.4.2'
+    androidxCameraCoreVersion = '1.4.2'
+    androidxCameraLifecycleVersion = '1.4.2'
+    androidxCameraViewVersion = '1.4.2'
 }
--- a/ios/App/App.xcodeproj/project.pbxproj
+++ b/ios/App/App.xcodeproj/project.pbxproj
@@ -452,7 +452,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -508,7 +508,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -524,18 +524,18 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 67;
+				CURRENT_PROJECT_VERSION = 68;
 				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Giftopia;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.5;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.12;
+				MARKETING_VERSION = 1.4.2;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -553,18 +553,18 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 67;
+				CURRENT_PROJECT_VERSION = 68;
 				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Giftopia;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.5;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.12;
+				MARKETING_VERSION = 1.4.2;
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
@@ -582,7 +582,7 @@
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_ENTITLEMENTS = TimeSafariShareExtension/TimeSafariShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 67;
+				CURRENT_PROJECT_VERSION = 68;
 				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -596,7 +596,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 1.3.12;
+				MARKETING_VERSION = 1.4.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari.TimeSafariShareExtension;
@@ -620,7 +620,7 @@
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_ENTITLEMENTS = TimeSafariShareExtension/TimeSafariShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 67;
+				CURRENT_PROJECT_VERSION = 68;
 				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -634,7 +634,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 1.3.12;
+				MARKETING_VERSION = 1.4.2;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari.TimeSafariShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
--- a/ios/App/Podfile
+++ b/ios/App/Podfile
@@ -1,6 +1,6 @@
 require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'

-platform :ios, '13.0'
+platform :ios, '15.5'
 use_frameworks!

 # workaround to avoid Xcode caching of Pods that requires
@@ -30,9 +30,4 @@ 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'
-    end
-  end
 end
--- a/ios/App/Podfile.lock
+++ b/ios/App/Podfile.lock
@@ -1,94 +1,84 @@
 PODS:
-  - Capacitor (6.2.1):
+  - Capacitor (7.6.4):
    - CapacitorCordova
-  - CapacitorApp (6.0.2):
+  - CapacitorApp (7.1.2):
    - Capacitor
-  - CapacitorCamera (6.1.2):
+  - CapacitorCamera (7.0.5):
    - Capacitor
-  - CapacitorClipboard (6.0.2):
+  - CapacitorClipboard (7.0.4):
    - Capacitor
-  - CapacitorCommunitySqlite (6.0.2):
+  - CapacitorCommunitySqlite (7.0.3):
    - Capacitor
    - SQLCipher
    - ZIPFoundation
-  - CapacitorCordova (6.2.1)
-  - CapacitorFilesystem (6.0.3):
+  - CapacitorCordova (7.6.4)
+  - CapacitorFilesystem (7.1.8):
    - Capacitor
-  - CapacitorMlkitBarcodeScanning (6.2.0):
+    - IONFilesystemLib (~> 1.1.1)
+  - CapacitorMlkitBarcodeScanning (7.5.0):
    - Capacitor
-    - GoogleMLKit/BarcodeScanning (= 5.0.0)
-  - CapacitorShare (6.0.3):
+    - GoogleMLKit/BarcodeScanning (= 7.0.0)
+  - CapacitorShare (7.0.4):
    - Capacitor
-  - CapacitorStatusBar (6.0.2):
+  - CapacitorStatusBar (7.0.6):
    - Capacitor
-  - CapawesomeCapacitorFilePicker (6.2.0):
+  - CapawesomeCapacitorFilePicker (7.2.0):
    - Capacitor
-  - GoogleDataTransport (9.4.1):
-    - GoogleUtilities/Environment (~> 7.7)
-    - nanopb (< 2.30911.0, >= 2.30908.0)
-    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleMLKit/BarcodeScanning (5.0.0):
+  - GoogleDataTransport (10.1.0):
+    - nanopb (~> 3.30910.0)
+    - PromisesObjC (~> 2.4)
+  - GoogleMLKit/BarcodeScanning (7.0.0):
    - GoogleMLKit/MLKitCore
-    - MLKitBarcodeScanning (~> 4.0.0)
-  - GoogleMLKit/MLKitCore (5.0.0):
-    - MLKitCommon (~> 10.0.0)
-  - GoogleToolboxForMac/DebugUtils (2.3.2):
-    - GoogleToolboxForMac/Defines (= 2.3.2)
-  - GoogleToolboxForMac/Defines (2.3.2)
-  - GoogleToolboxForMac/Logger (2.3.2):
-    - GoogleToolboxForMac/Defines (= 2.3.2)
-  - "GoogleToolboxForMac/NSData+zlib (2.3.2)":
-    - GoogleToolboxForMac/Defines (= 2.3.2)
-  - "GoogleToolboxForMac/NSDictionary+URLArguments (2.3.2)":
-    - GoogleToolboxForMac/DebugUtils (= 2.3.2)
-    - GoogleToolboxForMac/Defines (= 2.3.2)
-    - "GoogleToolboxForMac/NSString+URLArguments (= 2.3.2)"
-  - "GoogleToolboxForMac/NSString+URLArguments (2.3.2)"
-  - GoogleUtilities/Environment (7.13.3):
+    - MLKitBarcodeScanning (~> 6.0.0)
+  - GoogleMLKit/MLKitCore (7.0.0):
+    - MLKitCommon (~> 12.0.0)
+  - GoogleToolboxForMac/Defines (4.2.1)
+  - GoogleToolboxForMac/Logger (4.2.1):
+    - GoogleToolboxForMac/Defines (= 4.2.1)
+  - "GoogleToolboxForMac/NSData+zlib (4.2.1)":
+    - GoogleToolboxForMac/Defines (= 4.2.1)
+  - GoogleUtilities/Environment (8.1.0):
    - GoogleUtilities/Privacy
-    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.13.3):
+  - GoogleUtilities/Logger (8.1.0):
    - GoogleUtilities/Environment
    - GoogleUtilities/Privacy
-  - GoogleUtilities/Privacy (7.13.3)
-  - GoogleUtilities/UserDefaults (7.13.3):
+  - GoogleUtilities/Privacy (8.1.0)
+  - GoogleUtilities/UserDefaults (8.1.0):
    - GoogleUtilities/Logger
    - GoogleUtilities/Privacy
-  - GoogleUtilitiesComponents (1.1.0):
-    - GoogleUtilities/Logger
  - GTMSessionFetcher/Core (3.5.0)
-  - MLImage (1.0.0-beta5)
-  - MLKitBarcodeScanning (4.0.0):
-    - MLKitCommon (~> 10.0)
-    - MLKitVision (~> 6.0)
-  - MLKitCommon (10.0.0):
-    - GoogleDataTransport (~> 9.0)
-    - GoogleToolboxForMac/Logger (~> 2.1)
-    - "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
-    - "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)"
-    - GoogleUtilities/UserDefaults (~> 7.0)
-    - GoogleUtilitiesComponents (~> 1.0)
-    - GTMSessionFetcher/Core (< 4.0, >= 1.1)
-  - MLKitVision (6.0.0):
-    - GoogleToolboxForMac/Logger (~> 2.1)
-    - "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
-    - GTMSessionFetcher/Core (< 4.0, >= 1.1)
-    - MLImage (= 1.0.0-beta5)
-    - MLKitCommon (~> 10.0)
-  - nanopb (2.30910.0):
-    - nanopb/decode (= 2.30910.0)
-    - nanopb/encode (= 2.30910.0)
-  - nanopb/decode (2.30910.0)
-  - nanopb/encode (2.30910.0)
+  - IONFilesystemLib (1.1.2)
+  - MLImage (1.0.0-beta6)
+  - MLKitBarcodeScanning (6.0.0):
+    - MLKitCommon (~> 12.0)
+    - MLKitVision (~> 8.0)
+  - MLKitCommon (12.0.0):
+    - GoogleDataTransport (~> 10.0)
+    - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1)
+    - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)"
+    - GoogleUtilities/Logger (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
+    - GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
+  - MLKitVision (8.0.0):
+    - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1)
+    - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)"
+    - GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
+    - MLImage (= 1.0.0-beta6)
+    - MLKitCommon (~> 12.0)
+  - nanopb (3.30910.0):
+    - nanopb/decode (= 3.30910.0)
+    - nanopb/encode (= 3.30910.0)
+  - nanopb/decode (3.30910.0)
+  - nanopb/encode (3.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 (2.0.0):
    - Capacitor
-  - ZIPFoundation (0.9.19)
+  - ZIPFoundation (0.9.20)

 DEPENDENCIES:
  - "Capacitor (from `../../node_modules/@capacitor/ios`)"
@@ -110,8 +100,8 @@ SPEC REPOS:
    - GoogleMLKit
    - GoogleToolboxForMac
    - GoogleUtilities
-    - GoogleUtilitiesComponents
    - GTMSessionFetcher
+    - IONFilesystemLib
    - MLImage
    - MLKitBarcodeScanning
    - MLKitCommon
@@ -148,33 +138,33 @@ EXTERNAL SOURCES:
    :path: "../../node_modules/@timesafari/daily-notification-plugin"

 SPEC CHECKSUMS:
-  Capacitor: c95400d761e376be9da6be5a05f226c0e865cebf
-  CapacitorApp: e1e6b7d05e444d593ca16fd6d76f2b7c48b5aea7
-  CapacitorCamera: 9bc7b005d0e6f1d5f525b8137045b60cffffce79
-  CapacitorClipboard: 4443c3cdb7c77b1533dfe3ff0f9f7756aa8579df
-  CapacitorCommunitySqlite: 0299d20f4b00c2e6aa485a1d8932656753937b9b
-  CapacitorCordova: 8d93e14982f440181be7304aa9559ca631d77fff
-  CapacitorFilesystem: 59270a63c60836248812671aa3b15df673fbaf74
-  CapacitorMlkitBarcodeScanning: 7652be9c7922f39203a361de735d340ae37e134e
-  CapacitorShare: d2a742baec21c8f3b92b361a2fbd2401cdd8288e
-  CapacitorStatusBar: b16799a26320ffa52f6c8b01737d5a95bbb8f3eb
-  CapawesomeCapacitorFilePicker: c40822f0a39f86855321943c7829d52bca7f01bd
-  GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
-  GoogleMLKit: 90ba06e028795a50261f29500d238d6061538711
-  GoogleToolboxForMac: 8bef7c7c5cf7291c687cf5354f39f9db6399ad34
-  GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
-  GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe
+  Capacitor: 69dc07ebc6bd064747c5e76922f97e4862d9cc23
+  CapacitorApp: f01a913211780e0718dae9750442c3e23f96e106
+  CapacitorCamera: 9e952270be355797f769aa835bb7643a96c871fe
+  CapacitorClipboard: d1f123674cf413125db816a45e8f70e8770972fc
+  CapacitorCommunitySqlite: 4813d82ad33001e612a39d313cb5d28066cbafda
+  CapacitorCordova: e343e95a672ff73e21a77a80257b52fb609b47d5
+  CapacitorFilesystem: c63fc54df41e5a6761785a7f3c49dc696c22e296
+  CapacitorMlkitBarcodeScanning: afd6fc431b550026a2c052e11ab2b71c7ae30011
+  CapacitorShare: 25f7fc5dd0e4edbde5d6801c6de5d14a8b450a41
+  CapacitorStatusBar: 416e9e53fd6397e668d4a181cd2131617d949bd6
+  CapawesomeCapacitorFilePicker: 0f4a913a00e39dd77213449f0d917e92f35a5ca9
+  GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
+  GoogleMLKit: eff9e23ec1d90ea4157a1ee2e32a4f610c5b3318
+  GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8
+  GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
  GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
-  MLImage: 1824212150da33ef225fbd3dc49f184cf611046c
-  MLKitBarcodeScanning: 9cb0ec5ec65bbb5db31de4eba0a3289626beab4e
-  MLKitCommon: afcd11b6c0735066a0dde8b4bf2331f6197cbca2
-  MLKitVision: 90922bca854014a856f8b649d1f1f04f63fd9c79
-  nanopb: 438bc412db1928dac798aa6fd75726007be04262
+  IONFilesystemLib: 21a63377696b2d8fab5632ecfb7d2ac67bddb68a
+  MLImage: 0ad1c5f50edd027672d8b26b0fee78a8b4a0fc56
+  MLKitBarcodeScanning: 0a3064da0a7f49ac24ceb3cb46a5bc67496facd2
+  MLKitCommon: 07c2c33ae5640e5380beaaa6e4b9c249a205542d
+  MLKitVision: 45e79d68845a2de77e2dd4d7f07947f0ed157b0e
+  nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  SQLCipher: 31878d8ebd27e5c96db0b7cb695c96e9f8ad77da
+  SQLCipher: eb79c64049cb002b4e9fcb30edb7979bf4706dfc
  TimesafariDailyNotificationPlugin: 3c12e8c39fc27f689f56cf4e57230a8c28611fcc
-  ZIPFoundation: b8c29ea7ae353b309bc810586181fd073cb3312c
+  ZIPFoundation: dfd3d681c4053ff7e2f7350bc4e53b5dba3f5351

-PODFILE CHECKSUM: 6d92bfa46c6c2d31d19b8c0c38f56a8ae9fd222f
+PODFILE CHECKSUM: 87c07d03f36ef38ab0c873802aee1ce9b5d34448

 COCOAPODS: 1.16.2
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
+
 {
  "name": "giftopia",
-  "version": "1.3.14-beta",
+  "version": "1.4.2",
  "description": "Giftopia App",
  "author": {
    "name": "Gift Economies Team"
@@ -138,19 +139,19 @@
  },
  "dependencies": {
    "@capacitor-community/electron": "^5.0.1",
-    "@capacitor-community/sqlite": "6.0.2",
-    "@capacitor-mlkit/barcode-scanning": "^6.0.0",
-    "@capacitor/android": "^6.2.0",
-    "@capacitor/app": "^6.0.0",
-    "@capacitor/camera": "^6.0.0",
-    "@capacitor/cli": "^6.2.0",
-    "@capacitor/clipboard": "^6.0.2",
-    "@capacitor/core": "^6.2.0",
-    "@capacitor/filesystem": "^6.0.0",
-    "@capacitor/ios": "^6.2.0",
-    "@capacitor/share": "^6.0.3",
-    "@capacitor/status-bar": "^6.0.2",
-    "@capawesome/capacitor-file-picker": "^6.2.0",
+    "@capacitor-community/sqlite": "^7.0.3",
+    "@capacitor-mlkit/barcode-scanning": "^7.5.0",
+    "@capacitor/android": "^7.6.4",
+    "@capacitor/app": "^7.1.0",
+    "@capacitor/camera": "^7.0.5",
+    "@capacitor/cli": "^7.6.4",
+    "@capacitor/clipboard": "^7.0.4",
+    "@capacitor/core": "^7.6.4",
+    "@capacitor/filesystem": "^7.1.8",
+    "@capacitor/ios": "^7.6.4",
+    "@capacitor/share": "^7.0.4",
+    "@capacitor/status-bar": "^7.0.6",
+    "@capawesome/capacitor-file-picker": "^7.2.0",
    "@dicebear/collection": "^5.4.1",
    "@dicebear/core": "^5.4.1",
    "@ethersproject/hdnode": "^5.7.0",
--- a/scripts/build-ios.sh
+++ b/scripts/build-ios.sh
@@ -222,8 +222,9 @@ build_ios_app() {
    
    if [ "$BUILD_TYPE" = "debug" ]; then
        build_config="Debug"
-        # Any Simulator — avoids hardcoding a device name (e.g. iPhone 15 Pro) that may not exist in newer Xcode runtimes
-        destination="generic/platform=iOS Simulator"
+        # Use device SDK — prebuilt MLKit frameworks (MLImage, MLKitBarcodeScanning) ship
+        # iOS device slices only and cannot link against the iOS Simulator SDK.
+        destination="generic/platform=iOS"
    else
        build_config="Release"
        destination="platform=iOS,id=auto"
@@ -233,10 +234,16 @@ build_ios_app() {
    
    cd ios/App
    
+    # Prevent pkgx-managed libs (e.g. zlib) from leaking into the iOS SDK linker.
+    unset LIBRARY_PATH
+    unset DYLD_LIBRARY_PATH
+    unset DYLD_FALLBACK_LIBRARY_PATH
+
    # Build the app:
    # -quiet: skip the huge export VAR dump (compiler warnings still show unless suppressed below).
    # SWIFT_SUPPRESS_WARNINGS / GCC_WARN_INHIBIT_ALL_WARNINGS: quiet CLI output from Pods + plugins;
    #   build in Xcode for full diagnostics. Real errors still fail the build.
+    local build_exit=0
    xcodebuild -quiet \
               -workspace App.xcworkspace \
               -scheme "$scheme" \
@@ -247,10 +254,14 @@ build_ios_app() {
               CODE_SIGNING_REQUIRED=NO \
               CODE_SIGNING_ALLOWED=NO \
               SWIFT_SUPPRESS_WARNINGS=YES \
-               GCC_WARN_INHIBIT_ALL_WARNINGS=YES
-    
+               GCC_WARN_INHIBIT_ALL_WARNINGS=YES || build_exit=$?
+
    cd ../..
-    
+
+    if [ $build_exit -ne 0 ]; then
+        return $build_exit
+    fi
+
    log_success "iOS app built successfully"
 }

--- a/src/components/MeetingExclusionGroups.vue
+++ b/src/components/MeetingExclusionGroups.vue
@@ -129,7 +129,7 @@
      @click="disabled ? notifyLocked() : addGroup()"
    >
      <font-awesome icon="plus" class="text-sm" />
-      New Group
+      New Do-Not-Pair Group
    </button>
  </div>
 </template>
--- a/src/services/QRScanner/CapacitorQRScanner.ts
+++ b/src/services/QRScanner/CapacitorQRScanner.ts
@@ -123,10 +123,10 @@ export class CapacitorQRScanner implements QRScannerService {

      // Add listener for barcode scans
      const handle = await BarcodeScanner.addListener(
-        "barcodeScanned",
+        "barcodesScanned",
        (result) => {
-          if (this.scanListener && result.barcode?.rawValue) {
-            this.scanListener.onScan(result.barcode.rawValue);
+          if (this.scanListener && result.barcodes?.[0]?.rawValue) {
+            this.scanListener.onScan(result.barcodes[0].rawValue);
          }
        },
      );
--- a/src/views/AccountViewView.vue
+++ b/src/views/AccountViewView.vue
@@ -2116,6 +2116,10 @@ export default class AccountViewView extends Vue {
          hasLocation: result.includeLocation,
        });

+        if (response.data.userMessage) {
+          this.notify.info(response.data.userMessage);
+        }
+
        return result;
      } else {
        logger.debug("[AccountViewView] No profile data found in response:", {
@@ -2123,6 +2127,10 @@ export default class AccountViewView extends Vue {
          hasData: !!response.data,
          hasDataData: !!(response.data && response.data.data),
        });
+
+        if (response.data?.userMessage) {
+          this.notify.info(response.data.userMessage);
+        }
      }

      return null;
@@ -2229,6 +2237,10 @@ export default class AccountViewView extends Vue {
        status: response.status,
      });

+      if (response.data?.userMessage) {
+        this.notify.info(response.data.userMessage);
+      }
+
      return true;
    } catch (error: unknown) {
      // Handle specific HTTP status codes cleanly to suppress console spam
@@ -2345,6 +2357,10 @@ export default class AccountViewView extends Vue {
        status: response.status,
      });

+      if (response.data?.userMessage) {
+        this.notify.info(response.data.userMessage);
+      }
+
      return true;
    } catch (error: unknown) {
      // Handle specific HTTP status codes cleanly to suppress console spam
--- a/src/views/OnboardMeetingSetupView.vue
+++ b/src/views/OnboardMeetingSetupView.vue
@@ -366,7 +366,8 @@
            Do Not Pair Together
          </h4>
          <p class="text-xs text-gray-500 mb-2">
-            People in the same group will not be matched with each other.
+            People in the same do-not-pair group will not be matched with each
+            other.
          </p>
          <p v-if="hasActiveMatches" class="text-xs text-amber-600 mb-2">
            Erase matches to change restrictions.
--- a/test-playwright/40-add-contact.spec.ts
+++ b/test-playwright/40-add-contact.spec.ts
@@ -130,11 +130,13 @@ test('Add contact, record gift, confirm gift', async ({ page }) => {

  // Refresh home view and check gift
  await page.goto('./');
+  // Wait for async data (e.g. "new offers" banner) to finish loading so the layout
+  // is stable before clicking — otherwise a layout shift can redirect the click.
+  await page.waitForLoadState('networkidle');

-  // Firefox complains on load the initial feed here when we use the test server.
-  // It may be similar to the CORS problem below.
-  const item = await page.locator('li:first-child').filter({ hasText: finalTitle });
-  await item.locator('[data-testid="circle-info-link"]').click();
+  const item = page.locator('li').filter({ hasText: finalTitle }).locator('[data-testid="circle-info-link"]');
+  await expect(item).toBeVisible();
+  await item.click();
  await expect(page.getByRole('heading', { name: 'Verifiable Claim Details' })).toBeVisible();
  await expect(page.getByText(finalTitle, { exact: true })).toBeVisible();
@@ -1 +1 @@
 .19.0
 .18.1