Bring back JSIDynamic and JSI together

Summary: In 0.71.0-RC.2, we had a regression in `use_frameworks!`. This brings back JSIDynamic and JSI together because the current setup is not compatible with iOS frameworks ## Changelog [iOS][Added] - Bring back JSIDynamic and JSI Reviewed By: cortinico Differential Revision: D41557823 fbshipit-source-id: 95eb2fe7df69992861396e41d11cd5182193e1a3 # Conflicts: # ReactCommon/jsi/React-jsidynamic.podspec
facebook · Nov 30, 2022 · c8ef846 · c8ef846
1 parent 3a21810
commit c8ef846
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 51 deletions.
diff --git a/ReactCommon/React-Fabric.podspec b/ReactCommon/React-Fabric.podspec
@@ -78,7 +78,6 @@ Pod::Spec.new do |s|
 
   s.subspec "core" do |ss|
     ss.dependency             folly_dep_name, folly_version
-    ss.dependency             "React-jsidynamic", version
     ss.compiler_flags       = folly_compiler_flags + ' ' + boost_compiler_flags
     ss.source_files         = "react/renderer/core/**/*.{m,mm,cpp,h}"
     ss.exclude_files        = "react/renderer/core/tests"
@@ -303,7 +302,6 @@ Pod::Spec.new do |s|
 
   s.subspec "uimanager" do |ss|
     ss.dependency             folly_dep_name, folly_version
-    ss.dependency             "React-jsidynamic", version
     ss.compiler_flags       = folly_compiler_flags
     ss.source_files         = "react/renderer/uimanager/**/*.{m,mm,cpp,h}"
     ss.exclude_files        = "react/renderer/uimanager/tests"

diff --git a/ReactCommon/ReactCommon.podspec b/ReactCommon/ReactCommon.podspec
@@ -61,7 +61,6 @@ Pod::Spec.new do |s|
     ss.subspec "core" do |sss|
       sss.source_files = "react/nativemodule/core/ReactCommon/**/*.{cpp,h}",
                          "react/nativemodule/core/platform/ios/**/*.{mm,cpp,h}"
-      sss.dependency "React-jsidynamic", version
       sss.exclude_files = "react/nativemodule/core/ReactCommon/{LongLivedObject,CallbackWrapper}.h"
     end
 

diff --git a/ReactCommon/hermes/React-hermes.podspec b/ReactCommon/hermes/React-hermes.podspec
@@ -44,7 +44,6 @@ Pod::Spec.new do |s|
                              }.merge!(build_type == :debug ? { "GCC_PREPROCESSOR_DEFINITIONS" => "HERMES_ENABLE_DEBUGGER=1" } : {})
   s.header_dir             = "reacthermes"
   s.dependency "React-cxxreact", version
-  s.dependency "React-jsidynamic", version
   s.dependency "React-jsiexecutor", version
   s.dependency "React-jsinspector", version
   s.dependency "React-perflogger", version

diff --git a/ReactCommon/jsi/React-jsi.podspec b/ReactCommon/jsi/React-jsi.podspec
@@ -20,6 +20,10 @@ else
   source[:tag] = "v#{version}"
 end
 
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+folly_version = '2021.07.22.00'
+boost_compiler_flags = '-Wno-documentation'
+
 Pod::Spec.new do |s|
   s.name                   = "React-jsi"
   s.version                = version
@@ -30,18 +34,27 @@ Pod::Spec.new do |s|
   s.platforms              = { :ios => "12.4" }
   s.source                 = source
 
+  s.header_dir    = "jsi"
+  s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
+
+  s.dependency "boost", "1.76.0"
+  s.dependency "DoubleConversion"
+  s.dependency "RCT-Folly", folly_version
+  s.dependency "glog"
+
   if js_engine == :jsc
     s.source_files  = "**/*.{cpp,h}"
     s.exclude_files = [
-                        "jsi/JSIDynamic.{h,cpp}",
                         "jsi/jsilib-posix.cpp",
                         "jsi/jsilib-windows.cpp",
                         "**/test/*"
                       ]
-    s.header_dir    = "jsi"
+
   elsif js_engine == :hermes
     # JSI is provided by hermes-engine when Hermes is enabled
-    s.source_files = ""
+    # Just need to provide JSIDynamic in this case.
+    s.source_files = "jsi/JSIDynamic.{cpp,h}"
     s.dependency "hermes-engine"
   end
 end
diff --git a/ReactCommon/jsi/React-jsidynamic.podspec b/ReactCommon/jsi/React-jsidynamic.podspec
diff --git a/ReactCommon/jsiexecutor/React-jsiexecutor.podspec b/ReactCommon/jsiexecutor/React-jsiexecutor.podspec
@@ -36,7 +36,6 @@ Pod::Spec.new do |s|
 
   s.dependency "React-cxxreact", version
   s.dependency "React-jsi", version
-  s.dependency "React-jsidynamic", version
   s.dependency "React-perflogger", version
   s.dependency "RCT-Folly", folly_version
   s.dependency "DoubleConversion"

diff --git a/scripts/react_native_pods.rb b/scripts/react_native_pods.rb
@@ -100,7 +100,7 @@ def use_react_native! (
   else
     setup_jsc!(:react_native_path => prefix, :fabric_enabled => fabric_enabled)
   end
-  pod 'React-jsidynamic', :path => "#{prefix}/ReactCommon/jsi"
+
   pod 'React-jsiexecutor', :path => "#{prefix}/ReactCommon/jsiexecutor"
   pod 'React-jsinspector', :path => "#{prefix}/ReactCommon/jsinspector"