chore: Merge 4.61.0 into master (#6401)

Author: diegolmello

.circleci/config.yml

@@ -51,11 +51,11 @@ save-npm-cache-mac: &save-npm-cache-mac
 
 restore-gems-cache: &restore-gems-cache
   name: Restore gems cache
-  key: bundle-v1-{{ checksum "ios/Gemfile.lock" }}
+  key: bundle-v1-{{ checksum "Gemfile.lock" }}
 
 save-gems-cache: &save-gems-cache
   name: Save gems cache
-  key: bundle-v1-{{ checksum "ios/Gemfile.lock" }}
+  key: bundle-v1-{{ checksum "Gemfile.lock" }}
   paths:
     - vendor/bundle
 
@@ -113,8 +113,7 @@ commands:
       - run:
           name: Install pods libs
           command: |
-            bundle exec pod install --deployment
-          working_directory: ios
+            yarn pod-install
       - save_cache:
           name: Save pods specs and pods cache
           key: pods-v1-{{ checksum "ios/Podfile.lock" }}
@@ -196,11 +195,11 @@ commands:
           name: Upload sourcemaps/NDK symbols to Bugsnag
           command: |
             if [[ $CIRCLE_JOB == "android-build-official" ]]; then
-              yarn bugsnag:upload-android --variant officialRelease
+              yarn bugsnag:upload-android --variant officialRelease --app-manifest android/app/build/intermediates/merged_manifests/officialRelease/processOfficialReleaseManifest/AndroidManifest.xml
               yarn bugsnag-cli upload android-aab android/app/build/outputs/bundle/officialRelease/app-official-release.aab
             fi
             if [[ $CIRCLE_JOB == "android-build-experimental" || "android-automatic-build-experimental" ]]; then
-              yarn bugsnag:upload-android --variant experimentalRelease
+              yarn bugsnag:upload-android --variant experimentalRelease --app-manifest android/app/build/intermediates/merged_manifests/experimentalRelease/processExperimentalReleaseManifest/AndroidManifest.xml
               yarn bugsnag-cli upload android-aab android/app/build/outputs/bundle/experimentalRelease/app-experimental-release.aab
             fi
 
@@ -523,7 +522,6 @@ jobs:
       - restore_cache: *restore-npm-cache-linux
       - run: *install-npm-modules
       - save_cache: *save-npm-cache-linux
-      - run: mkdir ~/junit
       - create-e2e-account-file
       - android/create-avd:
           avd-name: Pixel_API_31_AOSP
@@ -538,17 +536,10 @@ jobs:
       - run:
           name: Run Detox Tests
           command: |
-            TEST=$(circleci tests glob "e2e/tests/**/*.ts" | circleci tests split --split-by=timings)
+            TEST=$(circleci tests glob "e2e/tests/**/*.ts" | circleci tests split)
             yarn e2e:android-test $TEST
       - store_artifacts:
           path: artifacts
-      - run:
-          command: cp junit.xml ~/junit/
-          when: always
-      - store_test_results:
-          path: ~/junit
-      - store_artifacts:
-          path: ~/junit
 
   # iOS builds
   ios-build-experimental:
@@ -613,7 +604,6 @@ jobs:
       - restore_cache: *restore-npm-cache-mac
       - run: *install-npm-modules
       - save_cache: *save-npm-cache-mac
-      - run: mkdir ~/junit
       - run:
           name: Configure Detox
           command: |
@@ -624,17 +614,10 @@ jobs:
       - run:
           name: Run tests
           command: |
-            TEST=$(circleci tests glob "e2e/tests/**/*.ts" | circleci tests split --split-by=timings)
+            TEST=$(circleci tests glob "e2e/tests/**/*.ts" | circleci tests split)
             yarn e2e:ios-test $TEST
       - store_artifacts:
           path: artifacts
-      - run:
-          command: cp junit.xml ~/junit/
-          when: always
-      - store_test_results:
-          path: ~/junit
-      - store_artifacts:
-          path: ~/junit
 
 workflows:
   build-and-test:

.gitignore

@@ -20,10 +20,10 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-ios/.xcode.env.local
+**/.xcode.env.local
 project.xcworkspace
 *.mobileprovision
-ios/Pods/
+**/Pods/
 /vendor/bundle/
 
 # Temporary files created by Metro to check the health of the file watcher
@@ -32,6 +32,14 @@ ios/Pods/
 # testing
 /coverage
 
+# Yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
 # Android/IntelliJ
 #
 build/
@@ -71,6 +79,5 @@ e2e/docker/rc_test_env/docker-compose.yml
 e2e/docker/data/db
 e2e/e2e_account.js
 e2e/e2e_account.ts
-junit.xml
 
 *.p8

CONTRIBUTING.md

@@ -20,7 +20,7 @@ yarn
 
 Run the app:
 ```sh
-npx pod-install
+yarn pod-install
 yarn ios
 ```
 
@@ -34,10 +34,6 @@ At this point, the app should be running on the simulator or on your device!
 
 *Note: npm won't work on this project*
 
-### How to inspect the app
-
-We use [Reactotron](https://github.com/infinitered/reactotron) to inspect logs, redux state, redux-sagas, HTTP requests, etc.
-
 ## Issues needing help
 
 Didn't find a bug or want a new feature not already reported? Check out the [help wanted](https://github.com/RocketChat/Rocket.Chat.ReactNative/issues?q=is%3Aissue+is%3Aopen+label%3A%22%F0%9F%91%8B+help+wanted%22) or the [good first issue](https://github.com/RocketChat/Rocket.Chat.ReactNative/issues?q=is%3Aissue+is%3Aopen+label%3A%22%F0%9F%8D%AD+good+first+issue%22) labels.

Gemfile

@@ -1,4 +1,13 @@
 source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby '2.7.7'
-gem 'cocoapods', '~> 1.11', '>= 1.11.2'
+
+# Exclude problematic versions of cocoapods and activesupport that causes build failures.
+gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
+gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
+gem 'xcodeproj', '< 1.26.0'
+gem 'concurrent-ruby', '< 1.3.4'
+
+gem 'fastlane'
+plugins_path = File.join(File.dirname(__FILE__), 'ios', 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)