Skip to content

Commit cc31520

Browse files
Gyranjacobp100
Gyran
authored and
jacobp100
committed
exclude React/Fabric/ from core
Summary: Thank you for sending the PR! We appreciate you spending the time to work on these changes. Help us understand your motivation by explaining why you decided to make this change. <!-- Required: Write your motivation here. If this PR fixes an issue, type "Fixes #issueNumber" to automatically close the issue when the PR is merged. --> React native does not build on iOS when using Podspec environment. I tried the solution proposed in facebook#18683 and got it to build. Fixes facebook#18683 <!-- Required: Write your test plan here. If you changed any code, please provide us with clear instructions on how you verified your changes work. Bonus points for screenshots and videos! --> <!-- Does this PR require a documentation change? Create a PR at https://github.com/facebook/react-native-website and add a link to it here. --> <!-- Required. Help reviewers and the release process by writing your own release notes. See below for an example. --> [IOS] [BUGFIX] [React.podspec] - Exclude `React/Fabric/*` from Core subspec <!-- **INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.** CATEGORY [----------] TYPE [ CLI ] [-------------] LOCATION [ DOCS ] [ BREAKING ] [-------------] [ GENERAL ] [ BUGFIX ] [ {Component} ] [ INTERNAL ] [ ENHANCEMENT ] [ {Filename} ] [ IOS ] [ FEATURE ] [ {Directory} ] |-----------| [ ANDROID ] [ MINOR ] [ {Framework} ] - | {Message} | [----------] [-------------] [-------------] |-----------| EXAMPLES: [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see --> Closes facebook#18688 Differential Revision: D7505267 Pulled By: hramos fbshipit-source-id: 8e7138ee966d08209a74193e418feaecceefb86a
1 parent baee0ce commit cc31520

File tree

1 file changed

+5
-81
lines changed

1 file changed

+5
-81
lines changed

‎React.podspec

+5-81
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ else
1313
end
1414

1515
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1'
16-
folly_version = '2016.10.31.00'
1716

1817
Pod::Spec.new do |s|
1918
s.name = "React"
@@ -52,7 +51,7 @@ Pod::Spec.new do |s|
5251
"React/Inspector/*",
5352
"ReactCommon/yoga/*",
5453
"React/Cxx*/*",
55-
"React/Fabric/**/*"
54+
"React/Fabric/*",
5655
ss.ios.exclude_files = "React/**/RCTTV*.*"
5756
ss.tvos.exclude_files = "React/Modules/RCTClipboard*",
5857
"React/Views/RCTDatePicker*",
@@ -68,19 +67,12 @@ Pod::Spec.new do |s|
6867
end
6968

7069
s.subspec "CxxBridge" do |ss|
71-
ss.dependency "Folly", folly_version
70+
ss.dependency "Folly", "2016.09.26.00"
7271
ss.dependency "React/Core"
7372
ss.dependency "React/cxxreact"
7473
ss.compiler_flags = folly_compiler_flags
7574
ss.private_header_files = "React/Cxx*/*.h"
7675
ss.source_files = "React/Cxx*/*.{h,m,mm}"
77-
ss.exclude_files = "React/CxxExceptions/**/*"
78-
end
79-
80-
s.subspec "CxxExceptions" do |ss|
81-
ss.dependency "React/CxxBridge"
82-
ss.dependency "React/exceptions"
83-
ss.source_files = "React/CxxExceptions/*.{h,m,mm}"
8476
end
8577

8678
s.subspec "DevSupport" do |ss|
@@ -90,26 +82,13 @@ Pod::Spec.new do |s|
9082
"React/Inspector/*"
9183
end
9284

93-
s.subspec "RCTFabric" do |ss|
94-
ss.dependency "Folly", folly_version
95-
ss.dependency "React/Core"
96-
ss.dependency "React/CxxExceptions"
97-
ss.dependency "React/fabric"
98-
ss.compiler_flags = folly_compiler_flags
99-
ss.source_files = "React/Fabric/**/*.{c,h,m,mm,S,cpp}"
100-
ss.exclude_files = "**/tests/*"
101-
ss.header_dir = "React"
102-
ss.framework = "JavaScriptCore"
103-
ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
104-
end
105-
10685
s.subspec "tvOS" do |ss|
10786
ss.dependency "React/Core"
108-
ss.source_files = "React/**/RCTTV*.{h,m}"
87+
ss.source_files = "React/**/RCTTV*.{h, m}"
10988
end
11089

11190
s.subspec "jschelpers" do |ss|
112-
ss.dependency "Folly", folly_version
91+
ss.dependency "Folly", "2016.09.26.00"
11392
ss.dependency "React/PrivateDatabase"
11493
ss.compiler_flags = folly_compiler_flags
11594
ss.source_files = "ReactCommon/jschelpers/*.{cpp,h}"
@@ -134,69 +113,14 @@ Pod::Spec.new do |s|
134113
ss.dependency "React/jschelpers"
135114
ss.dependency "React/jsinspector"
136115
ss.dependency "boost-for-react-native", "1.63.0"
137-
ss.dependency "Folly", folly_version
116+
ss.dependency "Folly", "2016.09.26.00"
138117
ss.compiler_flags = folly_compiler_flags
139118
ss.source_files = "ReactCommon/cxxreact/*.{cpp,h}"
140119
ss.exclude_files = "ReactCommon/cxxreact/SampleCxxModule.*"
141120
ss.private_header_files = "ReactCommon/cxxreact/*.h"
142121
ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Folly\"" }
143122
end
144123

145-
s.subspec "exceptions" do |ss|
146-
ss.source_files = "ReactCommon/exceptions/*.{cpp,h}"
147-
ss.header_dir = "cxxreact"
148-
ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
149-
end
150-
151-
s.subspec "fabric" do |ss|
152-
ss.subspec "core" do |sss|
153-
sss.dependency "Folly", folly_version
154-
sss.compiler_flags = folly_compiler_flags
155-
sss.source_files = "ReactCommon/fabric/core/**/*.{cpp,h}"
156-
sss.exclude_files = "**/tests/*"
157-
sss.header_dir = "fabric/core"
158-
sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
159-
end
160-
161-
ss.subspec "debug" do |sss|
162-
sss.dependency "Folly", folly_version
163-
sss.compiler_flags = folly_compiler_flags
164-
sss.source_files = "ReactCommon/fabric/debug/**/*.{cpp,h}"
165-
sss.exclude_files = "**/tests/*"
166-
sss.header_dir = "fabric/debug"
167-
sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
168-
end
169-
170-
ss.subspec "graphics" do |sss|
171-
sss.dependency "Folly", folly_version
172-
sss.compiler_flags = folly_compiler_flags
173-
sss.source_files = "ReactCommon/fabric/graphics/**/*.{cpp,h}"
174-
sss.exclude_files = "**/tests/*"
175-
sss.header_dir = "fabric/graphics"
176-
sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
177-
end
178-
179-
ss.subspec "uimanager" do |sss|
180-
sss.dependency "Folly", folly_version
181-
sss.compiler_flags = folly_compiler_flags
182-
sss.source_files = "ReactCommon/fabric/uimanager/**/*.{cpp,h}"
183-
sss.exclude_files = "**/tests/*"
184-
sss.header_dir = "fabric/uimanager"
185-
sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
186-
end
187-
188-
ss.subspec "view" do |sss|
189-
sss.dependency "Folly", folly_version
190-
sss.dependency "yoga"
191-
sss.compiler_flags = folly_compiler_flags
192-
sss.source_files = "ReactCommon/fabric/view/**/*.{cpp,h}"
193-
sss.exclude_files = "**/tests/*"
194-
sss.header_dir = "fabric/view"
195-
sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
196-
end
197-
198-
end
199-
200124
s.subspec "ART" do |ss|
201125
ss.dependency "React/Core"
202126
ss.source_files = "Libraries/ART/**/*.{h,m}"

0 commit comments

Comments
 (0)