Skip to content

Commit b67b7ba

Browse files
Saadnajmimeta-codesync[bot]
authored andcommitted
fix(podspec): remove duplicate scrollview subspec in React-FabricComponents (#57452)
Summary: Upstream version of our react-native-macos fix (microsoft#2969). The `scrollview` subspec is declared in both `React-Fabric.podspec` (recursive `scrollview/**/*` glob) and `React-FabricComponents.podspec` (`scrollview/*` + `platform/cxx` + `platform/ios`). The globs overlap, so after `pod install` the same sources (`ScrollViewShadowNode.cpp`, `BaseScrollViewProps.cpp`, `ScrollEvent.cpp`, etc.) land in both the `React-Fabric` and `React-FabricComponents` Pods targets, and consumers that link both (e.g. via `-all_load`) hit duplicate symbol errors. `React-Fabric.podspec`'s recursive glob already covers everything FabricComponents listed, so this removes the duplicate subspec. Note on SPM: the SPM manifest (`Package.swift`) handles scrollview differently — it's assigned solely to the `React-Fabric` target, with no FabricComponents scrollview target. This is an existing divergence between the CocoaPods and SPM setups; this PR only touches CocoaPods, so SPM is unaffected. ## Changelog: [Internal] - Pull Request resolved: #57452 Test Plan: CI should pass. Reviewed By: christophpurrer Differential Revision: D110914625 Pulled By: cipolleschi fbshipit-source-id: 2617470ef71ba2e827646d087ab876ee008b88c3
1 parent 904f0ae commit b67b7ba

1 file changed

Lines changed: 0 additions & 11 deletions

File tree

‎packages/react-native/ReactCommon/React-FabricComponents.podspec‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,6 @@ Pod::Spec.new do |s|
101101
sss.header_dir = "react/renderer/components/safeareaview"
102102
end
103103

104-
ss.subspec "scrollview" do |sss|
105-
sss.source_files = podspec_sources(["react/renderer/components/scrollview/*.{m,mm,cpp,h}",
106-
"react/renderer/components/scrollview/platform/cxx/**/*.{m,mm,cpp,h}",
107-
"react/renderer/components/scrollview/platform/ios/**/*.{m,mm,cpp,h}"],
108-
["react/renderer/components/scrollview/*.h",
109-
"react/renderer/components/scrollview/platform/cxx/**/*.h",
110-
"react/renderer/components/scrollview/platform/ios/**/*.h"])
111-
sss.exclude_files = "react/renderer/components/scrollview/tests"
112-
sss.header_dir = "react/renderer/components/scrollview"
113-
end
114-
115104
ss.subspec "text" do |sss|
116105
sss.source_files = podspec_sources(["react/renderer/components/text/*.{m,mm,cpp,h}",
117106
"react/renderer/components/text/platform/cxx/**/*.{m,mm,cpp,h}"],

0 commit comments

Comments
 (0)