fix: (ios) ITSAppUsesNonExemptEncryption set to NO and staging envoir…

…oment (#523)
ForkbombEu · Nov 21, 2024 · 962f9ab · 962f9ab
1 parent 1def8b0
commit 962f9ab
Show file tree

Hide file tree

Showing 7 changed files with 7,472 additions and 5,857 deletions.
diff --git a/.github/workflows/build-upload-ios.yml b/.github/workflows/build-upload-ios.yml
@@ -7,6 +7,7 @@ on:
 jobs:
   build_ios:
     runs-on: macOS-latest
+    environment: test
     steps:
       - uses: dyne/pnpm@main
         with:

diff --git a/capacitor.config.ts b/capacitor.config.ts
@@ -4,15 +4,18 @@ const config: CapacitorConfig = {
 	appId: 'com.didroom.wallet',
 	appName: 'DIDroom',
 	webDir: 'build',
-	// Note – This breaks the app
-	// plugins: {
-	// 	// CapacitorHttp: {
-	// 	// 	enabled: true
-	// 	// }
-	// },
+	plugins: {
+		CapacitorHttp: {
+			enabled: true
+		}
+	},
 	server: {
 		androidScheme: 'https',
-		cleartext: true
+		cleartext: true,
+		allowNavigation: ['staging.admin.didroom.com']
+	},
+	ios: {
+		scheme: 'Didroom'
 	}
 };
 

diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist
@@ -4,6 +4,8 @@
 <dict>
 	<key>NSFaceIDUsageDescription</key>
 	<string>For a secure log in.</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<string>NO</string>
 	<key>NSCameraUsageDescription</key>
 	<string>The app enables the scanning of various barcodes.</string>
 	<key>NSPhotoLibraryUsageDescription</key>

diff --git a/ios/App/Podfile b/ios/App/Podfile
@@ -12,9 +12,9 @@ def capacitor_pods
   pod 'Capacitor', :path => '../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/ios'
   pod 'AparajitaCapacitorBiometricAuth', :path => '../../node_modules/.pnpm/@[email protected]/node_modules/@aparajita/capacitor-biometric-auth'
-  pod 'CapacitorMlkitBarcodeScanning', :path => '../../node_modules/.pnpm/@capacitor-mlkit+barcode-scanning@6.1.0_@[email protected]/node_modules/@capacitor-mlkit/barcode-scanning'
+  pod 'CapacitorMlkitBarcodeScanning', :path => '../../node_modules/.pnpm/@capacitor-mlkit+barcode-scanning@6.2.0_@[email protected]/node_modules/@capacitor-mlkit/barcode-scanning'
   pod 'CapacitorApp', :path => '../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/app'
-  pod 'CapacitorCamera', :path => '../../node_modules/.pnpm/@capacitor+camera@6.0.2_@[email protected]/node_modules/@capacitor/camera'
+  pod 'CapacitorCamera', :path => '../../node_modules/.pnpm/@capacitor+camera@6.1.0_@[email protected]/node_modules/@capacitor/camera'
   pod 'CapacitorClipboard', :path => '../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/clipboard'
   pod 'CapacitorDevice', :path => '../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/device'
   pod 'CapacitorFilesystem', :path => '../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/filesystem'
@@ -32,4 +32,10 @@ end
 
 post_install do |installer|
   assertDeploymentTarget(installer)
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+        config.build_settings['ONLY_ACTIVE_ARCH'] = 'NO'
+        config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'arm64'
+    end
+  end
 end
diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock
@@ -5,7 +5,7 @@ PODS:
     - CapacitorCordova
   - CapacitorApp (6.0.1):
     - Capacitor
-  - CapacitorCamera (6.0.2):
+  - CapacitorCamera (6.1.0):
     - Capacitor
   - CapacitorClipboard (6.0.1):
     - Capacitor
@@ -18,7 +18,7 @@ PODS:
     - Capacitor
   - CapacitorKeyboard (6.0.2):
     - Capacitor
-  - CapacitorMlkitBarcodeScanning (6.1.0):
+  - CapacitorMlkitBarcodeScanning (6.2.0):
     - Capacitor
     - GoogleMLKit/BarcodeScanning (= 5.0.0)
   - CapacitorNativeSettings (6.0.1):
@@ -90,14 +90,14 @@ DEPENDENCIES:
   - "AparajitaCapacitorBiometricAuth (from `../../node_modules/.pnpm/@[email protected]/node_modules/@aparajita/capacitor-biometric-auth`)"
   - "Capacitor (from `../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/ios`)"
   - "CapacitorApp (from `../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/app`)"
-  - "CapacitorCamera (from `../../node_modules/.pnpm/@capacitor+camera@6.0.2_@[email protected]/node_modules/@capacitor/camera`)"
+  - "CapacitorCamera (from `../../node_modules/.pnpm/@capacitor+camera@6.1.0_@[email protected]/node_modules/@capacitor/camera`)"
   - "CapacitorClipboard (from `../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/clipboard`)"
   - "CapacitorCordova (from `../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/ios`)"
   - "CapacitorDevice (from `../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/device`)"
   - "CapacitorFilesystem (from `../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/filesystem`)"
   - "CapacitorHaptics (from `../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/haptics`)"
   - "CapacitorKeyboard (from `../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/keyboard`)"
-  - "CapacitorMlkitBarcodeScanning (from `../../node_modules/.pnpm/@capacitor-mlkit+barcode-scanning@6.1.0_@[email protected]/node_modules/@capacitor-mlkit/barcode-scanning`)"
+  - "CapacitorMlkitBarcodeScanning (from `../../node_modules/.pnpm/@capacitor-mlkit+barcode-scanning@6.2.0_@[email protected]/node_modules/@capacitor-mlkit/barcode-scanning`)"
   - "CapacitorNativeSettings (from `../../node_modules/.pnpm/[email protected]_@[email protected]/node_modules/capacitor-native-settings`)"
   - "CapacitorPreferences (from `../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/preferences`)"
   - "CapacitorStatusBar (from `../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/status-bar`)"
@@ -125,7 +125,7 @@ EXTERNAL SOURCES:
   CapacitorApp:
     :path: "../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/app"
   CapacitorCamera:
-    :path: "../../node_modules/.pnpm/@capacitor+camera@6.0.2_@[email protected]/node_modules/@capacitor/camera"
+    :path: "../../node_modules/.pnpm/@capacitor+camera@6.1.0_@[email protected]/node_modules/@capacitor/camera"
   CapacitorClipboard:
     :path: "../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/clipboard"
   CapacitorCordova:
@@ -139,7 +139,7 @@ EXTERNAL SOURCES:
   CapacitorKeyboard:
     :path: "../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/keyboard"
   CapacitorMlkitBarcodeScanning:
-    :path: "../../node_modules/.pnpm/@capacitor-mlkit+barcode-scanning@6.1.0_@[email protected]/node_modules/@capacitor-mlkit/barcode-scanning"
+    :path: "../../node_modules/.pnpm/@capacitor-mlkit+barcode-scanning@6.2.0_@[email protected]/node_modules/@capacitor-mlkit/barcode-scanning"
   CapacitorNativeSettings:
     :path: "../../node_modules/.pnpm/[email protected]_@[email protected]/node_modules/capacitor-native-settings"
   CapacitorPreferences:
@@ -151,14 +151,14 @@ SPEC CHECKSUMS:
   AparajitaCapacitorBiometricAuth: c058563fe00160e12b022341e11b3181357ea93a
   Capacitor: 69c7f687aabb8d85e543497411e40638b5cc08c0
   CapacitorApp: f51c08c64df914fc934239fd1b3fc809d62a02f6
-  CapacitorCamera: 65a0d1235114a6a5042e664d6da8d213927f7aa0
+  CapacitorCamera: c2924acc75205066d2282b799a31f6eab35a28a1
   CapacitorClipboard: 0ceeee488e55bef7cced5c8097d97f330c109f61
   CapacitorCordova: f48c89f96c319101cd2f0ce8a2b7449b5fb8b3dd
   CapacitorDevice: da1884f895e17992648b27f6c8ee2be72cd0ce2e
   CapacitorFilesystem: 30941c0fea0773fcaedab18e262b339f5b9c06bc
   CapacitorHaptics: 05d33e20e394b1977dfd2a00a2621e04098164c1
   CapacitorKeyboard: 5bf4458dd989b56a60ea15c92cbca5fbfae6e9f9
-  CapacitorMlkitBarcodeScanning: e4794543a1341f8ea1bafccf03b2d5ded8300a27
+  CapacitorMlkitBarcodeScanning: 7652be9c7922f39203a361de735d340ae37e134e
   CapacitorNativeSettings: 7669610adda7b2747fecab7c5e1b6329520d8914
   CapacitorPreferences: 997d375b1962f98511e8b3d27a24d90cb8ca87fe
   CapacitorStatusBar: 9ed7f06318fd436917072a9bf60fda56d12c8bdb
@@ -175,6 +175,6 @@ SPEC CHECKSUMS:
   nanopb: 438bc412db1928dac798aa6fd75726007be04262
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
 
-PODFILE CHECKSUM: 3980fd120b3fe36094fea39f3c379589c7058657
+PODFILE CHECKSUM: b0fa32a01b02e5885614206ebeb189510b2df41f
 
 COCOAPODS: 1.13.0