fix: remove unnecessary diff after upstreaming changes (#151)

callstack · Jun 24, 2024 · 94719da · 94719da
1 parent 2dd3f3f
commit 94719da
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 11 deletions.
diff --git a/packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec b/packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec
@@ -45,8 +45,6 @@ Pod::Spec.new do |s|
                                "HEADER_SEARCH_PATHS" => header_search_paths.join(' ')
                              }
   s.framework = "UIKit"
-
-  s.framework = "UIKit"
 
   s.dependency "React-Core/RCTLinkingHeaders", version
   s.dependency "ReactCommon/turbomodule/core", version

diff --git a/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec b/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec
@@ -44,8 +44,6 @@ Pod::Spec.new do |s|
                                "HEADER_SEARCH_PATHS" => header_search_paths.join(" ")
                              }
   s.framework = ["UIKit", "QuartzCore"]
-
-  s.framework = ["UIKit", "QuartzCore"]
 
   s.dependency "RCT-Folly", folly_version
   s.dependency "RCTTypeSafety"

diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec b/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec
@@ -55,8 +55,6 @@ Pod::Spec.new do |s|
     header_search_paths = header_search_paths + ["\"$(PODS_TARGET_SRCROOT)/platform/ios\""]
   end
 
-  s.framework = "UIKit"
-
   s.pod_target_xcconfig  = { "USE_HEADERMAP" => "NO",
                              "HEADER_SEARCH_PATHS" => header_search_paths.join(" "),
                              "DEFINES_MODULE" => "YES",

diff --git a/packages/react-native/sdks/hermes-engine/hermes-engine.podspec b/packages/react-native/sdks/hermes-engine/hermes-engine.podspec
@@ -12,8 +12,7 @@ react_native_path = File.join(__dir__, "..", "..")
 package = JSON.parse(File.read(File.join(react_native_path, "package.json")))
 version = package['version']
 
-# Temporaily build from source until visionOS supports prebuilt binaries
-source_type = HermesEngineSourceType::BUILD_FROM_GITHUB_MAIN # hermes_source_type(version, react_native_path)
+source_type = hermes_source_type(version, react_native_path)
 source = podspec_source(source_type, version, react_native_path)
 
 Pod::Spec.new do |spec|
@@ -139,6 +138,7 @@ Pod::Spec.new do |spec|
           :name => '[RN] [2] Build Hermes',
           :input_files => ["#{hermesc_path}/ImportHermesc.cmake"],
           :output_files => [
+            "${PODS_ROOT}/hermes-engine/build/iphonesimulator/API/hermes/hermes.framework/hermes",
             "${PODS_ROOT}/hermes-engine/build/xrsimulator/API/hermes/hermes.framework/hermes",
           ],
           :script => <<-EOS

diff --git a/packages/react-native/sdks/hermes-engine/utils/build-hermes-xcode.sh b/packages/react-native/sdks/hermes-engine/utils/build-hermes-xcode.sh
@@ -31,9 +31,6 @@ function get_deployment_target {
     elif [[ $1 == "xrsimulator" || $1 == "xros" ]]; then
       echo "${XROS_DEPLOYMENT_TARGET}"
       return
-    elif [[ $1 == "xrsimulator" || $1 == "xros" ]]; then
-      echo ${XROS_DEPLOYMENT_TARGET}
-      return
     fi
 
     echo "${IPHONEOS_DEPLOYMENT_TARGET}"