chore: Use Xcode 15.2.0 on CI

.circleci/config.yml

@@ -6,7 +6,7 @@ orbs:
 
 macos: &macos
   macos:
-    xcode: "14.2.0"
+    xcode: "15.2.0"
   resource_class: macos.m1.medium.gen1
 
 bash-env: &bash-env
@@ -54,7 +54,6 @@ save-gems-cache: &save-gems-cache
 update-fastlane-ios: &update-fastlane-ios
   name: Update Fastlane
   command: |
-    echo "ruby-2.7.7" > ~/.ruby-version
     bundle install
   working_directory: ios
 
@@ -78,6 +77,27 @@ restore_cache: &restore-gradle-cache
 # COMMANDS
 commands:
 
+  manage-ruby:
+    description: "Manage ruby version"
+    steps:
+      - restore_cache:
+          name: Restore ruby
+          key: ruby-v2-{{ checksum ".ruby-version" }}
+      - run:
+          name: Install ruby
+          command: |
+            if [ -d ~/.rbenv/versions/2.7.7 ]; then
+              echo "Ruby already installed"
+            else
+              echo "ruby-2.7.7" > ~/.ruby-version
+              rbenv install 2.7.7
+            fi
+      - save_cache:
+          name: Save ruby cache
+          key: ruby-v2-{{ checksum ".ruby-version" }}
+          paths:
+            - ~/.rbenv/versions/2.7.7
+
   manage-pods:
     description: "Restore/Get/Save cache of pods libs"
     steps:
@@ -204,6 +224,7 @@ commands:
       - checkout
       - restore_cache: *restore-gems-cache
       - restore_cache: *restore-npm-cache-mac
+      - manage-ruby
       - run: *install-npm-modules
       - run: *update-fastlane-ios
       - manage-pods
@@ -328,6 +349,7 @@ commands:
           at: ios
       - restore_cache: *restore-gems-cache
       - restore_cache: *restore-npm-cache-mac
+      - manage-ruby
       - run: *install-npm-modules
       - run: *update-fastlane-ios
       - manage-pods
@@ -575,6 +597,7 @@ jobs:
       - checkout
       - restore_cache: *restore-gems-cache
       - restore_cache: *restore-npm-cache-mac
+      - manage-ruby
       - run: *install-npm-modules
       - run: *update-fastlane-ios
       - save_cache: *save-npm-cache-mac

ios/Gemfile

@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 gem 'fastlane'
 gem "cocoapods"
+gem "cocoapods-patch"
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)

ios/Gemfile.lock

@@ -64,6 +64,8 @@ GEM
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
     cocoapods-downloader (1.6.3)
+    cocoapods-patch (1.0.2)
+      cocoapods (~> 1.11.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -280,6 +282,7 @@ PLATFORMS
 
 DEPENDENCIES
   cocoapods
+  cocoapods-patch
   fastlane
   fastlane-plugin-bugsnag
 

ios/Podfile

@@ -2,6 +2,8 @@ require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking")
 
+plugin 'cocoapods-patch'
+
 platform :ios, '12.0'
 install! 'cocoapods', :deterministic_uuids => false
 

ios/Podfile.lock

@@ -984,6 +984,6 @@ SPEC CHECKSUMS:
   WatermelonDB: 577c61fceff16e9f9103b59d14aee4850c0307b6
   Yoga: 0bc4b37c3b8a345336ff601e2cf7d9704bab7e93
 
-PODFILE CHECKSUM: 0dc489a0c4bec783a132693070c2d02e2ca6b0db
+PODFILE CHECKSUM: 64d42395bfd44083a3a28acf1ade8637a43b275e
 
 COCOAPODS: 1.11.3

ios/patches/boost+1.76.0.diff

@@ -0,0 +1,13 @@
+diff --git a/cocoapods-patch-20240202-23940-12mtcm3/boost/boost/container_hash/hash.hpp b/Pods/boost/boost/container_hash/hash.hpp
+index 6059fee19..b665976de 100644
+--- a/cocoapods-patch-20240202-23940-12mtcm3/boost/boost/container_hash/hash.hpp
++++ b/Pods/boost/boost/container_hash/hash.hpp
+@@ -128,7 +128,7 @@ namespace boost
+         };
+ #else
+         template <typename T>
+-        struct hash_base : std::unary_function<T, std::size_t> {};
++        struct hash_base : std::__unary_function<T, std::size_t> {};
+ #endif
+
+         struct enable_hash_value { typedef std::size_t type; };

package.json

@@ -84,7 +84,7 @@
 		"prop-types": "15.7.2",
 		"react": "17.0.2",
 		"react-hook-form": "^7.34.2",
-		"react-native": "RocketChat/react-native#6cf729c196f0f043ac6e7444e73f5a560d7a8a8a",
+		"react-native": "RocketChat/react-native#e69debc8e823916def8f1e4589c7ea5f41db5519",
 		"react-native-animatable": "^1.3.3",
 		"react-native-background-timer": "2.4.1",
 		"react-native-bootsplash": "^4.3.3",