chore: merge current main

software-mansion · Feb 20, 2024 · 48eda12 · 48eda12
2 parents 48e4d1a + 58da3e2
commit 48eda12
Show file tree

Hide file tree

Showing 31 changed files with 1,242 additions and 975 deletions.
diff --git a/.github/workflows/ios-build-test-fabric.yml b/.github/workflows/ios-build-test-fabric.yml
@@ -39,6 +39,14 @@ jobs:
         working-directory: ${{ env.WORKING_DIRECTORY }}
         run: yarn
 
+        # This step is required due to the bug introduced in 1.15.0 version of cocoapods
+        # that breaks the pod installation for cached packages.
+        # see https://github.com/facebook/react-native/issues/42698
+        # This step should be removed once this issue will be resolved:
+        # https://github.com/actions/runner-images/issues/9308
+      - name: Install Ruby gems
+        run: gem install cocoapods -v 1.15.2
+
       - name: Install pods
         id: install_pods
         continue-on-error: true

diff --git a/.github/workflows/ios-build-test.yml b/.github/workflows/ios-build-test.yml
@@ -35,6 +35,13 @@ jobs:
       - name: Install node dependencies
         working-directory: ${{ env.WORKING_DIRECTORY }}
         run: yarn
+        # This step is required due to the bug introduced in 1.15.0 version of cocoapods
+        # that breaks the pod installation for cached packages.
+        # see https://github.com/facebook/react-native/issues/42698
+        # This step should be removed once this issue will be resolved:
+        # https://github.com/actions/runner-images/issues/9308
+      - name: Install Ruby gems
+        run: gem install cocoapods -v 1.15.2
       - name: Install pods
         id: install_pods
         continue-on-error: true

diff --git a/.github/workflows/ios-e2e-test.yml b/.github/workflows/ios-e2e-test.yml
@@ -39,6 +39,13 @@ jobs:
       - name: Install node dependencies
         working-directory: ${{ env.WORKING_DIRECTORY }}
         run: yarn
+        # This step is required due to the bug introduced in 1.15.0 version of cocoapods
+        # that breaks the pod installation for cached packages.
+        # see https://github.com/facebook/react-native/issues/42698
+        # This step should be removed once this issue will be resolved:
+        # https://github.com/actions/runner-images/issues/9308
+      - name: Install Ruby gems
+        run: gem install cocoapods -v 1.15.2
       - name: Install pods
         working-directory: ${{ env.WORKING_DIRECTORY }}/ios
         run: pod install

diff --git a/Example/Gemfile b/Example/Gemfile
@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby '>= 2.6.10'
-gem 'cocoapods', '~> 1.12'
+
+gem 'cocoapods', '~> 1.15.2'
+gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
diff --git a/Example/ios/Podfile.lock b/Example/ios/Podfile.lock
@@ -687,9 +687,9 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  boost: a7c83b31436843459a1961bfd74b96033dc77234
+  boost: 57d2868c099736d80fcd648bf211b4431e51a558
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
-  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
+  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: 5d4a3b7f411219a45a6d952f77d2c0a6c9989da5
   FBReactNativeSpec: 3fc2d478e1c4b08276f9dd9128f80ec6d5d85c1f
   Flipper: 6edb735e6c3e332975d1b17956bcc584eccf5818
@@ -701,7 +701,7 @@ SPEC CHECKSUMS:
   Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
   FlipperKit: 2efad7007d6745a3f95e4034d547be637f89d3f6
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 5337263514dd6f09803962437687240c5dc39aa4
+  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
   hermes-engine: 81191603c4eaa01f5e4ae5737a9efcf64756c7b2
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
@@ -749,4 +749,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 86e380a4262db238c7a45428750af2d88465585c
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.11.3
diff --git a/FabricExample/Gemfile b/FabricExample/Gemfile
@@ -3,5 +3,5 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-gem 'cocoapods', '~> 1.13'
-gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
+gem 'cocoapods', '~> 1.15.2'
+gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
diff --git a/FabricExample/ios/FabricExample.xcodeproj/project.pbxproj b/FabricExample/ios/FabricExample.xcodeproj/project.pbxproj
@@ -584,11 +584,7 @@
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 					"-DRN_FABRIC_ENABLED",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
@@ -660,11 +656,7 @@
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 					"-DRN_FABRIC_ENABLED",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;