From 9ed9e09667e49649fe1be6b299dd84b4abace374 Mon Sep 17 00:00:00 2001 From: 0xean <0xean.eth@gmail.com> Date: Fri, 31 May 2024 13:23:56 -0400 Subject: [PATCH 01/12] release 3.1.0 --- ios/Podfile.lock | 78 ++++++++++-- ios/shapeshift.xcodeproj/project.pbxproj | 48 +++++--- ios/shapeshift/Info.plist | 146 +++++++++++------------ 3 files changed, 173 insertions(+), 99 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 346d735..3bb1bcd 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1272,13 +1272,73 @@ PODS: - React-perflogger (= 0.74.1) - React-utils (= 0.74.1) - RNCAsyncStorage (1.23.1): + - DoubleConversion + - glog + - hermes-engine + - RCT-Folly (= 2024.01.01.00) + - RCTRequired + - RCTTypeSafety + - React-Codegen - React-Core + - React-debug + - React-Fabric + - React-featureflags + - React-graphics + - React-ImageManager + - React-NativeModulesApple + - React-RCTFabric + - React-rendererdebug + - React-utils + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - Yoga - RNCClipboard (1.11.1): - React-Core - RNScrypt (1.2.3): - React - - RNSVG (15.2.0): + - RNSVG (15.3.0): + - DoubleConversion + - glog + - hermes-engine + - RCT-Folly (= 2024.01.01.00) + - RCTRequired + - RCTTypeSafety + - React-Codegen + - React-Core + - React-debug + - React-Fabric + - React-featureflags + - React-graphics + - React-ImageManager + - React-NativeModulesApple + - React-RCTFabric + - React-rendererdebug + - React-utils + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - RNSVG/common (= 15.3.0) + - Yoga + - RNSVG/common (15.3.0): + - DoubleConversion + - glog + - hermes-engine + - RCT-Folly (= 2024.01.01.00) + - RCTRequired + - RCTTypeSafety + - React-Codegen - React-Core + - React-debug + - React-Fabric + - React-featureflags + - React-graphics + - React-ImageManager + - React-NativeModulesApple + - React-RCTFabric + - React-rendererdebug + - React-utils + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - Yoga - SocketRocket (0.7.0) - Yoga (0.0.0) @@ -1519,9 +1579,9 @@ SPEC CHECKSUMS: ExpoFont: 690b76008be824e47907f200cb0764870108dfd1 ExpoKeepAwake: 3b8815d9dd1d419ee474df004021c69fdd316d08 ExpoLocalAuthentication: 9e02a56a4cf9868f0052656a93d4c94101a42ed7 - ExpoModulesCore: 4eb2165cde325c8c121d495bb8beb0da9b30c92e + ExpoModulesCore: 521e2ded3d986c46907c7d8ecf28526eca3ef6d6 ExpoSecureStore: 5f6b712785986b54d95a92bd365aabb82a52088e - EXSplashScreen: d439ca817211886dc80a00f3761e3b6d861d7205 + EXSplashScreen: 4e1d5c1b3371f7e72c1f158f04bbba6eb61dbd93 FBLazyVector: 898d14d17bf19e2435cafd9ea2a1033efe445709 fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120 glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2 @@ -1551,17 +1611,17 @@ SPEC CHECKSUMS: React-logger: 7e7403a2b14c97f847d90763af76b84b152b6fce React-Mapbuffer: 11029dcd47c5c9e057a4092ab9c2a8d10a496a33 react-native-get-random-values: 21325b2244dfa6b58878f51f9aa42821e7ba3d06 - react-native-shake: 19cd773446e7bc2b3792493342d722caa09d890e + react-native-shake: 8d690283896bb6718e2fafeb818928569fdf6db6 react-native-simple-crypto: 499ddd9f317932677e50393e58e7a72bca2a86e1 - react-native-webview: 05bae3a03a1e4f59568dfc05286c0ebf8954106c + react-native-webview: 7d3d3247f697c5eeae0a11ef4fb7004ef2e52dd4 React-nativeconfig: b0073a590774e8b35192fead188a36d1dca23dec React-NativeModulesApple: df46ff3e3de5b842b30b4ca8a6caae6d7c8ab09f React-perflogger: 3d31e0d1e8ad891e43a09ac70b7b17a79773003a React-RCTActionSheet: c4a3a134f3434c9d7b0c1054f1a8cfed30c7a093 React-RCTAnimation: 0e5d15320eeece667fcceb6c785acf9a184e9da1 - React-RCTAppDelegate: c4f6c0700b8950a8b18c2e004996eec1807d430a + React-RCTAppDelegate: 3ab57e497300ec1c54b798ba2d0834ee048229f4 React-RCTBlob: c46aaaee693d371a1c7cae2a8c8ee2aa7fbc1adb - React-RCTFabric: 0dbf28ce96c7f2843483e32a725a5b5793584ff3 + React-RCTFabric: 82f15dc5a981288bfa806545f943cbd18e794ad7 React-RCTImage: a04dba5fcc823244f5822192c130ecf09623a57f React-RCTLinking: 533bf13c745fcb2a0c14e0e49fd149586a7f0d14 React-RCTNetwork: a29e371e0d363d7b4c10ab907bc4d6ae610541e9 @@ -1577,10 +1637,10 @@ SPEC CHECKSUMS: React-runtimescheduler: e2152ed146b6a35c07386fc2ac4827b27e6aad12 React-utils: 3285151c9d1e3a28a9586571fc81d521678c196d ReactCommon: f42444e384d82ab89184aed5d6f3142748b54768 - RNCAsyncStorage: 826b603ae9c0f88b5ac4e956801f755109fa4d5c + RNCAsyncStorage: f2add1326156dc313df59d855c11f459059e4ffd RNCClipboard: 2834e1c4af68697089cdd455ee4a4cdd198fa7dd RNScrypt: 2dcfcc34960afb8836c947b0510167a18ebb0a5a - RNSVG: 43b64ed39c14ce830d840903774154ca0c1f27ec + RNSVG: 7b44aa4df2587946e28496adf2e10a16f08c1250 SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d Yoga: b9a182ab00cf25926e7f79657d08c5d23c2d03b0 diff --git a/ios/shapeshift.xcodeproj/project.pbxproj b/ios/shapeshift.xcodeproj/project.pbxproj index ba9e159..562fdca 100644 --- a/ios/shapeshift.xcodeproj/project.pbxproj +++ b/ios/shapeshift.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -331,6 +331,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = ShapeShift/ShapeShift.entitlements; CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = 7882V35EPB; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -338,7 +339,10 @@ ); INFOPLIST_FILE = ShapeShift/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); MARKETING_VERSION = 1.0; OTHER_LDFLAGS = ( "$(inherited)", @@ -347,11 +351,14 @@ ); OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = com.shapeShift.shapeShift; - PRODUCT_NAME = "ShapeShift"; + PRODUCT_NAME = ShapeShift; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_OBJC_BRIDGING_HEADER = "ShapeShift/ShapeShift-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1"; + TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -364,9 +371,13 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = ShapeShift/ShapeShift.entitlements; CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = 7882V35EPB; INFOPLIST_FILE = ShapeShift/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); MARKETING_VERSION = 1.0; OTHER_LDFLAGS = ( "$(inherited)", @@ -375,10 +386,13 @@ ); OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; PRODUCT_BUNDLE_IDENTIFIER = com.shapeShift.shapeShift; - PRODUCT_NAME = "ShapeShift"; + PRODUCT_NAME = ShapeShift; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_OBJC_BRIDGING_HEADER = "ShapeShift/ShapeShift-Bridging-Header.h"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1"; + TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; @@ -435,14 +449,14 @@ IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD = ""; LDPLUSPLUS = ""; - LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; + LD_RUNPATH_SEARCH_PATHS = ( + /usr/lib/swift, + "$(inherited)", + ); LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\""; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = ( - "$(inherited)", - " ", - ); + OTHER_LDFLAGS = "$(inherited) "; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; @@ -494,13 +508,13 @@ IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD = ""; LDPLUSPLUS = ""; - LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; - LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\""; - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_LDFLAGS = ( + LD_RUNPATH_SEARCH_PATHS = ( + /usr/lib/swift, "$(inherited)", - " ", ); + LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\""; + MTL_ENABLE_DEBUG_INFO = NO; + OTHER_LDFLAGS = "$(inherited) "; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; diff --git a/ios/shapeshift/Info.plist b/ios/shapeshift/Info.plist index b9de42b..6972ca0 100644 --- a/ios/shapeshift/Info.plist +++ b/ios/shapeshift/Info.plist @@ -1,76 +1,76 @@ - - CADisableMinimumFrameDurationOnPhone - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - ShapeShift - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 3.0.0 - CFBundleSignature - ???? - CFBundleURLTypes - - - CFBundleURLSchemes - - com.shapeShift.shapeShift - - - - CFBundleVersion - 1 - LSRequiresIPhoneOS - - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - NSAllowsLocalNetworking - - - NSFaceIDUsageDescription - Allow $(PRODUCT_NAME) to use Face ID - UILaunchStoryboardName - SplashScreen - UIRequiredDeviceCapabilities - - arm64 - - UIRequiresFullScreen - - UIStatusBarStyle - UIStatusBarStyleDefault - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIUserInterfaceStyle - Light - UIViewControllerBasedStatusBarAppearance - - - \ No newline at end of file + + CADisableMinimumFrameDurationOnPhone + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + ShapeShift + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 3.1.0 + CFBundleSignature + ???? + CFBundleURLTypes + + + CFBundleURLSchemes + + com.shapeShift.shapeShift + + + + CFBundleVersion + 1 + LSRequiresIPhoneOS + + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + NSAllowsLocalNetworking + + + NSFaceIDUsageDescription + Allow $(PRODUCT_NAME) to use Face ID + UILaunchStoryboardName + SplashScreen + UIRequiredDeviceCapabilities + + arm64 + + UIRequiresFullScreen + + UIStatusBarStyle + UIStatusBarStyleDefault + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIUserInterfaceStyle + Light + UIViewControllerBasedStatusBarAppearance + + + From 2cc630caf8d7948371b822220b7bc3b09f292da4 Mon Sep 17 00:00:00 2001 From: 0xean <0xean.eth@gmail.com> Date: Mon, 3 Jun 2024 11:51:40 -0400 Subject: [PATCH 02/12] fix android versions and buids --- android/app/build.gradle | 4 ++-- android/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 4f6c440..1170489 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -88,8 +88,8 @@ android { applicationId 'com.shapeshift.droid_shapeshift' minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "3.0.0" + versionCode 324 + versionName "3.1.0" } signingConfigs { debug { diff --git a/android/build.gradle b/android/build.gradle index cb48c14..05f2cbe 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { buildToolsVersion = "34.0.0" - minSdkVersion = 33 + minSdkVersion = 23 compileSdkVersion = 34 targetSdkVersion = 34 kotlinVersion = '1.9.23' From 1a61db3644df9c8424c0ec6abf1bd57b52cf9bfb Mon Sep 17 00:00:00 2001 From: 0xean <0xean.eth@gmail.com> Date: Tue, 4 Jun 2024 10:42:09 -0400 Subject: [PATCH 03/12] versions --- ios/shapeshift.xcodeproj/project.pbxproj | 8 ++++---- ios/shapeshift/Info.plist | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ios/shapeshift.xcodeproj/project.pbxproj b/ios/shapeshift.xcodeproj/project.pbxproj index 562fdca..b85d7e9 100644 --- a/ios/shapeshift.xcodeproj/project.pbxproj +++ b/ios/shapeshift.xcodeproj/project.pbxproj @@ -330,7 +330,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = ShapeShift/ShapeShift.entitlements; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 324; DEVELOPMENT_TEAM = 7882V35EPB; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -343,7 +343,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 3.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -370,7 +370,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = ShapeShift/ShapeShift.entitlements; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 324; DEVELOPMENT_TEAM = 7882V35EPB; INFOPLIST_FILE = ShapeShift/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; @@ -378,7 +378,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 3.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/ios/shapeshift/Info.plist b/ios/shapeshift/Info.plist index 6972ca0..b7ea7f1 100644 --- a/ios/shapeshift/Info.plist +++ b/ios/shapeshift/Info.plist @@ -32,7 +32,7 @@ CFBundleVersion - 1 + 324 LSRequiresIPhoneOS NSAppTransportSecurity From d5471814b9206dc48cc27cb054a2e204c24eb07f Mon Sep 17 00:00:00 2001 From: 0xean <0xean.eth@gmail.com> Date: Tue, 4 Jun 2024 11:43:48 -0400 Subject: [PATCH 04/12] clean build --- android/build.gradle | 10 +- ios/Podfile.lock | 88 ++--------- ios/Podfile.properties.json | 3 +- ios/shapeshift.xcodeproj/project.pbxproj | 124 +++++++-------- .../xcschemes/shapeshift.xcscheme | 2 +- ios/shapeshift/Info.plist | 146 +++++++++--------- package.json | 6 +- yarn.lock | 146 +++++------------- 8 files changed, 192 insertions(+), 333 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 05f2cbe..932bf7b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,11 +2,11 @@ buildscript { ext { - buildToolsVersion = "34.0.0" - minSdkVersion = 23 - compileSdkVersion = 34 - targetSdkVersion = 34 - kotlinVersion = '1.9.23' + buildToolsVersion = findProperty('android.buildToolsVersion') ?: '34.0.0' + minSdkVersion = Integer.parseInt(findProperty('android.minSdkVersion') ?: '23') + compileSdkVersion = Integer.parseInt(findProperty('android.compileSdkVersion') ?: '34') + targetSdkVersion = Integer.parseInt(findProperty('android.targetSdkVersion') ?: '34') + kotlinVersion = findProperty('android.kotlinVersion') ?: '1.9.23' ndkVersion = "26.1.10909125" } diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 3bb1bcd..3bcde45 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -3,19 +3,19 @@ PODS: - DoubleConversion (1.1.6) - EXConstants (16.0.1): - ExpoModulesCore - - Expo (51.0.8): + - Expo (51.0.9): - ExpoModulesCore - ExpoAsset (10.0.6): - ExpoModulesCore - ExpoFileSystem (17.0.1): - ExpoModulesCore - - ExpoFont (12.0.5): + - ExpoFont (12.0.6): - ExpoModulesCore - ExpoKeepAwake (13.0.2): - ExpoModulesCore - ExpoLocalAuthentication (14.0.1): - ExpoModulesCore - - ExpoModulesCore (1.12.11): + - ExpoModulesCore (1.12.12): - DoubleConversion - glog - hermes-engine @@ -1272,73 +1272,13 @@ PODS: - React-perflogger (= 0.74.1) - React-utils (= 0.74.1) - RNCAsyncStorage (1.23.1): - - DoubleConversion - - glog - - hermes-engine - - RCT-Folly (= 2024.01.01.00) - - RCTRequired - - RCTTypeSafety - - React-Codegen - React-Core - - React-debug - - React-Fabric - - React-featureflags - - React-graphics - - React-ImageManager - - React-NativeModulesApple - - React-RCTFabric - - React-rendererdebug - - React-utils - - ReactCommon/turbomodule/bridging - - ReactCommon/turbomodule/core - - Yoga - RNCClipboard (1.11.1): - React-Core - RNScrypt (1.2.3): - React - - RNSVG (15.3.0): - - DoubleConversion - - glog - - hermes-engine - - RCT-Folly (= 2024.01.01.00) - - RCTRequired - - RCTTypeSafety - - React-Codegen - - React-Core - - React-debug - - React-Fabric - - React-featureflags - - React-graphics - - React-ImageManager - - React-NativeModulesApple - - React-RCTFabric - - React-rendererdebug - - React-utils - - ReactCommon/turbomodule/bridging - - ReactCommon/turbomodule/core - - RNSVG/common (= 15.3.0) - - Yoga - - RNSVG/common (15.3.0): - - DoubleConversion - - glog - - hermes-engine - - RCT-Folly (= 2024.01.01.00) - - RCTRequired - - RCTTypeSafety - - React-Codegen + - RNSVG (15.2.0): - React-Core - - React-debug - - React-Fabric - - React-featureflags - - React-graphics - - React-ImageManager - - React-NativeModulesApple - - React-RCTFabric - - React-rendererdebug - - React-utils - - ReactCommon/turbomodule/bridging - - ReactCommon/turbomodule/core - - Yoga - SocketRocket (0.7.0) - Yoga (0.0.0) @@ -1573,15 +1513,15 @@ SPEC CHECKSUMS: boost: d3f49c53809116a5d38da093a8aa78bf551aed09 DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5 EXConstants: 9a008dbf262550884e6280dea95b81b51f65ea6f - Expo: c99f14ca53381d5399b88684c88e20ff7928d3c7 + Expo: 6381470c669c3f31c8ac0ebd8e88686f925146ad ExpoAsset: 9b7433ecc5f1b608ccbb823492e062bde944abd2 ExpoFileSystem: 80bfe850b1f9922c16905822ecbf97acd711dc51 - ExpoFont: 690b76008be824e47907f200cb0764870108dfd1 + ExpoFont: c84702079267ae51161c20bb8b925670907ffa2f ExpoKeepAwake: 3b8815d9dd1d419ee474df004021c69fdd316d08 ExpoLocalAuthentication: 9e02a56a4cf9868f0052656a93d4c94101a42ed7 - ExpoModulesCore: 521e2ded3d986c46907c7d8ecf28526eca3ef6d6 + ExpoModulesCore: 828d63de45d4fbacabe2963fc406a8e9daeed992 ExpoSecureStore: 5f6b712785986b54d95a92bd365aabb82a52088e - EXSplashScreen: 4e1d5c1b3371f7e72c1f158f04bbba6eb61dbd93 + EXSplashScreen: d439ca817211886dc80a00f3761e3b6d861d7205 FBLazyVector: 898d14d17bf19e2435cafd9ea2a1033efe445709 fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120 glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2 @@ -1611,17 +1551,17 @@ SPEC CHECKSUMS: React-logger: 7e7403a2b14c97f847d90763af76b84b152b6fce React-Mapbuffer: 11029dcd47c5c9e057a4092ab9c2a8d10a496a33 react-native-get-random-values: 21325b2244dfa6b58878f51f9aa42821e7ba3d06 - react-native-shake: 8d690283896bb6718e2fafeb818928569fdf6db6 + react-native-shake: 19cd773446e7bc2b3792493342d722caa09d890e react-native-simple-crypto: 499ddd9f317932677e50393e58e7a72bca2a86e1 - react-native-webview: 7d3d3247f697c5eeae0a11ef4fb7004ef2e52dd4 + react-native-webview: 05bae3a03a1e4f59568dfc05286c0ebf8954106c React-nativeconfig: b0073a590774e8b35192fead188a36d1dca23dec React-NativeModulesApple: df46ff3e3de5b842b30b4ca8a6caae6d7c8ab09f React-perflogger: 3d31e0d1e8ad891e43a09ac70b7b17a79773003a React-RCTActionSheet: c4a3a134f3434c9d7b0c1054f1a8cfed30c7a093 React-RCTAnimation: 0e5d15320eeece667fcceb6c785acf9a184e9da1 - React-RCTAppDelegate: 3ab57e497300ec1c54b798ba2d0834ee048229f4 + React-RCTAppDelegate: c4f6c0700b8950a8b18c2e004996eec1807d430a React-RCTBlob: c46aaaee693d371a1c7cae2a8c8ee2aa7fbc1adb - React-RCTFabric: 82f15dc5a981288bfa806545f943cbd18e794ad7 + React-RCTFabric: 0dbf28ce96c7f2843483e32a725a5b5793584ff3 React-RCTImage: a04dba5fcc823244f5822192c130ecf09623a57f React-RCTLinking: 533bf13c745fcb2a0c14e0e49fd149586a7f0d14 React-RCTNetwork: a29e371e0d363d7b4c10ab907bc4d6ae610541e9 @@ -1637,10 +1577,10 @@ SPEC CHECKSUMS: React-runtimescheduler: e2152ed146b6a35c07386fc2ac4827b27e6aad12 React-utils: 3285151c9d1e3a28a9586571fc81d521678c196d ReactCommon: f42444e384d82ab89184aed5d6f3142748b54768 - RNCAsyncStorage: f2add1326156dc313df59d855c11f459059e4ffd + RNCAsyncStorage: 826b603ae9c0f88b5ac4e956801f755109fa4d5c RNCClipboard: 2834e1c4af68697089cdd455ee4a4cdd198fa7dd RNScrypt: 2dcfcc34960afb8836c947b0510167a18ebb0a5a - RNSVG: 7b44aa4df2587946e28496adf2e10a16f08c1250 + RNSVG: 43b64ed39c14ce830d840903774154ca0c1f27ec SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d Yoga: b9a182ab00cf25926e7f79657d08c5d23c2d03b0 diff --git a/ios/Podfile.properties.json b/ios/Podfile.properties.json index 417e2e5..de9f7b7 100644 --- a/ios/Podfile.properties.json +++ b/ios/Podfile.properties.json @@ -1,5 +1,4 @@ { "expo.jsEngine": "hermes", - "EX_DEV_CLIENT_NETWORK_INSPECTOR": "true", - "newArchEnabled": "true" + "EX_DEV_CLIENT_NETWORK_INSPECTOR": "true" } diff --git a/ios/shapeshift.xcodeproj/project.pbxproj b/ios/shapeshift.xcodeproj/project.pbxproj index b85d7e9..484b228 100644 --- a/ios/shapeshift.xcodeproj/project.pbxproj +++ b/ios/shapeshift.xcodeproj/project.pbxproj @@ -3,16 +3,16 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; + 2413BC6B09834F8AAA6F5B18 /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2587012716BF472EB7147CB7 /* noop-file.swift */; }; 3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */; }; 96905EF65AED1B983A6B3ABC /* libPods-ShapeShift.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58EEBF8E8E6FB1BC6CAF49B5 /* libPods-ShapeShift.a */; }; - A5A10C92238148488313494F /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7BA3575336A480F80388479 /* noop-file.swift */; }; B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */; }; BB2F792D24A3F905000567C9 /* Expo.plist in Resources */ = {isa = PBXBuildFile; fileRef = BB2F792C24A3F905000567C9 /* Expo.plist */; }; /* End PBXBuildFile section */ @@ -24,13 +24,13 @@ 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = ShapeShift/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ShapeShift/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ShapeShift/main.m; sourceTree = ""; }; - 2BF91E10EE314934B630A91B /* ShapeShift-Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "ShapeShift-Bridging-Header.h"; path = "ShapeShift/ShapeShift-Bridging-Header.h"; sourceTree = ""; }; + 2587012716BF472EB7147CB7 /* noop-file.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = "noop-file.swift"; path = "ShapeShift/noop-file.swift"; sourceTree = ""; }; 58EEBF8E8E6FB1BC6CAF49B5 /* libPods-ShapeShift.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ShapeShift.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 5E4E7CE05C3A49AE9EC48C42 /* ShapeShift-Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "ShapeShift-Bridging-Header.h"; path = "ShapeShift/ShapeShift-Bridging-Header.h"; sourceTree = ""; }; 6C2E3173556A471DD304B334 /* Pods-ShapeShift.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShapeShift.debug.xcconfig"; path = "Target Support Files/Pods-ShapeShift/Pods-ShapeShift.debug.xcconfig"; sourceTree = ""; }; 7A4D352CD337FB3A3BF06240 /* Pods-ShapeShift.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShapeShift.release.xcconfig"; path = "Target Support Files/Pods-ShapeShift/Pods-ShapeShift.release.xcconfig"; sourceTree = ""; }; AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SplashScreen.storyboard; path = ShapeShift/SplashScreen.storyboard; sourceTree = ""; }; BB2F792C24A3F905000567C9 /* Expo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Expo.plist; sourceTree = ""; }; - C7BA3575336A480F80388479 /* noop-file.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = "noop-file.swift"; path = "ShapeShift/noop-file.swift"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-ShapeShift/ExpoModulesProvider.swift"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -57,8 +57,8 @@ 13B07FB61A68108700A75B9A /* Info.plist */, 13B07FB71A68108700A75B9A /* main.m */, AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */, - C7BA3575336A480F80388479 /* noop-file.swift */, - 2BF91E10EE314934B630A91B /* ShapeShift-Bridging-Header.h */, + 2587012716BF472EB7147CB7 /* noop-file.swift */, + 5E4E7CE05C3A49AE9EC48C42 /* ShapeShift-Bridging-Header.h */, ); name = ShapeShift; sourceTree = ""; @@ -144,13 +144,13 @@ buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "ShapeShift" */; buildPhases = ( 08A4A3CD28434E44B6B9DE2E /* [CP] Check Pods Manifest.lock */, - 750048DC4E57C654DBD253A9 /* [Expo] Configure project */, + BD79C445D689BAFC87901F12 /* [Expo] Configure project */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */, - 252033F39A83B125B86E0FED /* [CP] Embed Pods Frameworks */, + BABDFB29B20AEACE75E42ECA /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -243,7 +243,33 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 252033F39A83B125B86E0FED /* [CP] Embed Pods Frameworks */ = { + 800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-ShapeShift/Pods-ShapeShift-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/ExpoConstants_privacy.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/ExpoFileSystem/ExpoFileSystem_privacy.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/RNCAsyncStorage/RNCAsyncStorage_resources.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", + ); + name = "[CP] Copy Pods Resources"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXConstants.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoConstants_privacy.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoFileSystem_privacy.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNCAsyncStorage_resources.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ShapeShift/Pods-ShapeShift-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + BABDFB29B20AEACE75E42ECA /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -261,7 +287,7 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ShapeShift/Pods-ShapeShift-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 750048DC4E57C654DBD253A9 /* [Expo] Configure project */ = { + BD79C445D689BAFC87901F12 /* [Expo] Configure project */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 2147483647; @@ -280,32 +306,6 @@ shellPath = /bin/sh; shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-ShapeShift/expo-configure-project.sh\"\n"; }; - 800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ShapeShift/Pods-ShapeShift-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/ExpoConstants_privacy.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/ExpoFileSystem/ExpoFileSystem_privacy.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/RNCAsyncStorage/RNCAsyncStorage_resources.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXConstants.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoConstants_privacy.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoFileSystem_privacy.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNCAsyncStorage_resources.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ShapeShift/Pods-ShapeShift-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -316,7 +316,7 @@ 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */, 13B07FC11A68108700A75B9A /* main.m in Sources */, B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */, - A5A10C92238148488313494F /* noop-file.swift in Sources */, + 2413BC6B09834F8AAA6F5B18 /* noop-file.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -330,8 +330,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = ShapeShift/ShapeShift.entitlements; - CURRENT_PROJECT_VERSION = 324; - DEVELOPMENT_TEAM = 7882V35EPB; + CURRENT_PROJECT_VERSION = 1; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -339,11 +338,8 @@ ); INFOPLIST_FILE = ShapeShift/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MARKETING_VERSION = 3.1.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MARKETING_VERSION = 1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -352,13 +348,10 @@ OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = com.shapeShift.shapeShift; PRODUCT_NAME = ShapeShift; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; - SUPPORTS_MACCATALYST = NO; - SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_OBJC_BRIDGING_HEADER = "ShapeShift/ShapeShift-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -370,15 +363,11 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = ShapeShift/ShapeShift.entitlements; - CURRENT_PROJECT_VERSION = 324; - DEVELOPMENT_TEAM = 7882V35EPB; + CURRENT_PROJECT_VERSION = 1; INFOPLIST_FILE = ShapeShift/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MARKETING_VERSION = 3.1.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MARKETING_VERSION = 1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -387,12 +376,9 @@ OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; PRODUCT_BUNDLE_IDENTIFIER = com.shapeShift.shapeShift; PRODUCT_NAME = ShapeShift; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; - SUPPORTS_MACCATALYST = NO; - SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_OBJC_BRIDGING_HEADER = "ShapeShift/ShapeShift-Bridging-Header.h"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; @@ -449,14 +435,14 @@ IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD = ""; LDPLUSPLUS = ""; - LD_RUNPATH_SEARCH_PATHS = ( - /usr/lib/swift, - "$(inherited)", - ); + LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\""; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = "$(inherited) "; + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; @@ -508,13 +494,13 @@ IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD = ""; LDPLUSPLUS = ""; - LD_RUNPATH_SEARCH_PATHS = ( - /usr/lib/swift, - "$(inherited)", - ); + LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\""; MTL_ENABLE_DEBUG_INFO = NO; - OTHER_LDFLAGS = "$(inherited) "; + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; diff --git a/ios/shapeshift.xcodeproj/xcshareddata/xcschemes/shapeshift.xcscheme b/ios/shapeshift.xcodeproj/xcshareddata/xcschemes/shapeshift.xcscheme index 7ed343d..30f290b 100644 --- a/ios/shapeshift.xcodeproj/xcshareddata/xcschemes/shapeshift.xcscheme +++ b/ios/shapeshift.xcodeproj/xcshareddata/xcschemes/shapeshift.xcscheme @@ -41,7 +41,7 @@ - - CADisableMinimumFrameDurationOnPhone - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - ShapeShift - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 3.1.0 - CFBundleSignature - ???? - CFBundleURLTypes - - - CFBundleURLSchemes - - com.shapeShift.shapeShift - - - - CFBundleVersion - 324 - LSRequiresIPhoneOS - - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - NSAllowsLocalNetworking - - - NSFaceIDUsageDescription - Allow $(PRODUCT_NAME) to use Face ID - UILaunchStoryboardName - SplashScreen - UIRequiredDeviceCapabilities - - arm64 - - UIRequiresFullScreen - - UIStatusBarStyle - UIStatusBarStyleDefault - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIUserInterfaceStyle - Light - UIViewControllerBasedStatusBarAppearance - - - + + CADisableMinimumFrameDurationOnPhone + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + ShapeShift + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 3.0.0 + CFBundleSignature + ???? + CFBundleURLTypes + + + CFBundleURLSchemes + + com.shapeShift.shapeShift + + + + CFBundleVersion + 1 + LSRequiresIPhoneOS + + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + NSAllowsLocalNetworking + + + NSFaceIDUsageDescription + Allow $(PRODUCT_NAME) to use Face ID + UILaunchStoryboardName + SplashScreen + UIRequiredDeviceCapabilities + + arm64 + + UIRequiresFullScreen + + UIStatusBarStyle + UIStatusBarStyleDefault + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIUserInterfaceStyle + Light + UIViewControllerBasedStatusBarAppearance + + + \ No newline at end of file diff --git a/package.json b/package.json index cf1a0ef..9a3801b 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "@react-native-clipboard/clipboard": "^1.11.1", "@seald-io/react-native-scrypt": "^1.2.3", "bip39": "^3.0.4", - "expo": "~51.0.8", + "expo": "~51.0.9", "expo-local-authentication": "~14.0.1", "expo-secure-store": "~13.0.1", "expo-splash-screen": "~0.27.4", @@ -32,7 +32,7 @@ "react-native-get-random-values": "~1.11.0", "react-native-shake": "latest", "react-native-simple-crypto": "latest", - "react-native-svg": "15.3.0", + "react-native-svg": "15.2.0", "react-native-webview": "13.8.6", "react-singleton-hook": "^4.0.0" }, @@ -46,7 +46,7 @@ "@types/jest": "^28.1.8", "@types/lodash.memoize": "^4.1.7", "@types/lodash.once": "^4.1.7", - "@types/react": "^18.3.3", + "@types/react": "~18.2.79", "@types/react-native": "^0.73.0", "@types/react-test-renderer": "^18.0.0", "@typescript-eslint/eslint-plugin": "^5.38.1", diff --git a/yarn.lock b/yarn.lock index 5506d7d..7357486 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2184,15 +2184,15 @@ __metadata: languageName: node linkType: hard -"@expo/cli@npm:0.18.13": - version: 0.18.13 - resolution: "@expo/cli@npm:0.18.13" +"@expo/cli@npm:0.18.14": + version: 0.18.14 + resolution: "@expo/cli@npm:0.18.14" dependencies: "@babel/runtime": ^7.20.0 "@expo/code-signing-certificates": 0.0.5 - "@expo/config": ~9.0.0 - "@expo/config-plugins": ~8.0.0 - "@expo/devcert": ^1.1.2 + "@expo/config": ~9.0.0-beta.0 + "@expo/config-plugins": ~8.0.0-beta.0 + "@expo/devcert": ^1.0.0 "@expo/env": ~0.3.0 "@expo/image-utils": ^0.5.0 "@expo/json-file": ^8.3.0 @@ -2200,7 +2200,7 @@ __metadata: "@expo/osascript": ^2.0.31 "@expo/package-manager": ^1.5.0 "@expo/plist": ^0.1.0 - "@expo/prebuild-config": 7.0.4 + "@expo/prebuild-config": 7.0.3 "@expo/rudder-sdk-node": 1.1.1 "@expo/spawn-async": ^1.7.2 "@expo/xcpretty": ^4.3.0 @@ -2266,7 +2266,7 @@ __metadata: ws: ^8.12.1 bin: expo-internal: build/bin/cli - checksum: 0bb5966ef9f88e78fa20011a14a584dd22d94c04175c028d0c3246a3a9ce013ecb0def14bdc41842d186063d841d5c37d5a0ccb363d34b62e3b6e103b88e7492 + checksum: b31145834fcd70425b7d0d2a5d37c6461714a8bfb8e5e7ed4e8a2fc127e45a05a247111d6ae079cf50b8945c1f8127df5f64b6ee1d6633101859282f2e2fce11 languageName: node linkType: hard @@ -2280,7 +2280,7 @@ __metadata: languageName: node linkType: hard -"@expo/config-plugins@npm:8.0.4, @expo/config-plugins@npm:~8.0.0, @expo/config-plugins@npm:~8.0.0-beta.0": +"@expo/config-plugins@npm:8.0.4, @expo/config-plugins@npm:~8.0.0-beta.0": version: 8.0.4 resolution: "@expo/config-plugins@npm:8.0.4" dependencies: @@ -2310,26 +2310,7 @@ __metadata: languageName: node linkType: hard -"@expo/config@npm:9.0.2, @expo/config@npm:~9.0.0": - version: 9.0.2 - resolution: "@expo/config@npm:9.0.2" - dependencies: - "@babel/code-frame": ~7.10.4 - "@expo/config-plugins": ~8.0.0 - "@expo/config-types": ^51.0.0-unreleased - "@expo/json-file": ^8.3.0 - getenv: ^1.0.0 - glob: 7.1.6 - require-from-string: ^2.0.2 - resolve-from: ^5.0.0 - semver: ^7.6.0 - slugify: ^1.3.4 - sucrase: 3.34.0 - checksum: 3f452fc4f1970e21bab2f4473e389c4c6cebf5b2b0a0ec884219c17422f12442945727cbef861951fe06909006348a445370c1cfa5d2b11027c44b626d3d9a39 - languageName: node - linkType: hard - -"@expo/config@npm:~9.0.0-beta.0": +"@expo/config@npm:9.0.1, @expo/config@npm:~9.0.0-beta.0": version: 9.0.1 resolution: "@expo/config@npm:9.0.1" dependencies: @@ -2348,7 +2329,7 @@ __metadata: languageName: node linkType: hard -"@expo/devcert@npm:^1.1.2": +"@expo/devcert@npm:^1.0.0": version: 1.1.2 resolution: "@expo/devcert@npm:1.1.2" dependencies: @@ -2411,33 +2392,7 @@ __metadata: languageName: node linkType: hard -"@expo/metro-config@npm:0.18.4": - version: 0.18.4 - resolution: "@expo/metro-config@npm:0.18.4" - dependencies: - "@babel/core": ^7.20.0 - "@babel/generator": ^7.20.5 - "@babel/parser": ^7.20.0 - "@babel/types": ^7.20.0 - "@expo/config": ~9.0.0 - "@expo/env": ~0.3.0 - "@expo/json-file": ~8.3.0 - "@expo/spawn-async": ^1.7.2 - chalk: ^4.1.0 - debug: ^4.3.2 - find-yarn-workspace-root: ~2.0.0 - fs-extra: ^9.1.0 - getenv: ^1.0.0 - glob: ^7.2.3 - jsc-safe-url: ^0.2.4 - lightningcss: ~1.19.0 - postcss: ~8.4.32 - resolve-from: ^5.0.0 - checksum: 39e56f3a3ad1be5b4c0fd8d1c9731c79c1ee36fd404f5a550e76a8eb1f7cde30e6cdd6de3b40cd76cccaf0ebe6a9f63d175ca55f89c76d8fab02dae6a75789ad - languageName: node - linkType: hard - -"@expo/metro-config@npm:~0.18.0": +"@expo/metro-config@npm:0.18.3, @expo/metro-config@npm:~0.18.0": version: 0.18.3 resolution: "@expo/metro-config@npm:0.18.3" dependencies: @@ -2525,27 +2480,6 @@ __metadata: languageName: node linkType: hard -"@expo/prebuild-config@npm:7.0.4": - version: 7.0.4 - resolution: "@expo/prebuild-config@npm:7.0.4" - dependencies: - "@expo/config": ~9.0.0 - "@expo/config-plugins": ~8.0.0 - "@expo/config-types": ^51.0.0-unreleased - "@expo/image-utils": ^0.5.0 - "@expo/json-file": ^8.3.0 - "@react-native/normalize-colors": ~0.74.83 - debug: ^4.3.1 - fs-extra: ^9.0.0 - resolve-from: ^5.0.0 - semver: ^7.6.0 - xml2js: 0.6.0 - peerDependencies: - expo-modules-autolinking: ">=0.8.1" - checksum: 3e27a9fbd49450de66b9cc095c9b473cc2d6875634cba8e83fcc04c4fb71d933fe50e652f319aec79621492e4ce2010719098b2674d972a0660d028dba1be877 - languageName: node - linkType: hard - "@expo/rudder-sdk-node@npm:1.1.1": version: 1.1.1 resolution: "@expo/rudder-sdk-node@npm:1.1.1" @@ -4290,13 +4224,13 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:^18.3.3": - version: 18.3.3 - resolution: "@types/react@npm:18.3.3" +"@types/react@npm:~18.2.79": + version: 18.2.79 + resolution: "@types/react@npm:18.2.79" dependencies: "@types/prop-types": "*" csstype: ^3.0.2 - checksum: c63d6a78163244e2022b01ef79b0baec4fe4da3475dc4a90bb8accefad35ef0c43560fd0312e5974f92a0f1108aa4d669ac72d73d66396aa060ea03b5d2e3873 + checksum: 85aa96e0e88725c84d8fc5f04f10a4da6a1f507dde33557ac9cc211414756867721264bfefd9e02bae1288ce2905351d949b652b931e734ea24519ee5c625138 languageName: node linkType: hard @@ -6946,14 +6880,14 @@ __metadata: languageName: node linkType: hard -"expo-font@npm:~12.0.5": - version: 12.0.5 - resolution: "expo-font@npm:12.0.5" +"expo-font@npm:~12.0.6": + version: 12.0.6 + resolution: "expo-font@npm:12.0.6" dependencies: fontfaceobserver: ^2.1.0 peerDependencies: expo: "*" - checksum: 74284f7aaa809de1432e98090eca61f255c584f1a66e979a8caf435bf6d97f7322c1a6c9428ebb6ce5f4dd20a2987e8ee714a8170cc2782d1f7b87900ccc4b7e + checksum: 9526e9b76f17e7a78a665673abf63aefa2ecbb2f26fd170787611630aaa2d54a60931b8c32e8239e5a945e1ef88989d59adfee431671778e5202ba4fe1a22a37 languageName: node linkType: hard @@ -6992,12 +6926,12 @@ __metadata: languageName: node linkType: hard -"expo-modules-core@npm:1.12.11": - version: 1.12.11 - resolution: "expo-modules-core@npm:1.12.11" +"expo-modules-core@npm:1.12.12": + version: 1.12.12 + resolution: "expo-modules-core@npm:1.12.12" dependencies: invariant: ^2.2.4 - checksum: 7965f8f393e3b68d40334093feebeed9eef8eb9d9ebe4e104895a8cb0c17093ca509392752e2742cc7c55c8c2d209236e8ba6a977208975f2426ee2512fab828 + checksum: a4984b9eca6a45ba02010ca9746bea87864d367ad50ecc98fd390866465e6f952c873c4b672c922bba88a8b1c4a21cb4dc4d1992dbd734b169513e7f96824f31 languageName: node linkType: hard @@ -7021,28 +6955,28 @@ __metadata: languageName: node linkType: hard -"expo@npm:~51.0.8": - version: 51.0.8 - resolution: "expo@npm:51.0.8" +"expo@npm:~51.0.9": + version: 51.0.9 + resolution: "expo@npm:51.0.9" dependencies: "@babel/runtime": ^7.20.0 - "@expo/cli": 0.18.13 - "@expo/config": 9.0.2 + "@expo/cli": 0.18.14 + "@expo/config": 9.0.1 "@expo/config-plugins": 8.0.4 - "@expo/metro-config": 0.18.4 + "@expo/metro-config": 0.18.3 "@expo/vector-icons": ^14.0.0 babel-preset-expo: ~11.0.6 expo-asset: ~10.0.6 expo-file-system: ~17.0.1 - expo-font: ~12.0.5 + expo-font: ~12.0.6 expo-keep-awake: ~13.0.2 expo-modules-autolinking: 1.11.1 - expo-modules-core: 1.12.11 + expo-modules-core: 1.12.12 fbemitter: ^3.0.0 whatwg-url-without-unicode: 8.0.0-3 bin: expo: bin/cli - checksum: 93dc31852855bd85940c220fb5ff30c576e200e09aec6cb0a1b2d28ac1d26fde57d985958ba985a442564c9803541c6f65583a8c37943fbd3e3b82802af7e789 + checksum: 137088f6747058178c3fe50385a85110d155a05be7e98209bec65cac78cfda88979be1b1f95f0efd482950e2900641d7a286c84f2045276c230309890ab40508 languageName: node linkType: hard @@ -11271,16 +11205,16 @@ __metadata: languageName: node linkType: hard -"react-native-svg@npm:15.3.0": - version: 15.3.0 - resolution: "react-native-svg@npm:15.3.0" +"react-native-svg@npm:15.2.0": + version: 15.2.0 + resolution: "react-native-svg@npm:15.2.0" dependencies: css-select: ^5.1.0 css-tree: ^1.1.3 peerDependencies: react: "*" react-native: "*" - checksum: e976878361c100639ab4f9bd2cd042f526b28890cc0052139b36a5ebde44cd3b1a54c6dd3b5e391fe10a998767a994748fc6ee3f1b356154418828d12f98d77a + checksum: 0075d3c5bcf6bbbebe064364ec72c02eeff3fc0f2b1ba127bde26a8ecedc190a7890a910a6a051687318fa80504a3bc335eee2bfd6846b90193ca1608bae821e languageName: node linkType: hard @@ -12084,7 +12018,7 @@ __metadata: "@types/jest": ^28.1.8 "@types/lodash.memoize": ^4.1.7 "@types/lodash.once": ^4.1.7 - "@types/react": ^18.3.3 + "@types/react": ~18.2.79 "@types/react-native": ^0.73.0 "@types/react-test-renderer": ^18.0.0 "@typescript-eslint/eslint-plugin": ^5.38.1 @@ -12098,7 +12032,7 @@ __metadata: eslint-plugin-prettier: ^4.2.1 eslint-plugin-react: ^7.31.8 eslint-plugin-react-native: ^4.0.0 - expo: ~51.0.8 + expo: ~51.0.9 expo-local-authentication: ~14.0.1 expo-secure-store: ~13.0.1 expo-splash-screen: ~0.27.4 @@ -12114,7 +12048,7 @@ __metadata: react-native-get-random-values: ~1.11.0 react-native-shake: latest react-native-simple-crypto: latest - react-native-svg: 15.3.0 + react-native-svg: 15.2.0 react-native-webview: 13.8.6 react-singleton-hook: ^4.0.0 react-test-renderer: 18.2.0 From d7d6bd093bd00e03917e10b94ef683209be188e1 Mon Sep 17 00:00:00 2001 From: 0xean <0xean.eth@gmail.com> Date: Tue, 4 Jun 2024 11:49:24 -0400 Subject: [PATCH 05/12] xcode version --- ios/shapeshift.xcodeproj/project.pbxproj | 40 ++++++++++++++---------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/ios/shapeshift.xcodeproj/project.pbxproj b/ios/shapeshift.xcodeproj/project.pbxproj index 484b228..c5d5756 100644 --- a/ios/shapeshift.xcodeproj/project.pbxproj +++ b/ios/shapeshift.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -330,7 +330,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = ShapeShift/ShapeShift.entitlements; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 325; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -338,8 +338,11 @@ ); INFOPLIST_FILE = ShapeShift/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 3.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -363,11 +366,14 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = ShapeShift/ShapeShift.entitlements; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 325; INFOPLIST_FILE = ShapeShift/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 3.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -435,14 +441,14 @@ IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD = ""; LDPLUSPLUS = ""; - LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; + LD_RUNPATH_SEARCH_PATHS = ( + /usr/lib/swift, + "$(inherited)", + ); LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\""; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = ( - "$(inherited)", - " ", - ); + OTHER_LDFLAGS = "$(inherited) "; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; @@ -494,13 +500,13 @@ IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD = ""; LDPLUSPLUS = ""; - LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; - LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\""; - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_LDFLAGS = ( + LD_RUNPATH_SEARCH_PATHS = ( + /usr/lib/swift, "$(inherited)", - " ", ); + LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\""; + MTL_ENABLE_DEBUG_INFO = NO; + OTHER_LDFLAGS = "$(inherited) "; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; From 7eb44c7434e69b0ab89c623019b534c0c33a000c Mon Sep 17 00:00:00 2001 From: 0xean <0xean.eth@gmail.com> Date: Tue, 4 Jun 2024 11:50:41 -0400 Subject: [PATCH 06/12] SS AG team --- ios/shapeshift.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ios/shapeshift.xcodeproj/project.pbxproj b/ios/shapeshift.xcodeproj/project.pbxproj index c5d5756..fc69a63 100644 --- a/ios/shapeshift.xcodeproj/project.pbxproj +++ b/ios/shapeshift.xcodeproj/project.pbxproj @@ -331,6 +331,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = ShapeShift/ShapeShift.entitlements; CURRENT_PROJECT_VERSION = 325; + DEVELOPMENT_TEAM = 7882V35EPB; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -367,6 +368,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = ShapeShift/ShapeShift.entitlements; CURRENT_PROJECT_VERSION = 325; + DEVELOPMENT_TEAM = 7882V35EPB; INFOPLIST_FILE = ShapeShift/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD_RUNPATH_SEARCH_PATHS = ( From d71a956a320ec00c69977c1675a24b9672986b25 Mon Sep 17 00:00:00 2001 From: 0xean <0xean.eth@gmail.com> Date: Tue, 4 Jun 2024 11:51:42 -0400 Subject: [PATCH 07/12] supported devices --- ios/shapeshift.xcodeproj/project.pbxproj | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ios/shapeshift.xcodeproj/project.pbxproj b/ios/shapeshift.xcodeproj/project.pbxproj index fc69a63..b398054 100644 --- a/ios/shapeshift.xcodeproj/project.pbxproj +++ b/ios/shapeshift.xcodeproj/project.pbxproj @@ -352,10 +352,12 @@ OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = com.shapeShift.shapeShift; PRODUCT_NAME = ShapeShift; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; SWIFT_OBJC_BRIDGING_HEADER = "ShapeShift/ShapeShift-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -384,9 +386,11 @@ OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; PRODUCT_BUNDLE_IDENTIFIER = com.shapeShift.shapeShift; PRODUCT_NAME = ShapeShift; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; SWIFT_OBJC_BRIDGING_HEADER = "ShapeShift/ShapeShift-Bridging-Header.h"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; From 90e2efcabeeb50e73aef76a98fa2364b4f72495b Mon Sep 17 00:00:00 2001 From: 0xean <0xean.eth@gmail.com> Date: Thu, 20 Jun 2024 06:30:47 -0400 Subject: [PATCH 08/12] adds perm for anroid --- android/app/src/main/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index bbcba92..d6372ee 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ + From fe510d74f77218a39235a11c272c257760eb018f Mon Sep 17 00:00:00 2001 From: 0xean <0xean.eth@gmail.com> Date: Thu, 20 Jun 2024 06:45:30 -0400 Subject: [PATCH 09/12] bump build --- android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 1170489..f37ad7e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -88,7 +88,7 @@ android { applicationId 'com.shapeshift.droid_shapeshift' minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 324 + versionCode 328 versionName "3.1.0" } signingConfigs { From 79f81c9581fc83f51d081a5a0d882ed5c9393f28 Mon Sep 17 00:00:00 2001 From: 0xean <0xean.eth@gmail.com> Date: Thu, 20 Jun 2024 07:33:07 -0400 Subject: [PATCH 10/12] ios camera perms --- ios/shapeshift/Info.plist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ios/shapeshift/Info.plist b/ios/shapeshift/Info.plist index b9de42b..45a1fd7 100644 --- a/ios/shapeshift/Info.plist +++ b/ios/shapeshift/Info.plist @@ -44,6 +44,8 @@ NSFaceIDUsageDescription Allow $(PRODUCT_NAME) to use Face ID + NSCameraUsageDescription + Allow $(PRODUCT_NAME) to use Camera UILaunchStoryboardName SplashScreen UIRequiredDeviceCapabilities From 6904a9b8f37879596b72764d5d27b7cbcf6e8a00 Mon Sep 17 00:00:00 2001 From: 0xean <0xean.eth@gmail.com> Date: Thu, 20 Jun 2024 07:37:06 -0400 Subject: [PATCH 11/12] fix tab vs space --- ios/shapeshift/Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/shapeshift/Info.plist b/ios/shapeshift/Info.plist index 45a1fd7..b30273c 100644 --- a/ios/shapeshift/Info.plist +++ b/ios/shapeshift/Info.plist @@ -44,7 +44,7 @@ NSFaceIDUsageDescription Allow $(PRODUCT_NAME) to use Face ID - NSCameraUsageDescription + NSCameraUsageDescription Allow $(PRODUCT_NAME) to use Camera UILaunchStoryboardName SplashScreen From bcea8d0ee7ce3b7ac1b89ca38188c4509e9dfafc Mon Sep 17 00:00:00 2001 From: 0xean <0xean.eth@gmail.com> Date: Thu, 20 Jun 2024 08:03:29 -0400 Subject: [PATCH 12/12] bring back other perms /flaghs --- ios/shapeshift/Info.plist | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ios/shapeshift/Info.plist b/ios/shapeshift/Info.plist index b30273c..4fc0a62 100644 --- a/ios/shapeshift/Info.plist +++ b/ios/shapeshift/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 3.0.0 + 3.1.0 CFBundleSignature ???? CFBundleURLTypes @@ -32,7 +32,7 @@ CFBundleVersion - 1 + 329 LSRequiresIPhoneOS NSAppTransportSecurity @@ -42,10 +42,16 @@ NSAllowsLocalNetworking + ITSAppUsesNonExemptEncryption + NSFaceIDUsageDescription Allow $(PRODUCT_NAME) to use Face ID NSCameraUsageDescription Allow $(PRODUCT_NAME) to use Camera + UIBackgroundModes + + fetch + UILaunchStoryboardName SplashScreen UIRequiredDeviceCapabilities