From 6161ec393c0b2cedef52e264e057f3fd9be400aa Mon Sep 17 00:00:00 2001 From: Bryan Hu Date: Sat, 24 Feb 2024 16:01:49 -0800 Subject: [PATCH] LOL IT BUILDS --- apps/WarriorHappy/app.json | 10 ++- apps/WarriorHappy/ios/Podfile.lock | 18 +++++ .../WarriorHappy.xcodeproj/project.pbxproj | 70 +++++++++++-------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 +++ apps/WarriorHappy/ios/WarriorHappy/Info.plist | 6 +- apps/WarriorHappy/package.json | 6 +- apps/expo/ios/Podfile.lock | 4 +- .../WarriorHappy.xcodeproj/project.pbxproj | 10 ++- pnpm-lock.yaml | 23 ++++-- tsconfig.json | 4 ++ 10 files changed, 117 insertions(+), 42 deletions(-) create mode 100644 apps/WarriorHappy/ios/WarriorHappy.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 tsconfig.json diff --git a/apps/WarriorHappy/app.json b/apps/WarriorHappy/app.json index 9b544fc..23b7d46 100644 --- a/apps/WarriorHappy/app.json +++ b/apps/WarriorHappy/app.json @@ -2,7 +2,7 @@ "expo": { "name": "WarriorHappy", "slug": "WarriorHappy", - "version": "3.0.1", + "version": "3.0.3", "orientation": "portrait", "icon": "./assets/images/icon.png", "scheme": "myapp", @@ -17,7 +17,10 @@ ], "ios": { "supportsTablet": true, - "bundleIdentifier": "com.warriorborgs.WarriorHappy" + "bundleIdentifier": "com.warriorborgs.WarriorHappy", + "config": { + "usesNonExemptEncryption": false + } }, "android": { "adaptiveIcon": { @@ -31,7 +34,8 @@ "favicon": "./assets/images/favicon.png" }, "plugins": [ - "expo-router" + "expo-router", + "expo-secure-store" ], "experiments": { "typedRoutes": true diff --git a/apps/WarriorHappy/ios/Podfile.lock b/apps/WarriorHappy/ios/Podfile.lock index da232f7..4327932 100644 --- a/apps/WarriorHappy/ios/Podfile.lock +++ b/apps/WarriorHappy/ios/Podfile.lock @@ -22,6 +22,8 @@ PODS: - React-NativeModulesApple - React-RCTAppDelegate - ReactCommon/turbomodule/core + - ExpoSecureStore (12.8.1): + - ExpoModulesCore - ExpoSystemUI (2.9.3): - ExpoModulesCore - ExpoWebBrowser (12.8.2): @@ -1085,6 +1087,8 @@ PODS: - React-jsi (= 0.73.4) - React-logger (= 0.73.4) - React-perflogger (= 0.73.4) + - RNFlashList (1.6.3): + - React-Core - RNReanimated (3.7.1): - glog - RCT-Folly (= 2022.05.16.00) @@ -1094,6 +1098,8 @@ PODS: - glog - RCT-Folly (= 2022.05.16.00) - React-Core + - RNSVG (14.1.0): + - React-Core - SocketRocket (0.6.1) - Yoga (1.14.0) @@ -1108,6 +1114,7 @@ DEPENDENCIES: - ExpoHead (from `../../../node_modules/expo-router/ios`) - ExpoKeepAwake (from `../../../node_modules/expo-keep-awake/ios`) - ExpoModulesCore (from `../../../node_modules/expo-modules-core`) + - ExpoSecureStore (from `../../../node_modules/expo-secure-store/ios`) - ExpoSystemUI (from `../../../node_modules/expo-system-ui/ios`) - ExpoWebBrowser (from `../../../node_modules/expo-web-browser/ios`) - EXSplashScreen (from `../../../node_modules/expo-splash-screen/ios`) @@ -1160,8 +1167,10 @@ DEPENDENCIES: - React-runtimescheduler (from `../../../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`) - React-utils (from `../../../node_modules/react-native/ReactCommon/react/utils`) - ReactCommon/turbomodule/core (from `../../../node_modules/react-native/ReactCommon`) + - "RNFlashList (from `../../../node_modules/@shopify/flash-list`)" - RNReanimated (from `../../../node_modules/react-native-reanimated`) - RNScreens (from `../../../node_modules/react-native-screens`) + - RNSVG (from `../../../node_modules/react-native-svg`) - Yoga (from `../../../node_modules/react-native/ReactCommon/yoga`) SPEC REPOS: @@ -1191,6 +1200,8 @@ EXTERNAL SOURCES: :path: "../../../node_modules/expo-keep-awake/ios" ExpoModulesCore: :path: "../../../node_modules/expo-modules-core" + ExpoSecureStore: + :path: "../../../node_modules/expo-secure-store/ios" ExpoSystemUI: :path: "../../../node_modules/expo-system-ui/ios" ExpoWebBrowser: @@ -1290,10 +1301,14 @@ EXTERNAL SOURCES: :path: "../../../node_modules/react-native/ReactCommon/react/utils" ReactCommon: :path: "../../../node_modules/react-native/ReactCommon" + RNFlashList: + :path: "../../../node_modules/@shopify/flash-list" RNReanimated: :path: "../../../node_modules/react-native-reanimated" RNScreens: :path: "../../../node_modules/react-native-screens" + RNSVG: + :path: "../../../node_modules/react-native-svg" Yoga: :path: "../../../node_modules/react-native/ReactCommon/yoga" @@ -1308,6 +1323,7 @@ SPEC CHECKSUMS: ExpoHead: 5aa4ef0a18a83f323e21cf83ff29b94d3c53e050 ExpoKeepAwake: 0f5cad99603a3268e50af9a6eb8b76d0d9ac956c ExpoModulesCore: 1391529545de72f7f64ecabc7adb912306ab4d34 + ExpoSecureStore: c84ae37d1c36f38524d289c67c3a2e3fc56f1108 ExpoSystemUI: 40e222dd9d52222fe1bce389724ac52e662158dc ExpoWebBrowser: e31c97230ea93b51a2a74c6c2381b0d4fca5698c EXSplashScreen: 39244885abfb1b12765aae89edb90f8c88db6bbd @@ -1359,8 +1375,10 @@ SPEC CHECKSUMS: React-runtimescheduler: ed48e5faac6751e66ee1261c4bd01643b436f112 React-utils: 6e5ad394416482ae21831050928ae27348f83487 ReactCommon: 840a955d37b7f3358554d819446bffcf624b2522 + RNFlashList: 4b4b6b093afc0df60ae08f9cbf6ccd4c836c667a RNReanimated: 4198db10cf9a8a77140d2e8f36dca3fe5fb5e263 RNScreens: b582cb834dc4133307562e930e8fa914b8c04ef2 + RNSVG: ba3e7232f45e34b7b47e74472386cf4e1a676d0a SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Yoga: 1b901a6d6eeba4e8a2e8f308f708691cdb5db312 diff --git a/apps/WarriorHappy/ios/WarriorHappy.xcodeproj/project.pbxproj b/apps/WarriorHappy/ios/WarriorHappy.xcodeproj/project.pbxproj index 200e6c7..665cc2a 100644 --- a/apps/WarriorHappy/ios/WarriorHappy.xcodeproj/project.pbxproj +++ b/apps/WarriorHappy/ios/WarriorHappy.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -11,10 +11,10 @@ 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */; }; - 471B8B8EDB4A4B7F87EB82EE /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86BDC118519402EB5BFC688 /* noop-file.swift */; }; 96905EF65AED1B983A6B3ABC /* libPods-WarriorHappy.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58EEBF8E8E6FB1BC6CAF49B5 /* libPods-WarriorHappy.a */; }; B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */; }; BB2F792D24A3F905000567C9 /* Expo.plist in Resources */ = {isa = PBXBuildFile; fileRef = BB2F792C24A3F905000567C9 /* Expo.plist */; }; + F9D13E3807F34CEAAD60F1E7 /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AB517204C794D25A3189170 /* noop-file.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -24,13 +24,13 @@ 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = WarriorHappy/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = WarriorHappy/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = WarriorHappy/main.m; sourceTree = ""; }; - 4C63BDBCFAFE45198ACC6F0B /* WarriorHappy-Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "WarriorHappy-Bridging-Header.h"; path = "WarriorHappy/WarriorHappy-Bridging-Header.h"; sourceTree = ""; }; 58EEBF8E8E6FB1BC6CAF49B5 /* libPods-WarriorHappy.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-WarriorHappy.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 6AB517204C794D25A3189170 /* noop-file.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = "noop-file.swift"; path = "WarriorHappy/noop-file.swift"; sourceTree = ""; }; 6C2E3173556A471DD304B334 /* Pods-WarriorHappy.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WarriorHappy.debug.xcconfig"; path = "Target Support Files/Pods-WarriorHappy/Pods-WarriorHappy.debug.xcconfig"; sourceTree = ""; }; 7A4D352CD337FB3A3BF06240 /* Pods-WarriorHappy.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WarriorHappy.release.xcconfig"; path = "Target Support Files/Pods-WarriorHappy/Pods-WarriorHappy.release.xcconfig"; sourceTree = ""; }; AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SplashScreen.storyboard; path = WarriorHappy/SplashScreen.storyboard; sourceTree = ""; }; BB2F792C24A3F905000567C9 /* Expo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Expo.plist; sourceTree = ""; }; - C86BDC118519402EB5BFC688 /* noop-file.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = "noop-file.swift"; path = "WarriorHappy/noop-file.swift"; sourceTree = ""; }; + C45DC581F1D14C97A496598E /* WarriorHappy-Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "WarriorHappy-Bridging-Header.h"; path = "WarriorHappy/WarriorHappy-Bridging-Header.h"; 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-WarriorHappy/ExpoModulesProvider.swift"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -57,8 +57,8 @@ 13B07FB61A68108700A75B9A /* Info.plist */, 13B07FB71A68108700A75B9A /* main.m */, AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */, - C86BDC118519402EB5BFC688 /* noop-file.swift */, - 4C63BDBCFAFE45198ACC6F0B /* WarriorHappy-Bridging-Header.h */, + 6AB517204C794D25A3189170 /* noop-file.swift */, + C45DC581F1D14C97A496598E /* WarriorHappy-Bridging-Header.h */, ); name = WarriorHappy; sourceTree = ""; @@ -144,13 +144,13 @@ buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "WarriorHappy" */; buildPhases = ( 08A4A3CD28434E44B6B9DE2E /* [CP] Check Pods Manifest.lock */, - 3AB9CF5D47659028E9C0C65B /* [Expo] Configure project */, + 2F0652F01BF82B113C88D664 /* [Expo] Configure project */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */, - C49171077A7712A72B65822C /* [CP] Embed Pods Frameworks */, + 4328270EA6B5E5BE818D03FE /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -243,7 +243,7 @@ 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; }; - 3AB9CF5D47659028E9C0C65B /* [Expo] Configure project */ = { + 2F0652F01BF82B113C88D664 /* [Expo] Configure project */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 2147483647; @@ -262,42 +262,42 @@ shellPath = /bin/sh; shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-WarriorHappy/expo-configure-project.sh\"\n"; }; - 800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */ = { + 4328270EA6B5E5BE818D03FE /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-WarriorHappy/Pods-WarriorHappy-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", + "${PODS_ROOT}/Target Support Files/Pods-WarriorHappy/Pods-WarriorHappy-frameworks.sh", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes", ); - name = "[CP] Copy Pods Resources"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXConstants.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-WarriorHappy/Pods-WarriorHappy-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-WarriorHappy/Pods-WarriorHappy-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - C49171077A7712A72B65822C /* [CP] Embed Pods Frameworks */ = { + 800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-WarriorHappy/Pods-WarriorHappy-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes", + "${PODS_ROOT}/Target Support Files/Pods-WarriorHappy/Pods-WarriorHappy-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", ); - name = "[CP] Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXConstants.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-WarriorHappy/Pods-WarriorHappy-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-WarriorHappy/Pods-WarriorHappy-resources.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -310,7 +310,7 @@ 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */, 13B07FC11A68108700A75B9A /* main.m in Sources */, B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */, - 471B8B8EDB4A4B7F87EB82EE /* noop-file.swift in Sources */, + F9D13E3807F34CEAAD60F1E7 /* noop-file.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -325,6 +325,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = WarriorHappy/WarriorHappy.entitlements; CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = 774EWR4Y6B; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -332,7 +333,10 @@ ); INFOPLIST_FILE = WarriorHappy/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)", @@ -358,9 +362,13 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = WarriorHappy/WarriorHappy.entitlements; CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = 774EWR4Y6B; INFOPLIST_FILE = WarriorHappy/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)", @@ -426,7 +434,10 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 13.4; - 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; @@ -484,7 +495,10 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 13.4; - 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_CFLAGS = "$(inherited)"; diff --git a/apps/WarriorHappy/ios/WarriorHappy.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/apps/WarriorHappy/ios/WarriorHappy.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/apps/WarriorHappy/ios/WarriorHappy.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/apps/WarriorHappy/ios/WarriorHappy/Info.plist b/apps/WarriorHappy/ios/WarriorHappy/Info.plist index 2aa242e..b2ae3ae 100644 --- a/apps/WarriorHappy/ios/WarriorHappy/Info.plist +++ b/apps/WarriorHappy/ios/WarriorHappy/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 3.0.1 + 3.0.3 CFBundleSignature ???? CFBundleURLTypes @@ -34,6 +34,8 @@ CFBundleVersion 1 + ITSAppUsesNonExemptEncryption + LSRequiresIPhoneOS NSAppTransportSecurity @@ -43,6 +45,8 @@ NSAllowsLocalNetworking + NSFaceIDUsageDescription + Allow $(PRODUCT_NAME) to access your Face ID biometric data. NSUserActivityTypes $(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route diff --git a/apps/WarriorHappy/package.json b/apps/WarriorHappy/package.json index 6a0db82..9b7fabd 100644 --- a/apps/WarriorHappy/package.json +++ b/apps/WarriorHappy/package.json @@ -1,7 +1,7 @@ { "name": "warriorhappy", "main": "index.ts", - "version": "3.0.1", + "version": "3.0.3", "scripts": { "start": "expo start", "android": "expo run:android", @@ -15,13 +15,16 @@ "dependencies": { "@acme/api": "workspace:^", "@acme/tamagui-config": "workspace:^", + "@expo/metro-runtime": "~3.1.3", "@expo/vector-icons": "^14.0.0", "@react-navigation/native": "^6.0.2", + "@shopify/flash-list": "1.6.3", "expo": "~50.0.7", "expo-crypto": "^12.8.1", "expo-font": "~11.10.3", "expo-linking": "~6.2.2", "expo-router": "~3.4.7", + "expo-secure-store": "~12.8.1", "expo-splash-screen": "~0.26.4", "expo-status-bar": "~1.11.1", "expo-system-ui": "~2.9.3", @@ -33,6 +36,7 @@ "react-native-reanimated": "^3.6.3", "react-native-safe-area-context": "4.8.2", "react-native-screens": "~3.29.0", + "react-native-svg": "^14.1.0", "react-native-web": "~0.19.6", "superjson": "2.2.1", "tailwindcss": "3.4.1", diff --git a/apps/expo/ios/Podfile.lock b/apps/expo/ios/Podfile.lock index daabeb2..011e705 100644 --- a/apps/expo/ios/Podfile.lock +++ b/apps/expo/ios/Podfile.lock @@ -1224,7 +1224,7 @@ DEPENDENCIES: - ReactCommon/turbomodule/core (from `../../../node_modules/react-native/ReactCommon`) - "RNFlashList (from `../../../node_modules/@shopify/flash-list`)" - RNGestureHandler (from `../../../node_modules/react-native-gesture-handler`) - - RNReanimated (from `../../../node_modules/react-native-reanimated`) + - RNReanimated (from `../node_modules/react-native-reanimated`) - RNScreens (from `../../../node_modules/react-native-screens`) - "RNSentry (from `../../../node_modules/@sentry/react-native`)" - RNSVG (from `../../../node_modules/react-native-svg`) @@ -1376,7 +1376,7 @@ EXTERNAL SOURCES: RNGestureHandler: :path: "../../../node_modules/react-native-gesture-handler" RNReanimated: - :path: "../../../node_modules/react-native-reanimated" + :path: "../node_modules/react-native-reanimated" RNScreens: :path: "../../../node_modules/react-native-screens" RNSentry: diff --git a/apps/expo/ios/WarriorHappy.xcodeproj/project.pbxproj b/apps/expo/ios/WarriorHappy.xcodeproj/project.pbxproj index 39e8715..e91e4cc 100644 --- a/apps/expo/ios/WarriorHappy.xcodeproj/project.pbxproj +++ b/apps/expo/ios/WarriorHappy.xcodeproj/project.pbxproj @@ -458,7 +458,10 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "$(inherited)"; OTHER_CPLUSPLUSFLAGS = "$(inherited)"; - OTHER_LDFLAGS = "$(inherited) "; + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; @@ -526,7 +529,10 @@ MTL_ENABLE_DEBUG_INFO = NO; OTHER_CFLAGS = "$(inherited)"; OTHER_CPLUSPLUSFLAGS = "$(inherited)"; - OTHER_LDFLAGS = "$(inherited) "; + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 44505c7..15d0989 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -51,12 +51,18 @@ importers: '@acme/tamagui-config': specifier: workspace:^ version: link:../../tooling/tamagui + '@expo/metro-runtime': + specifier: ~3.1.3 + version: 3.1.3(react-native@0.73.4) '@expo/vector-icons': specifier: ^14.0.0 version: 14.0.0 '@react-navigation/native': specifier: ^6.0.2 version: 6.1.10(react-native@0.73.4)(react@18.2.0) + '@shopify/flash-list': + specifier: 1.6.3 + version: 1.6.3(@babel/runtime@7.23.9)(react-native@0.73.4)(react@18.2.0) expo: specifier: ~50.0.7 version: 50.0.7(@babel/core@7.23.9)(@react-native/babel-preset@0.73.21) @@ -72,6 +78,9 @@ importers: expo-router: specifier: ~3.4.7 version: 3.4.7(expo-constants@15.4.5)(expo-linking@6.2.2)(expo-modules-autolinking@1.10.3)(expo-status-bar@1.11.1)(expo@50.0.7)(react-dom@18.2.0)(react-native-reanimated@3.7.1)(react-native-safe-area-context@4.8.2)(react-native-screens@3.29.0)(react-native@0.73.4)(react@18.2.0) + expo-secure-store: + specifier: ~12.8.1 + version: 12.8.1(expo@50.0.7) expo-splash-screen: specifier: ~0.26.4 version: 0.26.4(expo-modules-autolinking@1.10.3)(expo@50.0.7) @@ -85,8 +94,8 @@ importers: specifier: ~12.8.2 version: 12.8.2(expo@50.0.7) nativewind: - specifier: ^4.0.1 - version: 4.0.36(@babel/core@7.23.9)(react-native-reanimated@3.7.1)(react-native-safe-area-context@4.8.2)(react-native@0.73.4)(react@18.2.0)(tailwindcss@3.4.1) + specifier: 4.0.36 + version: 4.0.36(@babel/core@7.23.9)(react-native-reanimated@3.7.1)(react-native-safe-area-context@4.8.2)(react-native-svg@14.1.0)(react-native@0.73.4)(react@18.2.0)(tailwindcss@3.4.1) react: specifier: ^18.2.0 version: 18.2.0 @@ -105,6 +114,9 @@ importers: react-native-screens: specifier: ~3.29.0 version: 3.29.0(react-native@0.73.4)(react@18.2.0) + react-native-svg: + specifier: ^14.1.0 + version: 14.1.0(react-native@0.73.4)(react@18.2.0) react-native-web: specifier: ~0.19.6 version: 0.19.10(react-dom@18.2.0)(react@18.2.0) @@ -13783,13 +13795,13 @@ packages: - supports-color dev: false - /nativewind@4.0.36(@babel/core@7.23.9)(react-native-reanimated@3.7.1)(react-native-safe-area-context@4.8.2)(react-native@0.73.4)(react@18.2.0)(tailwindcss@3.4.1): + /nativewind@4.0.36(@babel/core@7.23.9)(react-native-reanimated@3.7.1)(react-native-safe-area-context@4.8.2)(react-native-svg@14.1.0)(react-native@0.73.4)(react@18.2.0)(tailwindcss@3.4.1): resolution: {integrity: sha512-nd0Xgjzaq0ISvUAjibZXcuSvvpX1BGX2mfOGBPZpjGfHL3By6fwLGsNhrKU6mi2FF30c+kdok3e2I4k/O0UO1Q==} engines: {node: '>=16'} peerDependencies: tailwindcss: '>3.3.0' dependencies: - react-native-css-interop: 0.0.36(@babel/core@7.23.9)(react-native-reanimated@3.7.1)(react-native-safe-area-context@4.8.2)(react-native@0.73.4)(react@18.2.0)(tailwindcss@3.4.1) + react-native-css-interop: 0.0.36(@babel/core@7.23.9)(react-native-reanimated@3.7.1)(react-native-safe-area-context@4.8.2)(react-native-svg@14.1.0)(react-native@0.73.4)(react@18.2.0)(tailwindcss@3.4.1) tailwindcss: 3.4.1 transitivePeerDependencies: - '@babel/core' @@ -15086,7 +15098,7 @@ packages: - supports-color dev: false - /react-native-css-interop@0.0.36(@babel/core@7.23.9)(react-native-reanimated@3.7.1)(react-native-safe-area-context@4.8.2)(react-native@0.73.4)(react@18.2.0)(tailwindcss@3.4.1): + /react-native-css-interop@0.0.36(@babel/core@7.23.9)(react-native-reanimated@3.7.1)(react-native-safe-area-context@4.8.2)(react-native-svg@14.1.0)(react-native@0.73.4)(react@18.2.0)(tailwindcss@3.4.1): resolution: {integrity: sha512-ZWoKQlq6XrI5DB4BdPk5ABvJQsX7zls1SQYWuYXOQB8u5QE0KH3OfOGAGRZPekTjgkhjqGO4Bf8G2JTSWAYMSg==} engines: {node: '>=18'} peerDependencies: @@ -15111,6 +15123,7 @@ packages: react-native: 0.73.4(@babel/core@7.23.9)(@babel/preset-env@7.23.9)(react@18.2.0) react-native-reanimated: 3.7.1(@babel/core@7.23.9)(@babel/plugin-proposal-nullish-coalescing-operator@7.18.6)(@babel/plugin-proposal-optional-chaining@7.21.0)(@babel/plugin-transform-arrow-functions@7.23.3)(@babel/plugin-transform-shorthand-properties@7.23.3)(@babel/plugin-transform-template-literals@7.23.3)(react-native@0.73.4)(react@18.2.0) react-native-safe-area-context: 4.8.2(react-native@0.73.4)(react@18.2.0) + react-native-svg: 14.1.0(react-native@0.73.4)(react@18.2.0) tailwindcss: 3.4.1 transitivePeerDependencies: - '@babel/core' diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..0e6371f --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,4 @@ +{ + "compilerOptions": {}, + "extends": "expo/tsconfig.base" +}