diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index e8647fb12..e7191a029 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -5,7 +5,7 @@ on: push: branches: [develop, master] pull_request: - branches: [develop, master] + # branches: [develop, master] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -231,8 +231,8 @@ jobs: ios-deploy: runs-on: macos-latest - needs: [test, eslint, typescript, prettier] - if: github.event_name == 'push' && github.ref == 'refs/heads/master' + # needs: [test, eslint, typescript, prettier] + # if: github.event_name == 'push' && github.ref == 'refs/heads/master' steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 @@ -268,6 +268,8 @@ jobs: run: echo -e "machine github.com\n login $CI_USER_TOKEN" >> ~/.netrc env: CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN}} + - name: 🔒 Set correct permissions for .netrc + run: chmod 0600 ~/.netrc - name: Import App Store Connect API Key env: APP_STORE_CONNECT_API_JSON_PAYLOAD: ${{ secrets.APP_STORE_CONNECT_API_JSON_PAYLOAD }} @@ -290,7 +292,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: fastlane-gym-logs - path: "/Users/runner/Library/Logs/gym/MissionHub-MissionHub.log" + path: '/Users/runner/Library/Logs/gym/MissionHub-MissionHub.log' android-deploy: runs-on: ubuntu-latest diff --git a/ios/MissionHub.xcodeproj/project.pbxproj b/ios/MissionHub.xcodeproj/project.pbxproj index 5f270e10d..4c5bb95cb 100644 --- a/ios/MissionHub.xcodeproj/project.pbxproj +++ b/ios/MissionHub.xcodeproj/project.pbxproj @@ -254,6 +254,7 @@ 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, 9E6394B9FB77F7CDA33D4878 /* [CP] Copy Pods Resources */, + F0E70892C3340E66C8F84CA2 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -277,6 +278,7 @@ 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 4DE63ACA3C7416807AC35BCC /* [CP] Copy Pods Resources */, 9D32FA8BFA035EF7E6CB28AD /* [CP-User] [RNFB] Core Configuration */, + A73FBA226F1B46FD15C92E78 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -580,6 +582,42 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MissionHub-MissionHubTests/Pods-MissionHub-MissionHubTests-resources.sh\"\n"; showEnvVarsInLog = 0; }; + A73FBA226F1B46FD15C92E78 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-MissionHub/Pods-MissionHub-frameworks.sh", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL", + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MissionHub/Pods-MissionHub-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + F0E70892C3340E66C8F84CA2 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-MissionHub-MissionHubTests/Pods-MissionHub-MissionHubTests-frameworks.sh", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL", + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MissionHub-MissionHubTests/Pods-MissionHub-MissionHubTests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/ios/Podfile b/ios/Podfile index 49ad245f2..d12b214b9 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -27,7 +27,7 @@ target 'MissionHub' do # # Note that if you have use_frameworks! enabled, Flipper will not work and # you should disable these next few lines. - use_flipper! + use_flipper!({ 'Flipper-Folly' => '2.5.3', 'Flipper' => '0.87.0', 'Flipper-RSocket' => '1.3.1' }) post_install do |installer| flipper_post_install(installer) @@ -44,6 +44,10 @@ target 'MissionHub' do target.build_phases << phase target.build_phases.move(phase,0) end + + target.build_configurations.each do |config| + config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO' + end end end end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index a162352c8..e37eac32c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -4,13 +4,9 @@ PODS: - AppAuth/ExternalUserAgent (= 1.4.0) - AppAuth/Core (1.4.0) - AppAuth/ExternalUserAgent (1.4.0) - - AppsFlyerFramework (6.1.3): - - AppsFlyerFramework/Main (= 6.1.3) - - AppsFlyerFramework/Main (6.1.3) - Base64 (1.1.2) - boost-for-react-native (1.63.0) - CocoaAsyncSocket (7.6.5) - - CocoaLibEvent (1.0.0) - CodePush (6.3.0): - Base64 (~> 1.1) - JWT (~> 3.0.0-beta.12) @@ -112,50 +108,61 @@ PODS: - FirebaseInstallations (~> 1.6) - GoogleUtilities/Environment (~> 6.7) - "GoogleUtilities/NSData+zlib (~> 6.7)" - - Flipper (0.54.0): - - Flipper-Folly (~> 2.2) - - Flipper-RSocket (~> 1.1) + - Flipper (0.87.0): + - Flipper-Folly (~> 2.5) + - Flipper-RSocket (~> 1.3) - Flipper-DoubleConversion (1.1.7) - - Flipper-Folly (2.2.0): + - Flipper-Folly (2.5.3): - boost-for-react-native - - CocoaLibEvent (~> 1.0) - Flipper-DoubleConversion - Flipper-Glog - - OpenSSL-Universal (= 1.0.2.19) + - libevent (~> 2.1.12) + - OpenSSL-Universal (= 1.1.180) - Flipper-Glog (0.3.6) - Flipper-PeerTalk (0.0.4) - - Flipper-RSocket (1.1.0): - - Flipper-Folly (~> 2.2) - - FlipperKit (0.54.0): - - FlipperKit/Core (= 0.54.0) - - FlipperKit/Core (0.54.0): - - Flipper (~> 0.54.0) + - Flipper-RSocket (1.3.1): + - Flipper-Folly (~> 2.5) + - FlipperKit (0.87.0): + - FlipperKit/Core (= 0.87.0) + - FlipperKit/Core (0.87.0): + - Flipper (~> 0.87.0) - FlipperKit/CppBridge - FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBDefines - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.54.0): - - Flipper (~> 0.54.0) - - FlipperKit/FBCxxFollyDynamicConvert (0.54.0): - - Flipper-Folly (~> 2.2) - - FlipperKit/FBDefines (0.54.0) - - FlipperKit/FKPortForwarding (0.54.0): + - FlipperKit/CppBridge (0.87.0): + - Flipper (~> 0.87.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.87.0): + - Flipper-Folly (~> 2.5) + - FlipperKit/FBDefines (0.87.0) + - FlipperKit/FKPortForwarding (0.87.0): - CocoaAsyncSocket (~> 7.6) - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.54.0) - - FlipperKit/FlipperKitLayoutPlugin (0.54.0): + - FlipperKit/FlipperKitHighlightOverlay (0.87.0) + - FlipperKit/FlipperKitLayoutHelpers (0.87.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutTextSearchable + - FlipperKit/FlipperKitLayoutIOSDescriptors (0.87.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.54.0) - - FlipperKit/FlipperKitNetworkPlugin (0.54.0): + - FlipperKit/FlipperKitLayoutPlugin (0.87.0): - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.54.0): + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - FlipperKit/FlipperKitLayoutIOSDescriptors + - FlipperKit/FlipperKitLayoutTextSearchable + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutTextSearchable (0.87.0) + - FlipperKit/FlipperKitNetworkPlugin (0.87.0): + - FlipperKit/Core + - FlipperKit/FlipperKitReactPlugin (0.87.0): - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.54.0): + - FlipperKit/FlipperKitUserDefaultsPlugin (0.87.0): - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.54.0): + - FlipperKit/SKIOSNetworkPlugin (0.87.0): - FlipperKit/Core - FlipperKit/FlipperKitNetworkPlugin - Folly (2020.01.13.00): @@ -223,14 +230,13 @@ PODS: - GTMSessionFetcher/Core (= 1.4.0) - JWT (3.0.0-beta.12): - Base64 (~> 1.1.2) + - libevent (2.1.12) - nanopb (1.30905.0): - nanopb/decode (= 1.30905.0) - nanopb/encode (= 1.30905.0) - nanopb/decode (1.30905.0) - nanopb/encode (1.30905.0) - - OpenSSL-Universal (1.0.2.19): - - OpenSSL-Universal/Static (= 1.0.2.19) - - OpenSSL-Universal/Static (1.0.2.19) + - OpenSSL-Universal (1.1.180) - PromisesObjC (1.2.10) - Protobuf (3.14.0) - QBImagePickerController (3.4.0) @@ -400,9 +406,6 @@ PODS: - React-cxxreact (= 0.63.4) - React-jsi (= 0.63.4) - React-jsinspector (0.63.4) - - react-native-appsflyer (6.1.30): - - AppsFlyerFramework (= 6.1.3) - - React - react-native-camera (3.33.0): - React - react-native-camera/RCT (= 3.33.0) @@ -427,8 +430,8 @@ PODS: - react-native-fbsdk/Share (2.0.0): - FBSDKShareKit (~> 7.0) - React - - react-native-version-check (3.4.1): - - React + - react-native-version-check (3.4.7): + - React-Core - react-native-video (5.0.2): - React - react-native-video/Video (= 5.0.2) @@ -494,10 +497,10 @@ PODS: - React-Core (= 0.63.4) - React-cxxreact (= 0.63.4) - React-jsi (= 0.63.4) - - RNAppleAuthentication (2.0.0-beta.1): - - React - - RNCPushNotificationIOS (1.3.0): - - React + - RNAppleAuthentication (2.0.2): + - React-Core + - RNCPushNotificationIOS (1.11.0): + - React-Core - RNDateTimePicker (2.6.1): - React - RNDeviceInfo (5.6.3): @@ -578,25 +581,25 @@ DEPENDENCIES: - FBSDKCoreKit - FBSDKLoginKit - FBSDKShareKit - - Flipper (~> 0.54.0) + - Flipper (= 0.87.0) - Flipper-DoubleConversion (= 1.1.7) - - Flipper-Folly (~> 2.2) + - Flipper-Folly (= 2.5.3) - Flipper-Glog (= 0.3.6) - Flipper-PeerTalk (~> 0.0.4) - - Flipper-RSocket (~> 1.1) - - FlipperKit (~> 0.54.0) - - FlipperKit/Core (~> 0.54.0) - - FlipperKit/CppBridge (~> 0.54.0) - - FlipperKit/FBCxxFollyDynamicConvert (~> 0.54.0) - - FlipperKit/FBDefines (~> 0.54.0) - - FlipperKit/FKPortForwarding (~> 0.54.0) - - FlipperKit/FlipperKitHighlightOverlay (~> 0.54.0) - - FlipperKit/FlipperKitLayoutPlugin (~> 0.54.0) - - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.54.0) - - FlipperKit/FlipperKitNetworkPlugin (~> 0.54.0) - - FlipperKit/FlipperKitReactPlugin (~> 0.54.0) - - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.54.0) - - FlipperKit/SKIOSNetworkPlugin (~> 0.54.0) + - Flipper-RSocket (= 1.3.1) + - FlipperKit (= 0.87.0) + - FlipperKit/Core (= 0.87.0) + - FlipperKit/CppBridge (= 0.87.0) + - FlipperKit/FBCxxFollyDynamicConvert (= 0.87.0) + - FlipperKit/FBDefines (= 0.87.0) + - FlipperKit/FKPortForwarding (= 0.87.0) + - FlipperKit/FlipperKitHighlightOverlay (= 0.87.0) + - FlipperKit/FlipperKitLayoutPlugin (= 0.87.0) + - FlipperKit/FlipperKitLayoutTextSearchable (= 0.87.0) + - FlipperKit/FlipperKitNetworkPlugin (= 0.87.0) + - FlipperKit/FlipperKitReactPlugin (= 0.87.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.87.0) + - FlipperKit/SKIOSNetworkPlugin (= 0.87.0) - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - GoogleTagManager @@ -612,7 +615,6 @@ DEPENDENCIES: - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) - - react-native-appsflyer (from `../node_modules/react-native-appsflyer`) - react-native-camera (from `../node_modules/react-native-camera`) - react-native-config (from `../node_modules/react-native-config`) - react-native-fbsdk (from `../node_modules/react-native-fbsdk`) @@ -663,11 +665,9 @@ DEPENDENCIES: SPEC REPOS: trunk: - AppAuth - - AppsFlyerFramework - Base64 - boost-for-react-native - CocoaAsyncSocket - - CocoaLibEvent - FBSDKCoreKit - FBSDKLoginKit - FBSDKShareKit @@ -699,6 +699,7 @@ SPEC REPOS: - GTMAppAuth - GTMSessionFetcher - JWT + - libevent - nanopb - OpenSSL-Universal - PromisesObjC @@ -752,8 +753,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/jsiexecutor" React-jsinspector: :path: "../node_modules/react-native/ReactCommon/jsinspector" - react-native-appsflyer: - :path: "../node_modules/react-native-appsflyer" react-native-camera: :path: "../node_modules/react-native-camera" react-native-config: @@ -849,11 +848,9 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7 - AppsFlyerFramework: 4c735cfe40cd4dd809eba4e288e80f5fbde39d02 Base64: cecfb41a004124895a7bcee567a89bae5a89d49b boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f CodePush: 69186fd1143f7e5e5c6f65383cf14f4927e28213 DoubleConversion: cde416483dac037923206447da6e1454df403714 EXConstants: f907b3b6ce16e20d1750f22af1e095e924574bcb @@ -875,13 +872,13 @@ SPEC CHECKSUMS: FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2 FirebasePerformance: 34de2b03ddfddbca26a716468a50877fd065fbe5 FirebaseRemoteConfig: 35a729305f254fb15a2e541d4b36f3a379da7fdc - Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365 + Flipper: 1bd2db48dcc31e4b167b9a33ec1df01c2ded4893 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 - Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3 + Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7 - FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d + Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154 + FlipperKit: 651f50a42eb95c01b3e89a60996dd6aded529eeb Folly: b73c3869541e86821df3c387eb0af5f65addfab4 glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3 GoogleAnalytics: f42cc53a87a51fe94334821868d9c8481ff47a7b @@ -896,8 +893,9 @@ SPEC CHECKSUMS: GTMAppAuth: 4deac854479704f348309e7b66189e604cf5e01e GTMSessionFetcher: 6f5c8abbab8a9bce4bb3f057e317728ec6182b10 JWT: 9b5c05abbcc1a0e69c3c91e1655b3387fc7e581d + libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 nanopb: c43f40fadfe79e8b8db116583945847910cbabc9 - OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 + OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b PromisesObjC: b14b1c6b68e306650688599de8a45e49fae81151 Protobuf: 0cde852566359049847168e51bd1c690e0f70056 QBImagePickerController: d54cf93db6decf26baf6ed3472f336ef35cae022 @@ -911,11 +909,10 @@ SPEC CHECKSUMS: React-jsi: a0418934cf48f25b485631deb27c64dc40fb4c31 React-jsiexecutor: 93bd528844ad21dc07aab1c67cb10abae6df6949 React-jsinspector: 58aef7155bc9a9683f5b60b35eccea8722a4f53a - react-native-appsflyer: 0fc0a27bcb4462fcba0d1d64b90aabf493f64174 react-native-camera: 55e1afb6d585314ca96ea5504e6b1ba7583c1d21 react-native-config: 55548054279d92e0e4566ea15a8b9b81028ec342 react-native-fbsdk: 00c15d138bba6d4efa628670886fc58cec858c19 - react-native-version-check: 40245490503879ff64f020b285ebc4075abd40c7 + react-native-version-check: 6cd36aad4e30b8e3216747e3b4ddeb09e0647af8 react-native-video: d01ed7ff1e38fa7dcc6c15c94cf505e661b7bfd0 React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336 React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b @@ -927,8 +924,8 @@ SPEC CHECKSUMS: React-RCTText: 5c51df3f08cb9dedc6e790161195d12bac06101c React-RCTVibration: ae4f914cfe8de7d4de95ae1ea6cc8f6315d73d9d ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b - RNAppleAuthentication: 62164f126111672834b0259cce8af2c16df9e79f - RNCPushNotificationIOS: d5fd66aed4e03c6491ca0c6111a03d4f6455ff6c + RNAppleAuthentication: 09bf9752c73e1a19ba71b27538bc76cb4f8441a6 + RNCPushNotificationIOS: 64218f3c776c03d7408284a819b2abfda1834bc8 RNDateTimePicker: 83540fb5d71f28bd34990d8fabccb8d91e5d957e RNDeviceInfo: 5be12a5bfbb8da3528c43ee4373abd9c30d04616 RNFBAnalytics: ffd9149d1fe0ecee0f2571b234d53c25349b9899 @@ -963,6 +960,6 @@ SPEC CHECKSUMS: Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 5f63cced5da52ebce75cafbb9a15e2bd7cd6075c +PODFILE CHECKSUM: 9f2011585b563feab5a4c4665679b3f224b34a7c -COCOAPODS: 1.10.1 +COCOAPODS: 1.14.3