First pass at updated podspec

Trying to build the RNTester app and addressing build issues as they come up.
mgriepentrog · Feb 14, 2019 · 44c5649 · 44c5649
1 parent 7c9805c
commit 44c5649
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 15 deletions.
diff --git a/RNTester/Podfile b/RNTester/Podfile
@@ -27,7 +27,7 @@ target 'RNTester' do
 
     # Below this line is Fabric (experimental) specific.
     # Currently they are disabled due to missing pre-reqs, e.g. upgrading Folly.
-    # 'RCTFabric',
+    'RCTFabric',
     # 'RCTFabricSample', # This is RNTesterPods specific sample.
   ]
 

diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock
@@ -17,16 +17,60 @@ PODS:
     - React/jsiexecutor
   - React/cxxreact (1000.0.0):
     - boost-for-react-native (= 1.63.0)
+    - DoubleConversion
     - Folly (= 2018.10.22.00)
+    - glog
     - React/jsinspector
   - React/DevSupport (1000.0.0):
     - React/Core
     - React/RCTWebSocket
+  - React/fabric (1000.0.0):
+    - React/fabric/activityindicator (= 1000.0.0)
+    - React/fabric/attributedstring (= 1000.0.0)
+    - React/fabric/config (= 1000.0.0)
+    - React/fabric/core (= 1000.0.0)
+    - React/fabric/debug (= 1000.0.0)
+    - React/fabric/events (= 1000.0.0)
+    - React/fabric/graphics (= 1000.0.0)
+    - React/fabric/scrollview (= 1000.0.0)
+    - React/fabric/text (= 1000.0.0)
+    - React/fabric/textlayoutmanager (= 1000.0.0)
+    - React/fabric/uimanager (= 1000.0.0)
+    - React/fabric/view (= 1000.0.0)
+  - React/fabric/activityindicator (1000.0.0):
+    - Folly (= 2018.10.22.00)
+  - React/fabric/attributedstring (1000.0.0):
+    - Folly (= 2018.10.22.00)
+  - React/fabric/config (1000.0.0):
+    - Folly (= 2018.10.22.00)
+  - React/fabric/core (1000.0.0):
+    - Folly (= 2018.10.22.00)
+  - React/fabric/debug (1000.0.0):
+    - Folly (= 2018.10.22.00)
+  - React/fabric/events (1000.0.0):
+    - Folly (= 2018.10.22.00)
+  - React/fabric/graphics (1000.0.0):
+    - Folly (= 2018.10.22.00)
+  - React/fabric/scrollview (1000.0.0):
+    - Folly (= 2018.10.22.00)
+  - React/fabric/text (1000.0.0):
+    - Folly (= 2018.10.22.00)
+  - React/fabric/textlayoutmanager (1000.0.0):
+    - Folly (= 2018.10.22.00)
+  - React/fabric/uimanager (1000.0.0):
+    - Folly (= 2018.10.22.00)
+  - React/fabric/view (1000.0.0):
+    - Folly (= 2018.10.22.00)
+    - yoga
   - React/fishhook (1000.0.0)
   - React/jsi (1000.0.0):
+    - DoubleConversion
     - Folly (= 2018.10.22.00)
+    - glog
   - React/jsiexecutor (1000.0.0):
+    - DoubleConversion
     - Folly (= 2018.10.22.00)
+    - glog
     - React/cxxreact
     - React/jsi
   - React/jsinspector (1000.0.0)
@@ -39,6 +83,10 @@ PODS:
   - React/RCTCameraRoll (1000.0.0):
     - React/Core
     - React/RCTImage
+  - React/RCTFabric (1000.0.0):
+    - Folly (= 2018.10.22.00)
+    - React/Core
+    - React/fabric
   - React/RCTGeolocation (1000.0.0):
     - React/Core
   - React/RCTImage (1000.0.0):
@@ -74,6 +122,7 @@ DEPENDENCIES:
   - React/RCTAnimation (from `../`)
   - React/RCTBlob (from `../`)
   - React/RCTCameraRoll (from `../`)
+  - React/RCTFabric (from `../`)
   - React/RCTGeolocation (from `../`)
   - React/RCTImage (from `../`)
   - React/RCTLinkingIOS (from `../`)
@@ -104,11 +153,11 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
-  Folly: de497beb10f102453a1afa9edbf8cf8a251890de
+  Folly: 71feb3c45061d21e66b72697464807724d5074b7
   glog: aefd1eb5dda2ab95ba0938556f34b98e2da3a60d
-  React: 9b873b38b92ed8012d7cdf3b965477095ed364c4
-  yoga: 0885622311729a02c2bc02dca97167787a51488b
+  React: 228df4560de8636a380433c3fff3eb05891e3596
+  yoga: 128daf064cacaede0c3bb27424b6b4c71052e6cd
 
-PODFILE CHECKSUM: 7af77fbc34af9646e8c6389e7e2c0b4663bb16d9
+PODFILE CHECKSUM: 84b1fad124f8db4cc35a73a222fb8c362bc2c994
 
 COCOAPODS: 1.5.3
diff --git a/React.podspec b/React.podspec
@@ -174,12 +174,21 @@ Pod::Spec.new do |s|
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
     end
 
+    ss.subspec "config" do |sss|
+      sss.dependency             "Folly", folly_version
+      sss.compiler_flags       = folly_compiler_flags
+      sss.source_files         = "ReactCommon/config/**/*.{cpp,h}"
+      sss.exclude_files        = "**/tests/*"
+      sss.header_dir           = "react/config"
+      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
+    end
+
     ss.subspec "core" do |sss|
       sss.dependency             "Folly", folly_version
       sss.compiler_flags       = folly_compiler_flags
       sss.source_files         = "ReactCommon/fabric/core/**/*.{cpp,h}"
       sss.exclude_files        = "**/tests/*"
-      sss.header_dir           = "fabric/core"
+      sss.header_dir           = "react/core"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
     end
 
@@ -188,16 +197,26 @@ Pod::Spec.new do |s|
       sss.compiler_flags       = folly_compiler_flags
       sss.source_files         = "ReactCommon/fabric/debug/**/*.{cpp,h}"
       sss.exclude_files        = "**/tests/*"
-      sss.header_dir           = "fabric/debug"
+      sss.header_dir           = "react/debug"
+      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
+    end
+
+    ss.subspec "events" do |sss|
+      sss.dependency             "Folly", folly_version
+      sss.compiler_flags       = folly_compiler_flags
+      sss.source_files         = "ReactCommon/fabric/events/**/*.{cpp,h}"
+      sss.exclude_files        = "**/tests/*"
+      sss.header_dir           = "react/events"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
     end
 
     ss.subspec "graphics" do |sss|
       sss.dependency             "Folly", folly_version
       sss.compiler_flags       = folly_compiler_flags
-      sss.source_files         = "ReactCommon/fabric/graphics/**/*.{cpp,h}"
+      sss.source_files         = "ReactCommon/fabric/graphics/*.h", "ReactCommon/fabric/graphics/platform/ios/**/*.{cpp,h}"
       sss.exclude_files        = "**/tests/*"
-      sss.header_dir           = "fabric/graphics"
+      sss.header_dir           = "react/graphics"
+      sss.ios.frameworks       = %w{CoreGraphics Foundation UIKit}
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
     end
 
@@ -206,7 +225,7 @@ Pod::Spec.new do |s|
       sss.compiler_flags       = folly_compiler_flags
       sss.source_files         = "ReactCommon/fabric/scrollview/**/*.{cpp,h}"
       sss.exclude_files        = "**/tests/*"
-      sss.header_dir           = "fabric/scrollview"
+      sss.header_dir           = "react/scrollview"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
     end
 
@@ -215,7 +234,7 @@ Pod::Spec.new do |s|
       sss.compiler_flags       = folly_compiler_flags
       sss.source_files         = "ReactCommon/fabric/text/**/*.{cpp,h}"
       sss.exclude_files        = "**/tests/*"
-      sss.header_dir           = "fabric/text"
+      sss.header_dir           = "react/text"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
     end
 
@@ -224,7 +243,7 @@ Pod::Spec.new do |s|
       sss.compiler_flags       = folly_compiler_flags
       sss.source_files         = "ReactCommon/fabric/textlayoutmanager/**/*.{cpp,h,mm}"
       sss.exclude_files        = "**/tests/*"
-      sss.header_dir           = "fabric/textlayoutmanager"
+      sss.header_dir           = "react/textlayoutmanager"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
     end
 
@@ -233,17 +252,17 @@ Pod::Spec.new do |s|
       sss.compiler_flags       = folly_compiler_flags
       sss.source_files         = "ReactCommon/fabric/uimanager/**/*.{cpp,h}"
       sss.exclude_files        = "**/tests/*"
-      sss.header_dir           = "fabric/uimanager"
+      sss.header_dir           = "react/uimanager"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
     end
 
     ss.subspec "view" do |sss|
       sss.dependency             "Folly", folly_version
       sss.dependency             "yoga"
       sss.compiler_flags       = folly_compiler_flags
-      sss.source_files         = "ReactCommon/fabric/view/**/*.{cpp,h}"
+      sss.source_files         = "ReactCommon/fabric/components/view/**/*.{cpp,h}"
       sss.exclude_files        = "**/tests/*"
-      sss.header_dir           = "fabric/view"
+      sss.header_dir           = "react/components/view"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
     end
   end

diff --git a/third-party-podspecs/Folly.podspec b/third-party-podspecs/Folly.podspec
@@ -34,6 +34,7 @@ Pod::Spec.new do |spec|
                       'folly/memory/detail/MallocImpl.cpp'
   # workaround for https://github.com/facebook/react-native/issues/14326
   spec.preserve_paths = 'folly/*.h',
+                        'folly/concurrency/*.h',
                         'folly/container/*.h',
                         'folly/container/detail/*.h',
                         'folly/detail/*.h',