react-native 0.70.13 → 0.70.15

package/scripts/cocoapods/helpers.rb

@@ -11,6 +11,14 @@ class SysctlChecker
     end
 end
 
+# Helper class that is used to easily send commands to Xcodebuild
+# And that can be subclassed for testing purposes.
+class Xcodebuild
+    def self.version
+        `xcodebuild -version`
+    end
+end
+
 # Helper object to wrap system properties like RUBY_PLATFORM
 # This makes it easier to mock the behaviour in tests
 class Environment
@@ -26,3 +34,11 @@ class Finder
         return `find #{path} -type f \\( #{js_files} -or #{ts_files} \\)`.split("\n").sort()
     end
 end
+
+module Helpers
+    class Constants
+        def self.min_ios_version_supported
+            return '12.4'
+        end
+    end
+end

package/scripts/cocoapods/utils.rb

@@ -60,7 +60,7 @@ class ReactNativePodsUtils
             .push(installer.pods_project)
 
 
-        # Hermes does not support `i386` architecture
+        # Hermes does not support 'i386' architecture
         excluded_archs_default = ReactNativePodsUtils.has_pod(installer, 'hermes-engine') ? "i386" : ""
 
         projects.each do |project|
@@ -155,6 +155,32 @@ class ReactNativePodsUtils
         end
     end
 
+    def self.apply_xcode_15_patch(installer, xcodebuild_manager: Xcodebuild)
+        projects = self.extract_projects(installer)
+
+        gcc_preprocessor_definition_key = 'GCC_PREPROCESSOR_DEFINITIONS'
+        other_ld_flags_key = 'OTHER_LDFLAGS'
+        libcpp_cxx17_fix = '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION'
+        xcode15_compatibility_flags = '-Wl -ld_classic '
+
+        projects.each do |project|
+            project.build_configurations.each do |config|
+                # fix for unary_function and binary_function
+                self.safe_init(config, gcc_preprocessor_definition_key)
+                self.add_value_to_setting_if_missing(config, gcc_preprocessor_definition_key, libcpp_cxx17_fix)
+
+                # fix for weak linking
+                self.safe_init(config, other_ld_flags_key)
+                if self.is_using_xcode15_or_greter(:xcodebuild_manager => xcodebuild_manager)
+                    self.add_value_to_setting_if_missing(config, other_ld_flags_key, xcode15_compatibility_flags)
+                else
+                    self.remove_value_from_setting_if_present(config, other_ld_flags_key, xcode15_compatibility_flags)
+                end
+            end
+            project.save()
+        end
+    end
+
     private
 
     def self.fix_library_search_path(config)
@@ -178,5 +204,94 @@ class ReactNativePodsUtils
         end
     end
 
+    def self.updateIphoneOSDeploymentTarget(installer)
+        pod_to_update = Set.new([
+            "boost",
+            "CocoaAsyncSocket",
+            "Flipper",
+            "Flipper-DoubleConversion",
+            "Flipper-Fmt",
+            "Flipper-Boost-iOSX",
+            "Flipper-Folly",
+            "Flipper-Glog",
+            "Flipper-PeerTalk",
+            "FlipperKit",
+            "fmt",
+            "libevent",
+            "OpenSSL-Universal",
+            "RCT-Folly",
+            "SocketRocket",
+            "YogaKit"
+        ])
+
+        installer.target_installation_results.pod_target_installation_results
+            .each do |pod_name, target_installation_result|
+                unless pod_to_update.include?(pod_name)
+                    next
+                end
+                target_installation_result.native_target.build_configurations.each do |config|
+                    config.build_settings["IPHONEOS_DEPLOYMENT_TARGET"] = Helpers::Constants.min_ios_version_supported
+                end
+            end
+    end
+
+    # ========= #
+    # Utilities #
+    # ========= #
+
+    def self.extract_projects(installer)
+        return installer.aggregate_targets
+            .map{ |t| t.user_project }
+            .uniq{ |p| p.path }
+            .push(installer.pods_project)
+    end
+
+    def self.safe_init(config, setting_name)
+        old_config = config.build_settings[setting_name]
+        if old_config == nil
+            config.build_settings[setting_name] ||= '$(inherited) '
+        end
+    end
+
+    def self.add_value_to_setting_if_missing(config, setting_name, value)
+        old_config = config.build_settings[setting_name]
+        if old_config.is_a?(Array)
+            old_config = old_config.join(" ")
+        end
 
+        trimmed_value = value.strip()
+        if !old_config.include?(trimmed_value)
+            config.build_settings[setting_name] = "#{old_config.strip()} #{trimmed_value}".strip()
+        end
+    end
+
+    def self.remove_value_from_setting_if_present(config, setting_name, value)
+        old_config = config.build_settings[setting_name]
+        if old_config.is_a?(Array)
+            old_config = old_config.join(" ")
+        end
+
+        trimmed_value = value.strip()
+        if old_config.include?(trimmed_value)
+            new_config = old_config.gsub(trimmed_value,  "")
+            config.build_settings[setting_name] = new_config.strip()
+        end
+    end
+
+    def self.is_using_xcode15_or_greter(xcodebuild_manager: Xcodebuild)
+        xcodebuild_version = xcodebuild_manager.version
+
+        # The output of xcodebuild -version is something like
+        # Xcode 15.0
+        # or
+        # Xcode 14.3.1
+        # We want to capture the version digits
+        regex = /(\d+)\.(\d+)(?:\.(\d+))?/
+        if match_data = xcodebuild_version.match(regex)
+            major = match_data[1].to_i
+            return major >= 15
+        end
+
+        return false
+    end
 end

package/scripts/react_native_pods.rb

@@ -15,6 +15,7 @@ require_relative './cocoapods/codegen_utils.rb'
 require_relative './cocoapods/utils.rb'
 require_relative './cocoapods/new_architecture.rb'
 require_relative './cocoapods/local_podspec_patch.rb'
+require_relative './cocoapods/helpers.rb'
 
 $CODEGEN_OUTPUT_DIR = 'build/generated/ios'
 $CODEGEN_COMPONENT_DIR = 'react/renderer/components'
@@ -22,6 +23,13 @@ $CODEGEN_MODULE_DIR = '.'
 
 $START_TIME = Time.now.to_i
 
+# This function returns the min supported OS versions supported by React Native
+# By using this function, you won't have to manually change your Podfile
+# when we change the minimum version supported by the framework.
+def min_ios_version_supported
+  return Helpers::Constants.min_ios_version_supported
+end
+
 # Function that setup all the react native dependencies
 # 
 # Parameters
@@ -163,11 +171,13 @@ def react_native_post_install(installer, react_native_path = "../node_modules/re
   ReactNativePodsUtils.fix_react_bridging_header_search_paths(installer)
   ReactNativePodsUtils.set_node_modules_user_settings(installer, react_native_path)
   ReactNativePodsUtils.apply_xcode_15_patch(installer)
+  ReactNativePodsUtils.updateIphoneOSDeploymentTarget(installer)
 
   NewArchitectureHelper.set_clang_cxx_language_standard_if_needed(installer)
   is_new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
   NewArchitectureHelper.modify_flags_for_new_architecture(installer, is_new_arch_enabled)
 
+
   Pod::UI.puts "Pod install took #{Time.now.to_i - $START_TIME} [s] to run".green
 end
 

package/sdks/hermes-engine/utils/build-apple-framework.sh

@@ -35,7 +35,7 @@ function build_host_hermesc {
 
 # Utility function to configure an Apple framework
 function configure_apple_framework {
-  local build_cli_tools enable_bitcode
+  local build_cli_tools enable_bitcode xcode_15_flags xcode_major_version
 
   if [[ $1 == iphoneos || $1 == catalyst ]]; then
     enable_bitcode="true"
@@ -48,7 +48,14 @@ function configure_apple_framework {
     build_cli_tools="false"
   fi
 
+  xcode_15_flags=""
+  xcode_major_version=$(xcodebuild -version | grep -oE '[0-9]*' | head -n 1)
+  if [[ $xcode_major_version -ge 15 ]]; then
+    xcode_15_flags="LINKER:-ld_classic"
+  fi
+
   cmake -S . -B "build_$1" \
+    -DHERMES_EXTRA_LINKER_FLAGS="$xcode_15_flags" \
     -DHERMES_APPLE_TARGET_PLATFORM:STRING="$1" \
     -DCMAKE_OSX_ARCHITECTURES:STRING="$2" \
     -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="$3" \

package/template/Gemfile

@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 ruby '>= 2.6.10'
 
 gem 'cocoapods', '>= 1.11.3'
+gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'

package/template/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "18.1.0",
-    "react-native": "0.70.13"
+    "react-native": "0.70.15"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",

package/third-party-podspecs/boost.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |spec|
   spec.homepage = 'http://www.boost.org'
   spec.summary = 'Boost provides free peer-reviewed portable C++ source libraries.'
   spec.authors = 'Rene Rivera'
-  spec.source = { :http => 'https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2',
+  spec.source = { :http => 'https://archives.boost.io/release/1.76.0/source/boost_1_76_0.tar.bz2',
                   :sha256 => 'f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41' }
 
   # Pinning to the same version as React.podspec.

package/android/com/facebook/react/hermes-engine/0.70.13/hermes-engine-0.70.13-debug.aar.md5

@@ -1 +0,0 @@
-cdd183d01c330e0e746378a174177350

package/android/com/facebook/react/hermes-engine/0.70.13/hermes-engine-0.70.13-debug.aar.sha1

@@ -1 +0,0 @@
-b756ae04eaf7ee9c3e78ea346c0c1df508b2a21d

package/android/com/facebook/react/hermes-engine/0.70.13/hermes-engine-0.70.13-debug.aar.sha256

@@ -1 +0,0 @@
-23e347bc95eb9d022a2269b7995fe9013717e4ee2bc0dca59ed374ad0795c162

package/android/com/facebook/react/hermes-engine/0.70.13/hermes-engine-0.70.13-debug.aar.sha512

@@ -1 +0,0 @@
-12aa970e1c3b675b1a96dd3d3eb6e6ccb0851495e2a8fa8b222eb0b4f9436b34525b4737fa49a3de950a5395753a79538744cdd764e62c2aeb485f186e548c04

package/android/com/facebook/react/hermes-engine/0.70.13/hermes-engine-0.70.13-release.aar.md5

@@ -1 +0,0 @@
-7b50ec72ea7b499c2b59071e72ebb098

package/android/com/facebook/react/hermes-engine/0.70.13/hermes-engine-0.70.13-release.aar.sha1

@@ -1 +0,0 @@
-b580cad7bac1894092621df081b25d8554e0ed39

package/android/com/facebook/react/hermes-engine/0.70.13/hermes-engine-0.70.13-release.aar.sha256

@@ -1 +0,0 @@
-363efe733c47042c7fdabbb7280d622ba7f715e108025f2d573ca42ca31d0c91

package/android/com/facebook/react/hermes-engine/0.70.13/hermes-engine-0.70.13-release.aar.sha512

@@ -1 +0,0 @@
-96bf4383788f9549467a8af0b9d903bceb7b19f515ed8cf163bcfb67f07975419945ca884a1d447455269597cb0a5d4e62281a01df0b2125e65779fe0b549432

package/android/com/facebook/react/hermes-engine/0.70.13/hermes-engine-0.70.13.module.md5

@@ -1 +0,0 @@
-e85476db47ae0fbf7d54510fd4ec0319

package/android/com/facebook/react/hermes-engine/0.70.13/hermes-engine-0.70.13.module.sha1

@@ -1 +0,0 @@
-64bfc4c133102487b50f8261f70e8b25902998f7

package/android/com/facebook/react/hermes-engine/0.70.13/hermes-engine-0.70.13.module.sha256

@@ -1 +0,0 @@
-830e4ea05e3fbafb90aae989b9076213896f08388f6d9effd1e3fab15076aa46

package/android/com/facebook/react/hermes-engine/0.70.13/hermes-engine-0.70.13.module.sha512

@@ -1 +0,0 @@
-60d090aa7f1258041b4e8b34a1115440ced45d5dd77933de3d7ea89bc9d963afa2adef9055fb5118b6bf89143e709686b07d5bb7929760b5d0b82259cc180c59

package/android/com/facebook/react/hermes-engine/0.70.13/hermes-engine-0.70.13.pom.md5

@@ -1 +0,0 @@
-c767954fce87dd6bb95c1094df931b9a

package/android/com/facebook/react/hermes-engine/0.70.13/hermes-engine-0.70.13.pom.sha1

@@ -1 +0,0 @@
-50ad35aea823f115998ad93efb8b41c2190aa98c

package/android/com/facebook/react/hermes-engine/0.70.13/hermes-engine-0.70.13.pom.sha256

@@ -1 +0,0 @@
-2f1fb101cfb131f4e90752f2868943e5e6f075cf03b4b595724fdadb4fbf9699

package/android/com/facebook/react/hermes-engine/0.70.13/hermes-engine-0.70.13.pom.sha512

@@ -1 +0,0 @@
-4e5cabf3531a0679ae5e623cb2c82b7cd43761f15cf9e8d976560483ba3f457aee53672a89759d2bf33e8f3534fd44735d2f709b99fa6fd636b348cbb82b0f86

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13-debug-sources.jar.md5

@@ -1 +0,0 @@
-be416a9f464dbf58fad7b7c12883f65c

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13-debug-sources.jar.sha1

@@ -1 +0,0 @@
-e261ecc6d6a957caad6e2aefd57302d2f1ad59e6

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13-debug-sources.jar.sha256

@@ -1 +0,0 @@
-2a80cde53a98a6190e10460dacc40f26b9f3c72b84e2e5742a66d2c6cb79b930

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13-debug-sources.jar.sha512

@@ -1 +0,0 @@
-0adaa506cc4c2929819984933eca2bebeac68eed6d6b301b956244870d26f47ad393ed3ea2c7cbd3620eb622d3fd50f1ec45133636541edf47e2e5f36c63c1e8

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13-debug.aar.md5

@@ -1 +0,0 @@
-7d2f18beabbf76c9c895d34d8d8ec285

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13-debug.aar.sha1

@@ -1 +0,0 @@
-682e224af1be0db774776a3212122173f9673ec1

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13-debug.aar.sha256

@@ -1 +0,0 @@
-ffda52fab55caaa005cb66a1d19627f9da00d2f3b5408d65eac9b1c5ac0268dd

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13-debug.aar.sha512

@@ -1 +0,0 @@
-a693893e75a017b40aadfd8e15bea7dbb0808c2af494597029fac37c3c89c7cfc6b00495ee4c8f04a2a241ce020bcf1653dfd931a23a007cec550a162d78cfee

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13-release-sources.jar.md5

@@ -1 +0,0 @@
-75eafb9b1557edcb8337f06c9d8aac5d

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13-release-sources.jar.sha1

@@ -1 +0,0 @@
-a6b1b2fbc9eae72b5f21d2ca1b9c01a6a73ed40f

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13-release-sources.jar.sha256

@@ -1 +0,0 @@
-f3f8060a1505f1ad5192704304c3b4546c16433ba269ae58029d801162717fd8

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13-release-sources.jar.sha512

@@ -1 +0,0 @@
-b000476c177497d5254288a5bf3ef79b0b1bb5a5e5bae5b2711fc36e2b481085bd0294066c937422567d8586b8d001f9bfbf5c249c086f4e3132ea8cdc5ccf64

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13-release.aar.md5

@@ -1 +0,0 @@
-3318cf5542fd6a7750ce54c94d3adbaa

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13-release.aar.sha1

@@ -1 +0,0 @@
-23a39cdd1ddff6de4a958690448bb88b66731a5c

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13-release.aar.sha256

@@ -1 +0,0 @@
-9ad906a4e4f7af90e7dd83945eadd8537dad16dafb39c95324eea78de07124c8

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13-release.aar.sha512

@@ -1 +0,0 @@
-adb8e625688323f6bee9f7b63239527fdda321c6733a31b657e68603d72005ca1a920a6e15405396f4a835631818dc44b7a8d347a431c2608c64fa03d9976abc

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13.module.md5

@@ -1 +0,0 @@
-79338f3c35b851ad473267ded4d7b006

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13.module.sha1

@@ -1 +0,0 @@
-96d5b16328f44694e09c40e7afbd12a7ad977d59

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13.module.sha256

@@ -1 +0,0 @@
-0733f508d6fdd04390ad16a52000337b5751d271adb11bfade5c67d67779af84

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13.module.sha512

@@ -1 +0,0 @@
-2641fab5184fc823b5b2dbd781d3738e6123b20ae6b775d52bcaab33cda6b5ba7d65cab6cc9faacf2aeaa2d52844b75f084d6be7fdd2be0a9f85ed6c1c5598ce

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13.pom.md5

@@ -1 +0,0 @@
-d2771e9fe81a7df91e3f7344feb3b4ad

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13.pom.sha1

@@ -1 +0,0 @@
-3ca46a626e68469221c8f86c15f20599b70500ff

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13.pom.sha256

@@ -1 +0,0 @@
-87c84fbc28fdfb138fcefc9559f849227d940240e2221fef1650acde1c671177

package/android/com/facebook/react/react-native/0.70.13/react-native-0.70.13.pom.sha512

@@ -1 +0,0 @@
-ae75f4e5a2799760bed8688cc11ca7e4ae0664263b7816bc143b7cb5ec194d288e647c45c33270ea60ca0705a108705c5850c84375a9f542bf2014d268ea37ba