Skip to content

Commit 94719da

Browse files
authored
fix: remove unnecessary diff after upstreaming changes (#151)
1 parent 2dd3f3f commit 94719da

File tree

5 files changed

+2
-11
lines changed

5 files changed

+2
-11
lines changed

packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec

-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ Pod::Spec.new do |s|
4545
"HEADER_SEARCH_PATHS" => header_search_paths.join(' ')
4646
}
4747
s.framework = "UIKit"
48-
49-
s.framework = "UIKit"
5048

5149
s.dependency "React-Core/RCTLinkingHeaders", version
5250
s.dependency "ReactCommon/turbomodule/core", version

packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec

-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ Pod::Spec.new do |s|
4444
"HEADER_SEARCH_PATHS" => header_search_paths.join(" ")
4545
}
4646
s.framework = ["UIKit", "QuartzCore"]
47-
48-
s.framework = ["UIKit", "QuartzCore"]
4947

5048
s.dependency "RCT-Folly", folly_version
5149
s.dependency "RCTTypeSafety"

packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec

-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ Pod::Spec.new do |s|
5555
header_search_paths = header_search_paths + ["\"$(PODS_TARGET_SRCROOT)/platform/ios\""]
5656
end
5757

58-
s.framework = "UIKit"
59-
6058
s.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
6159
"HEADER_SEARCH_PATHS" => header_search_paths.join(" "),
6260
"DEFINES_MODULE" => "YES",

packages/react-native/sdks/hermes-engine/hermes-engine.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ react_native_path = File.join(__dir__, "..", "..")
1212
package = JSON.parse(File.read(File.join(react_native_path, "package.json")))
1313
version = package['version']
1414

15-
# Temporaily build from source until visionOS supports prebuilt binaries
16-
source_type = HermesEngineSourceType::BUILD_FROM_GITHUB_MAIN # hermes_source_type(version, react_native_path)
15+
source_type = hermes_source_type(version, react_native_path)
1716
source = podspec_source(source_type, version, react_native_path)
1817

1918
Pod::Spec.new do |spec|
@@ -139,6 +138,7 @@ Pod::Spec.new do |spec|
139138
:name => '[RN] [2] Build Hermes',
140139
:input_files => ["#{hermesc_path}/ImportHermesc.cmake"],
141140
:output_files => [
141+
"${PODS_ROOT}/hermes-engine/build/iphonesimulator/API/hermes/hermes.framework/hermes",
142142
"${PODS_ROOT}/hermes-engine/build/xrsimulator/API/hermes/hermes.framework/hermes",
143143
],
144144
:script => <<-EOS

packages/react-native/sdks/hermes-engine/utils/build-hermes-xcode.sh

-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ function get_deployment_target {
3131
elif [[ $1 == "xrsimulator" || $1 == "xros" ]]; then
3232
echo "${XROS_DEPLOYMENT_TARGET}"
3333
return
34-
elif [[ $1 == "xrsimulator" || $1 == "xros" ]]; then
35-
echo ${XROS_DEPLOYMENT_TARGET}
36-
return
3734
fi
3835

3936
echo "${IPHONEOS_DEPLOYMENT_TARGET}"

0 commit comments

Comments
 (0)