From 73d23ea515786ad5fb7502531dd1c03f7500c411 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Mon, 4 Apr 2022 18:37:56 -0400 Subject: [PATCH] [Gekidou] ci updates (#6123) * use Flipper 0.125.0 * update fastlane * update ci images & use node 16.14.2 * remove npm-install argument * Remove DFB_SONARKIT_ENABLED flag in iOS Release mode --- .circleci/config.yml | 11 +-- android/gradle.properties | 2 +- fastlane/Gemfile.lock | 6 +- ios/Mattermost.xcodeproj/project.pbxproj | 19 ++-- ios/Podfile | 2 +- ios/Podfile.lock | 116 ++++++++++++++++++++++- 6 files changed, 132 insertions(+), 24 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 292774343..439c489c1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 orbs: owasp: entur/owasp@0.0.10 - node: circleci/node@4.5.1 + node: circleci/node@5.0.2 executors: android: @@ -14,7 +14,7 @@ executors: NODE_ENV: production BABEL_ENV: production docker: - - image: circleci/android:api-30-node + - image: cimg/android:2022.03-node working_directory: ~/mattermost-mobile resource_class: <> @@ -24,7 +24,7 @@ executors: NODE_ENV: production BABEL_ENV: production macos: - xcode: "13.0.0" + xcode: "13.3.0" working_directory: ~/mattermost-mobile shell: /bin/bash --login -o pipefail @@ -100,8 +100,7 @@ commands: description: "Get JavaScript dependencies" steps: - node/install: - node-version: '16.2.0' - install-npm: false + node-version: '16.14.2' - restore_cache: name: Restore npm cache key: v2-npm-{{ checksum "package.json" }}-{{ arch }} @@ -225,7 +224,7 @@ jobs: test: working_directory: ~/mattermost-mobile docker: - - image: circleci/node:10 + - image: cimg/node:16.14.2 steps: - checkout: path: ~/mattermost-mobile diff --git a/android/gradle.properties b/android/gradle.properties index c88cd69c4..8d9ff58f0 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -30,4 +30,4 @@ android.useAndroidX=true android.enableJetifier=true # Version of flipper SDK to use with React Native -FLIPPER_VERSION=0.99.0 +FLIPPER_VERSION=0.125.0 diff --git a/fastlane/Gemfile.lock b/fastlane/Gemfile.lock index 306e2fb3e..ef5b68fb2 100644 --- a/fastlane/Gemfile.lock +++ b/fastlane/Gemfile.lock @@ -8,7 +8,7 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.570.0) + aws-partitions (1.573.0) aws-sdk-core (3.130.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) @@ -36,7 +36,7 @@ GEM unf (>= 0.0.5, < 1.0.0) dotenv (2.7.6) emoji_regex (3.2.3) - excon (0.92.1) + excon (0.92.2) faraday (1.10.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -111,7 +111,7 @@ GEM fastlane-plugin-find_replace_string (0.1.0) fastlane-plugin-versioning_android (0.1.0) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.16.0) + google-apis-androidpublisher_v3 (0.17.0) google-apis-core (>= 0.4, < 2.a) google-apis-core (0.4.2) addressable (~> 2.5, >= 2.5.1) diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj index 17c1c154e..9919e88c9 100644 --- a/ios/Mattermost.xcodeproj/project.pbxproj +++ b/ios/Mattermost.xcodeproj/project.pbxproj @@ -707,10 +707,14 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Mattermost/Pods-Mattermost-frameworks.sh", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL", "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", ); runOnlyForDeploymentPostprocessing = 0; @@ -933,10 +937,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - OTHER_CFLAGS = ( - "$(inherited)", - "-DFB_SONARKIT_ENABLED=1", - ); + OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1036,10 +1037,7 @@ "@executable_path/../../Frameworks", ); MTL_FAST_MATH = YES; - OTHER_CFLAGS = ( - "$(inherited)", - "-DFB_SONARKIT_ENABLED=1", - ); + OTHER_CFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.mattermost.rnbeta.MattermostShare; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1131,10 +1129,7 @@ "@executable_path/../../Frameworks", ); MTL_FAST_MATH = YES; - OTHER_CFLAGS = ( - "$(inherited)", - "-DFB_SONARKIT_ENABLED=1", - ); + OTHER_CFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.mattermost.rnbeta.NotificationService; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; diff --git a/ios/Podfile b/ios/Podfile index 0c0c9277f..c14ffc7c9 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -33,7 +33,7 @@ end # # Note that if you have use_frameworks! enabled, Flipper will not work and # you should disable these next few lines. - # use_flipper!({'Flipper' => '0.138.0'}) + use_flipper!({'Flipper' => '0.125.0'}) post_install do |installer| react_native_post_install(installer) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index b5d5d1baa..353b5aa10 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -3,6 +3,7 @@ PODS: - boost (1.76.0) - BVLinearGradient (2.5.6): - React + - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - EXFileSystem (13.1.4): - ExpoModulesCore @@ -21,6 +22,67 @@ PODS: - React-Core (= 0.67.4) - React-jsi (= 0.67.4) - ReactCommon/turbomodule/core (= 0.67.4) + - Flipper (0.125.0): + - Flipper-Folly (~> 2.6) + - Flipper-RSocket (~> 1.4) + - Flipper-Boost-iOSX (1.76.0.1.11) + - Flipper-DoubleConversion (3.1.7) + - Flipper-Fmt (7.1.7) + - Flipper-Folly (2.6.7): + - Flipper-Boost-iOSX + - Flipper-DoubleConversion + - Flipper-Fmt (= 7.1.7) + - Flipper-Glog + - libevent (~> 2.1.12) + - OpenSSL-Universal (= 1.1.180) + - Flipper-Glog (0.3.6) + - Flipper-PeerTalk (0.0.4) + - Flipper-RSocket (1.4.3): + - Flipper-Folly (~> 2.6) + - FlipperKit (0.125.0): + - FlipperKit/Core (= 0.125.0) + - FlipperKit/Core (0.125.0): + - Flipper (~> 0.125.0) + - FlipperKit/CppBridge + - FlipperKit/FBCxxFollyDynamicConvert + - FlipperKit/FBDefines + - FlipperKit/FKPortForwarding + - SocketRocket (~> 0.6.0) + - FlipperKit/CppBridge (0.125.0): + - Flipper (~> 0.125.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.125.0): + - Flipper-Folly (~> 2.6) + - FlipperKit/FBDefines (0.125.0) + - FlipperKit/FKPortForwarding (0.125.0): + - CocoaAsyncSocket (~> 7.6) + - Flipper-PeerTalk (~> 0.0.4) + - FlipperKit/FlipperKitHighlightOverlay (0.125.0) + - FlipperKit/FlipperKitLayoutHelpers (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutTextSearchable + - FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - FlipperKit/FlipperKitLayoutIOSDescriptors + - FlipperKit/FlipperKitLayoutTextSearchable + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutTextSearchable (0.125.0) + - FlipperKit/FlipperKitNetworkPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitReactPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/SKIOSNetworkPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitNetworkPlugin - fmt (6.2.1) - glog (0.3.5) - hermes-engine (0.9.0) @@ -41,6 +103,7 @@ PODS: - lottie-react-native (5.0.1): - lottie-ios (~> 3.2.3) - React-Core + - OpenSSL-Universal (1.1.180) - Permission-Camera (3.3.1): - RNPermissions - Permission-PhotoLibrary (3.3.1): @@ -460,6 +523,7 @@ PODS: - Sentry/Core (= 7.11.0) - Sentry/Core (7.11.0) - simdjson (1.0.0) + - SocketRocket (0.6.0) - Starscream (4.0.4) - SwiftyJSON (5.0.1) - Swime (3.0.6) @@ -468,6 +532,8 @@ PODS: - React-jsi - XCDYouTubeKit (2.8.2) - Yoga (1.14.0) + - YogaKit (1.18.1): + - Yoga (~> 1.14) - YoutubePlayer-in-WKWebView (0.3.8) DEPENDENCIES: @@ -480,12 +546,34 @@ DEPENDENCIES: - EXVideoThumbnails (from `../node_modules/expo-video-thumbnails/ios`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) + - Flipper (= 0.125.0) + - Flipper-Boost-iOSX (= 1.76.0.1.11) + - Flipper-DoubleConversion (= 3.1.7) + - Flipper-Fmt (= 7.1.7) + - Flipper-Folly (= 2.6.7) + - Flipper-Glog (= 0.3.6) + - Flipper-PeerTalk (= 0.0.4) + - Flipper-RSocket (= 1.4.3) + - FlipperKit (= 0.125.0) + - FlipperKit/Core (= 0.125.0) + - FlipperKit/CppBridge (= 0.125.0) + - FlipperKit/FBCxxFollyDynamicConvert (= 0.125.0) + - FlipperKit/FBDefines (= 0.125.0) + - FlipperKit/FKPortForwarding (= 0.125.0) + - FlipperKit/FlipperKitHighlightOverlay (= 0.125.0) + - FlipperKit/FlipperKitLayoutPlugin (= 0.125.0) + - FlipperKit/FlipperKitLayoutTextSearchable (= 0.125.0) + - FlipperKit/FlipperKitNetworkPlugin (= 0.125.0) + - FlipperKit/FlipperKitReactPlugin (= 0.125.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0) + - FlipperKit/SKIOSNetworkPlugin (= 0.125.0) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - hermes-engine (~> 0.9.0) - jail-monkey (from `../node_modules/jail-monkey`) - libevent (~> 2.1.12) - lottie-ios (from `../node_modules/lottie-ios`) - lottie-react-native (from `../node_modules/lottie-react-native`) + - OpenSSL-Universal (= 1.1.180) - Permission-Camera (from `../node_modules/react-native-permissions/ios/Camera`) - Permission-PhotoLibrary (from `../node_modules/react-native-permissions/ios/PhotoLibrary`) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) @@ -561,18 +649,31 @@ DEPENDENCIES: SPEC REPOS: trunk: - Alamofire + - CocoaAsyncSocket + - Flipper + - Flipper-Boost-iOSX + - Flipper-DoubleConversion + - Flipper-Fmt + - Flipper-Folly + - Flipper-Glog + - Flipper-PeerTalk + - Flipper-RSocket + - FlipperKit - fmt - hermes-engine - HMSegmentedControl - libevent - libwebp + - OpenSSL-Universal - Rudder - SDWebImage - SDWebImageWebPCoder - Sentry + - SocketRocket - SwiftyJSON - Swime - XCDYouTubeKit + - YogaKit - YoutubePlayer-in-WKWebView EXTERNAL SOURCES: @@ -747,6 +848,7 @@ SPEC CHECKSUMS: Alamofire: 1c4fb5369c3fe93d2857c780d8bbe09f06f97e7c boost: a7c83b31436843459a1961bfd74b96033dc77234 BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872 + CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 EXFileSystem: 08a3033ac372b6346becf07839e1ccef26fb1058 Expo: 534e51e607aba8229293297da5585f4b26f50fa1 @@ -754,6 +856,15 @@ SPEC CHECKSUMS: EXVideoThumbnails: 847d648d6f4bc0c1afad05caa56a487dc543445e FBLazyVector: f7b0632c6437e312acf6349288d9aa4cb6d59030 FBReactNativeSpec: 0f4e1f4cfeace095694436e7c7fcc5bf4b03a0ff + Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 + Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c + Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c + Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b + Flipper-Folly: 83af37379faa69497529e414bd43fbfc7cae259a + Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 + Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 + Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 + FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85 hermes-engine: bf7577d12ac6ccf53ab8b5af3c6ccf0dd8458c5c @@ -763,6 +874,7 @@ SPEC CHECKSUMS: libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc lottie-ios: c058aeafa76daa4cf64d773554bccc8385d0150e lottie-react-native: a029a86e1689c86a07169c520ae770e84348cd20 + OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b Permission-Camera: bae27a8503530770c35aadfecbb97ec71823382a Permission-PhotoLibrary: ddb5a158725b29cb12e9e477e8a5f5151c66cc3c RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685 @@ -831,14 +943,16 @@ SPEC CHECKSUMS: SDWebImageWebPCoder: f93010f3f6c031e2f8fb3081ca4ee6966c539815 Sentry: 0c5cd63d714187b4a39c331c1f0eb04ba7868341 simdjson: c96317b3a50dff3468a42f586ab7ed22c6ab2fd9 + SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 Starscream: 5178aed56b316f13fa3bc55694e583d35dd414d9 SwiftyJSON: 2f33a42c6fbc52764d96f13368585094bfd8aa5e Swime: d7b2c277503b6cea317774aedc2dce05613f8b0b WatermelonDB: baec390a1039dcebeee959218900c978af3407c9 XCDYouTubeKit: 79baadb0560673a67c771eba45f83e353fd12c1f Yoga: d6b6a80659aa3e91aaba01d0012e7edcbedcbecd + YogaKit: f782866e155069a2cca2517aafea43200b01fd5a YoutubePlayer-in-WKWebView: 4fca3b4f6f09940077bfbae7bddb771f2b43aacd -PODFILE CHECKSUM: 28dad9c1aaf5069c024fec8f507956e6c6110bd0 +PODFILE CHECKSUM: 2dac36b627d7cf56690e1cc4c25949ab795f2966 COCOAPODS: 1.11.3