Update Componentkit, Yoga, YogaKit

Summary: Fixed the broken master for flipper iOS  oss

Reviewed By: jknoxville

Differential Revision: D14686908

fbshipit-source-id: abdcacf279449f83c98d1635c65ff8759ee17926

docs/getting-started.md

@@ -114,16 +114,16 @@ target 'MyApp' do
   pod 'FlipperKit/FlipperKitLayoutComponentKitSupport', '~>' + flipperkit_version
   pod 'FlipperKit/SKIOSNetworkPlugin', '~>' + flipperkit_version
   pod 'FlipperKit/FlipperKitUserDefaultsPlugin', '~>' + flipperkit_version
-  # This post_install script adds swift version to yogakit's pod target.
+  # This post_install script adds min deployment iOS version to yoga's pod target.
   # It also adds -DFB_SONARKIT_ENABLED=1 flag to OTHER_CFLAGS, necessary to build expose Flipper classes in the header files
   post_install do |installer|
-	    installer.pods_project.targets.each do |target|
+      installer.pods_project.targets.each do |target|
-	        if ['YogaKit'].include? target.name
+               if ('Yoga' == target.name)
-	            target.build_configurations.each do |config|
+                   target.build_configurations.each do |config|
-	                config.build_settings['SWIFT_VERSION'] = swift_version
+                     config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '8.0'
-	            end
+                   end
-	        end
+               end
-	    end
+       end
 	    file_name = Dir.glob("*.xcodeproj")[0]
 	    app_project = Xcodeproj::Project.open(file_name)
 	    app_project.native_targets.each do |target|
@@ -210,10 +210,18 @@ target 'MyApp' do
   #   end
   # end
 
-# This post_install script adds -DFB_SONARKIT_ENABLED flag to OTHER_SWIFT_FLAGS, necessary to build swift target
+# This post_install script adds min deployment iOS version to yoga's pod target.
+# It also adds -DFB_SONARKIT_ENABLED flag to OTHER_SWIFT_FLAGS, necessary to build swift target
     post_install do |installer|
       file_name = Dir.glob("*.xcodeproj")[0]
       app_project = Xcodeproj::Project.open(file_name)
+      installer.pods_project.targets.each do |target|
+               if ('Yoga' == target.name)
+                   target.build_configurations.each do |config|
+                     config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '8.0'
+                   end
+               end
+       end
       app_project.native_targets.each do |target|
           target.build_configurations.each do |config|
             if (config.build_settings['OTHER_SWIFT_FLAGS'])

iOS/FlipperKit.podspec

@@ -1,6 +1,6 @@
 folly_compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_LIBGFLAGS=0 -DFOLLY_HAVE_LIBJEMALLOC=0 -DFOLLY_HAVE_PREADV=0 -DFOLLY_HAVE_PWRITEV=0 -DFOLLY_HAVE_TFO=0 -DFOLLY_USE_SYMBOLIZER=0'
-yoga_version = '~> 1.9'
+yoga_version = '~> 1.12.0-pre.1'
-yogakit_version = '~>1.10'
+yogakit_version = '~> 1.12.0-pre.1'
 flipperkit_version = '0.19.0'
 Pod::Spec.new do |spec|
   spec.name = 'FlipperKit'
@@ -116,7 +116,7 @@ Pod::Spec.new do |spec|
     ss.header_dir = "FlipperKitLayoutComponentKitSupport"
     ss.dependency             'FlipperKit/Core'
     ss.dependency             'Yoga', yoga_version
-    ss.dependency             'ComponentKit'
+    ss.dependency             'ComponentKit', '~> 0.25'
     ss.dependency             'FlipperKit/FlipperKitLayoutPlugin'
     ss.compiler_flags       = folly_compiler_flags
     ss.dependency             'FlipperKit/FlipperKitLayoutPlugin'

iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.mm

@@ -8,15 +8,8 @@
 #if FB_SONARKIT_ENABLED
 
 #import "SKComponentHostingViewDescriptor.h"
-
-// TODO T41966103 Remove conditional imports
-#if FLIPPER_OSS
-#import <ComponentKit/CKComponentDataSourceAttachController.h>
-#import <ComponentKit/CKComponentDataSourceAttachControllerInternal.h>
-#else
 #import <ComponentKit/CKComponentAttachController.h>
 #import <ComponentKit/CKComponentAttachControllerInternal.h>
-#endif
 #import <ComponentKit/CKComponentHostingView.h>
 #import <ComponentKit/CKComponentHostingViewInternal.h>
 #import <ComponentKit/CKComponentLayout.h>

iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutWrapper.mm

@@ -11,14 +11,8 @@
 
 #import <ComponentKit/CKComponent.h>
 #import <ComponentKit/CKComponentRootView.h>
-// TODO T41966103 Remove conditional imports
-#if FLIPPER_OSS
-#import <ComponentKit/CKComponentDataSourceAttachController.h>
-#import <ComponentKit/CKComponentDataSourceAttachControllerInternal.h>
-#else
 #import <ComponentKit/CKComponentAttachController.h>
 #import <ComponentKit/CKComponentAttachControllerInternal.h>
-#endif
 #import <ComponentKit/CKInspectableView.h>
 
 static char const kLayoutWrapperKey = ' ';

iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm

@@ -10,13 +10,9 @@
 #import "SKComponentRootViewDescriptor.h"
 
 // TODO T41966103 Remove conditional imports
-#if FLIPPER_OSS
+
-#import <ComponentKit/CKComponentDataSourceAttachController.h>
-#import <ComponentKit/CKComponentDataSourceAttachControllerInternal.h>
-#else
 #import <ComponentKit/CKComponentAttachController.h>
 #import <ComponentKit/CKComponentAttachControllerInternal.h>
-#endif
 #import <ComponentKit/CKComponentHostingView.h>
 #import <ComponentKit/CKComponentHostingViewInternal.h>
 #import <ComponentKit/CKComponentLayout.h>

iOS/Sample/Podfile

@@ -16,6 +16,13 @@ target 'Sample' do
   post_install do |installer|
 	    file_name = Dir.glob("*.xcodeproj")[0]
 	    app_project = Xcodeproj::Project.open(file_name)
+      installer.pods_project.targets.each do |target|
+               if ('Yoga' == target.name)
+                   target.build_configurations.each do |config|
+                     config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '8.0'
+                   end
+               end
+       end
 	    app_project.native_targets.each do |target|
 	        target.build_configurations.each do |config|
 	          if (config.build_settings['OTHER_CFLAGS'])

iOS/SampleSwift/Podfile

@@ -14,6 +14,13 @@ target 'SampleSwift' do
   post_install do |installer|
     file_name = Dir.glob("*.xcodeproj")[0]
     app_project = Xcodeproj::Project.open(file_name)
+    installer.pods_project.targets.each do |target|
+             if ('Yoga' == target.name)
+                 target.build_configurations.each do |config|
+                   config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '8.0'
+                 end
+             end
+     end
     app_project.native_targets.each do |target|
       target.build_configurations.each do |config|
         if (config.build_settings['OTHER_SWIFT_FLAGS'])