Skip to content

fix: remove unnecessary diff after upstreaming changes #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 24, 2024
Merged

fix: remove unnecessary diff after upstreaming changes #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native/sdks/hermes-engine/hermes-engine.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions packages/react-native/sdks/hermes-engine/utils/build-hermes-xcode.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down