From c95c59342ee1719a13cf0c747fd955edf2abf79b Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa Date: Mon, 21 Nov 2022 07:09:43 -0800 Subject: [PATCH] Remove CK from Sample (#4321) Summary: Pull Request resolved: https://github.com/facebook/flipper/pull/4321 ^ Reviewed By: antonk52 Differential Revision: D41434959 fbshipit-source-id: 35fe20a2e04af1d6011f0fb9c82aee4eb504fdc7 --- FlipperKit.podspec | 2 +- iOS/Sample/AppDelegate.m | 5 +- iOS/Sample/MainStoryBoard.storyboard | 111 ++++++++------------ iOS/Sample/MainViewController.mm | 8 -- iOS/Sample/Podfile | 5 +- iOS/Sample/Podfile.lock | 23 +--- iOS/Sample/RootViewController.h | 12 --- iOS/Sample/RootViewController.mm | 85 --------------- iOS/Sample/Sample.xcodeproj/project.pbxproj | 8 -- 9 files changed, 50 insertions(+), 209 deletions(-) delete mode 100644 iOS/Sample/RootViewController.h delete mode 100644 iOS/Sample/RootViewController.mm diff --git a/FlipperKit.podspec b/FlipperKit.podspec index 2403a7219..72876874e 100644 --- a/FlipperKit.podspec +++ b/FlipperKit.podspec @@ -153,7 +153,7 @@ Pod::Spec.new do |spec| ss.header_dir = "FlipperKitLayoutComponentKitSupport" ss.dependency 'FlipperKit/Core' ss.dependency 'ComponentKit', '0.31' - ss.dependency 'RenderCore', '0.31' # Pinning it to 0.30, as there won't be any new releases from CK team. + ss.dependency 'RenderCore', '0.31' ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' ss.dependency 'FlipperKit/FlipperKitLayoutTextSearchable' ss.dependency 'FlipperKit/FlipperKitHighlightOverlay' diff --git a/iOS/Sample/AppDelegate.m b/iOS/Sample/AppDelegate.m index c22195b6a..0a7236137 100644 --- a/iOS/Sample/AppDelegate.m +++ b/iOS/Sample/AppDelegate.m @@ -8,7 +8,6 @@ #import "AppDelegate.h" #import #import -#import #import #import #import @@ -16,7 +15,6 @@ #import #import "MainViewController.h" -#import "RootViewController.h" #if !FB_SONARKIT_ENABLED #error \ @@ -34,8 +32,7 @@ SKDescriptorMapper* layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults]; - [FlipperKitLayoutComponentKitSupport - setUpWithDescriptorMapper:layoutDescriptorMapper]; + [client addPlugin:[[FlipperKitLayoutPlugin alloc] initWithRootNode:application withDescriptorMapper:layoutDescriptorMapper]]; diff --git a/iOS/Sample/MainStoryBoard.storyboard b/iOS/Sample/MainStoryBoard.storyboard index 294d872e2..161bcbb26 100644 --- a/iOS/Sample/MainStoryBoard.storyboard +++ b/iOS/Sample/MainStoryBoard.storyboard @@ -1,11 +1,8 @@ - - - - + + - - + @@ -19,10 +16,10 @@ - + - - - + - + - - + - + @@ -100,6 +96,7 @@ + @@ -131,7 +128,6 @@ - @@ -151,13 +147,12 @@ - + - - - - - - + - - - - + - - + + - @@ -276,12 +253,12 @@ - + - - - - + - - + - + @@ -416,7 +392,6 @@ - @@ -429,6 +404,6 @@ - + diff --git a/iOS/Sample/MainViewController.mm b/iOS/Sample/MainViewController.mm index 98eafe48f..d517de842 100644 --- a/iOS/Sample/MainViewController.mm +++ b/iOS/Sample/MainViewController.mm @@ -10,7 +10,6 @@ #import #import "CommunicationDemoViewController.h" #import "NetworkViewController.h" -#import "RootViewController.h" #import "UserDefaultsViewController.h" @interface MainViewController () @@ -29,13 +28,6 @@ [self.navigationController pushViewController:controller animated:true]; } -- (IBAction)tappedComponentKitLayout:(UIButton*)sender { - RootViewController* rootViewController = [RootViewController new]; - - [self.navigationController pushViewController:rootViewController - animated:true]; -} - - (IBAction)tappedNetworkInspector:(UIButton*)sender { UIStoryboard* storyboard = [UIStoryboard storyboardWithName:@"MainStoryBoard" bundle:nil]; diff --git a/iOS/Sample/Podfile b/iOS/Sample/Podfile index f2212b18f..cd49c16aa 100644 --- a/iOS/Sample/Podfile +++ b/iOS/Sample/Podfile @@ -6,8 +6,8 @@ target 'Sample' do platform :ios, '10.0' # See docs/getting-started/ios-native.mdx - pod 'FlipperKit', :path => '../../FlipperKit.podspec', :configuration => 'Debug' - pod 'FlipperKit/FlipperKitLayoutComponentKitSupport', :path => '../../FlipperKit.podspec', :configuration => 'Debug' + pod 'FlipperKit', :path => '../../FlipperKit.podspec', :configuration => 'Debug' + pod 'FlipperKit/FlipperKitLayoutPlugin', :path => '../../FlipperKit.podspec', :configuration => 'Debug' pod 'FlipperKit/SKIOSNetworkPlugin', :path => '../../FlipperKit.podspec', :configuration => 'Debug' pod 'FlipperKit/FlipperKitUserDefaultsPlugin', :path => '../../FlipperKit.podspec', :configuration => 'Debug' pod 'FlipperKit/FlipperKitExamplePlugin', :path => '../../FlipperKit.podspec', :configuration => 'Debug' @@ -21,7 +21,6 @@ target 'Sample' do pod 'Flipper-Boost-iOSX', :configuration => 'Debug' pod 'OpenSSL-Universal', :configuration => 'Debug' pod 'CocoaAsyncSocket', :configuration => 'Debug' - pod 'ComponentKit', '~> 0.31' pod 'SocketRocket', '~> 0.6.0' end diff --git a/iOS/Sample/Podfile.lock b/iOS/Sample/Podfile.lock index 04012a669..5507722d4 100644 --- a/iOS/Sample/Podfile.lock +++ b/iOS/Sample/Podfile.lock @@ -1,8 +1,5 @@ PODS: - CocoaAsyncSocket (7.6.5) - - ComponentKit (0.31): - - RenderCore (= 0.31) - - Yoga (~> 1.14) - Flipper (0.172.0): - Flipper-Folly (~> 2.6) - Flipper-Boost-iOSX (1.76.0.1.11) @@ -37,14 +34,6 @@ PODS: - FlipperKit/FlipperKitExamplePlugin (0.172.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay (0.172.0) - - FlipperKit/FlipperKitLayoutComponentKitSupport (0.172.0): - - ComponentKit (= 0.31) - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutHelpers - - FlipperKit/FlipperKitLayoutPlugin - - FlipperKit/FlipperKitLayoutTextSearchable - - RenderCore (= 0.31) - FlipperKit/FlipperKitLayoutHelpers (0.172.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay @@ -73,7 +62,6 @@ PODS: - FlipperKit/FlipperKitNetworkPlugin - libevent (2.1.12) - OpenSSL-Universal (1.1.1100) - - RenderCore (0.31) - SocketRocket (0.6.0) - Yoga (1.14.0) - YogaKit (1.18.1): @@ -81,7 +69,6 @@ PODS: DEPENDENCIES: - CocoaAsyncSocket - - ComponentKit (~> 0.31) - Flipper (from `../../Flipper.podspec`) - Flipper-Boost-iOSX - Flipper-DoubleConversion @@ -90,7 +77,7 @@ DEPENDENCIES: - Flipper-PeerTalk - FlipperKit (from `../../FlipperKit.podspec`) - FlipperKit/FlipperKitExamplePlugin (from `../../FlipperKit.podspec`) - - FlipperKit/FlipperKitLayoutComponentKitSupport (from `../../FlipperKit.podspec`) + - FlipperKit/FlipperKitLayoutPlugin (from `../../FlipperKit.podspec`) - FlipperKit/FlipperKitReactPlugin (from `../../FlipperKit.podspec`) - FlipperKit/FlipperKitUserDefaultsPlugin (from `../../FlipperKit.podspec`) - FlipperKit/SKIOSNetworkPlugin (from `../../FlipperKit.podspec`) @@ -101,7 +88,6 @@ DEPENDENCIES: SPEC REPOS: https://github.com/CocoaPods/Specs: - CocoaAsyncSocket - - ComponentKit - Flipper-Boost-iOSX - Flipper-DoubleConversion - Flipper-Fmt @@ -110,7 +96,6 @@ SPEC REPOS: - Flipper-PeerTalk - libevent - OpenSSL-Universal - - RenderCore - SocketRocket - Yoga - YogaKit @@ -123,7 +108,6 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - ComponentKit: 7bf7048b9814afc6b6641645a14177f95fd9b9ae Flipper: e57750a29313c49b9783a310150053d32b2b2b6f Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 @@ -134,11 +118,10 @@ SPEC CHECKSUMS: FlipperKit: 02fd59af13a1465d04268cbffe3f93505f0a1dc2 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c - RenderCore: 090beb17b5bff80b86929a7ceb49df789923d23a SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 8f7b8c1a8e7cee47eaef4736990315bfc090e2af +PODFILE CHECKSUM: 7dae704c5712701d2a19d89e7f391cfa926d728c -COCOAPODS: 1.11.3 +COCOAPODS: 1.11.2 diff --git a/iOS/Sample/RootViewController.h b/iOS/Sample/RootViewController.h deleted file mode 100644 index 2c3e2b2b1..000000000 --- a/iOS/Sample/RootViewController.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#import - -@interface RootViewController : UIViewController - -@end diff --git a/iOS/Sample/RootViewController.mm b/iOS/Sample/RootViewController.mm deleted file mode 100644 index dcde5977b..000000000 --- a/iOS/Sample/RootViewController.mm +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#import "RootViewController.h" - -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import - -@interface RootViewController () - -@property(strong, nonatomic) CKComponentHostingView* rootCKHostingView; - -@end - -@implementation RootViewController - -- (instancetype)init { - if (self = [super init]) { - _rootCKHostingView = [[CKComponentHostingView alloc] - initWithComponentProviderFunc:componentForModel - sizeRangeProvider: - [CKComponentFlexibleSizeRangeProvider - providerWithFlexibility: - CKComponentSizeRangeFlexibleHeight]]; - - [self.view addSubview:_rootCKHostingView]; - [self loadViewIfNeeded]; - } - return self; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.navigationItem.title = @"ComponentKit Layout"; - self.edgesForExtendedLayout = UIRectEdgeNone; -} - -- (void)viewDidLayoutSubviews { - [super viewDidLayoutSubviews]; - _rootCKHostingView.frame = self.view.bounds; -} - -static CKComponent* componentForModel( - id model, - id context) { - return CK::BackgroundLayoutComponentBuilder() - .component(CK::FlexboxComponentBuilder() - .child( - {.component = CK::ButtonComponentBuilder() - .action(nil) - .title(@"Purple") - .titleColor(UIColor.purpleColor) - .build()}) - .child( - {.component = CK::ButtonComponentBuilder() - .action(nil) - .title(@"Brown") - .titleColor(UIColor.brownColor) - .build()}) - .child( - {.component = CK::ButtonComponentBuilder() - .action(nil) - .title(@"Cyan") - .titleColor(UIColor.cyanColor) - .build()}) - .build()) - .background(CK::ImageComponentBuilder() - .image([UIImage imageNamed:@"sonarpattern"]) - .build()) - .build(); -} - -@end diff --git a/iOS/Sample/Sample.xcodeproj/project.pbxproj b/iOS/Sample/Sample.xcodeproj/project.pbxproj index 2afb5f129..188805211 100644 --- a/iOS/Sample/Sample.xcodeproj/project.pbxproj +++ b/iOS/Sample/Sample.xcodeproj/project.pbxproj @@ -13,7 +13,6 @@ 53D59DB320ABA18400207065 /* NetworkViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D59DAA20ABA18300207065 /* NetworkViewController.m */; }; 53D59DB420ABA18400207065 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D59DAB20ABA18300207065 /* AppDelegate.m */; }; 53D59DB520ABA18400207065 /* MainViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 53D59DAD20ABA18300207065 /* MainViewController.mm */; }; - 53D59DB620ABA18400207065 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 53D59DAF20ABA18300207065 /* RootViewController.mm */; }; 53D59DB720ABA18400207065 /* MainStoryBoard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 53D59DB020ABA18400207065 /* MainStoryBoard.storyboard */; }; 53D59DB820ABA18400207065 /* Icons.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 53D59DB120ABA18400207065 /* Icons.xcassets */; }; 53E0DE5420ABA0E4005682E1 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 53E0DE5320ABA0E4005682E1 /* main.m */; }; @@ -29,8 +28,6 @@ 53D59DAB20ABA18300207065 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = SOURCE_ROOT; }; 53D59DAC20ABA18300207065 /* NetworkViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkViewController.h; sourceTree = SOURCE_ROOT; }; 53D59DAD20ABA18300207065 /* MainViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MainViewController.mm; sourceTree = SOURCE_ROOT; }; - 53D59DAE20ABA18300207065 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = SOURCE_ROOT; }; - 53D59DAF20ABA18300207065 /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RootViewController.mm; sourceTree = SOURCE_ROOT; }; 53D59DB020ABA18400207065 /* MainStoryBoard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainStoryBoard.storyboard; sourceTree = SOURCE_ROOT; }; 53D59DB120ABA18400207065 /* Icons.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Icons.xcassets; sourceTree = SOURCE_ROOT; }; 53D59DB220ABA18400207065 /* MainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainViewController.h; sourceTree = SOURCE_ROOT; }; @@ -68,8 +65,6 @@ 53D59DAA20ABA18300207065 /* NetworkViewController.m */, 4E10233F216AD7B400160734 /* UserDefaultsViewController.h */, 4E102340216AD7B400160734 /* UserDefaultsViewController.m */, - 53D59DAE20ABA18300207065 /* RootViewController.h */, - 53D59DAF20ABA18300207065 /* RootViewController.mm */, 53E0DE5220ABA0E4005682E1 /* Info.plist */, 53E0DE5320ABA0E4005682E1 /* main.m */, 534252A9217DECCD0092D02B /* CommunicationDemoViewController.h */, @@ -228,7 +223,6 @@ 53D59DB420ABA18400207065 /* AppDelegate.m in Sources */, 53B4A36B217E2B6200B36A53 /* CommunicationDemoViewController.mm in Sources */, 53D59DB520ABA18400207065 /* MainViewController.mm in Sources */, - 53D59DB620ABA18400207065 /* RootViewController.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -359,7 +353,6 @@ "$(inherited)", "\"${PODS_ROOT}/Headers/Public\"", "\"${PODS_ROOT}/Headers/Public/CocoaAsyncSocket\"", - "\"${PODS_ROOT}/Headers/Public/ComponentKit\"", "\"${PODS_ROOT}/Headers/Public/DoubleConversion\"", "\"${PODS_ROOT}/Headers/Public/Folly\"", "\"${PODS_ROOT}/Headers/Public/PeerTalk\"", @@ -424,7 +417,6 @@ "$(inherited)", "\"${PODS_ROOT}/Headers/Public\"", "\"${PODS_ROOT}/Headers/Public/CocoaAsyncSocket\"", - "\"${PODS_ROOT}/Headers/Public/ComponentKit\"", "\"${PODS_ROOT}/Headers/Public/DoubleConversion\"", "\"${PODS_ROOT}/Headers/Public/Folly\"", "\"${PODS_ROOT}/Headers/Public/PeerTalk\"",