From 972277b031734d107a1c107bd346d60b1129c439 Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Tue, 18 Feb 2020 12:45:20 -0800 Subject: [PATCH] Fix warnings of FlipperKit in iOS Summary: This diff fixes the warnings raised from FlipperKit. Also this diff updates the deployement target of FlipperKit to iOS 10. Even wilde assumes the min deployment OS version to be iOS 10. In layout plugin we use [UIAccessibiltyTraiTabBar](https://developer.apple.com/documentation/uikit/uiaccessibility/uiaccessibilitytraits/1648592-tabbar), which assumes iOS 10 and above. Partially fixes https://github.com/facebook/flipper/issues/803 Still there are some warnings which are coming from the dependencies outside of Flipper. Reviewed By: passy Differential Revision: D19941558 fbshipit-source-id: 31809fedb9aa297bc318b5af72e29e8444f0142f --- FlipperKit.podspec | 2 +- iOS/FlipperKit/FlipperDiagnosticsViewController.m | 2 +- iOS/FlipperKit/FlipperPlugin.h | 2 +- iOS/FlipperKit/FlipperUtil.m | 2 +- .../CKComponent+Sonar.mm | 2 +- .../descriptors/SKButtonDescriptor.mm | 1 - .../FlipperKitNetworkPlugin.h | 3 +-- .../FlipperKitNetworkPlugin/SKBufferingPlugin.h | 2 +- .../FlipperKitNetworkPlugin/SKRequestInfo.h | 12 ++++++------ .../FlipperKitNetworkPlugin/SKResponseInfo.h | 12 ++++++------ iOS/Sample/Podfile | 2 +- iOS/SampleSwift/Podfile | 2 +- iOS/Tutorial/Podfile | 2 +- 13 files changed, 22 insertions(+), 24 deletions(-) diff --git a/FlipperKit.podspec b/FlipperKit.podspec index 6a4175228..9f6fdb2ed 100644 --- a/FlipperKit.podspec +++ b/FlipperKit.podspec @@ -17,7 +17,7 @@ Pod::Spec.new do |spec| spec.source = { :git => 'https://github.com/facebook/Sonar.git', :tag=> "v"+flipperkit_version } spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } + spec.platforms = { :ios => "10.0" } spec.default_subspecs = "Core" # This subspec is necessary since FBDefines.h is imported as diff --git a/iOS/FlipperKit/FlipperDiagnosticsViewController.m b/iOS/FlipperKit/FlipperDiagnosticsViewController.m index 6586163ef..ed3689069 100644 --- a/iOS/FlipperKit/FlipperDiagnosticsViewController.m +++ b/iOS/FlipperKit/FlipperDiagnosticsViewController.m @@ -120,7 +120,7 @@ static NSString* const kSKCellIdentifier = } - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation { - return UIInterfaceOrientationMaskPortrait; + return UIInterfaceOrientationPortrait; } @end diff --git a/iOS/FlipperKit/FlipperPlugin.h b/iOS/FlipperKit/FlipperPlugin.h index e39c54e02..a331a71ff 100644 --- a/iOS/FlipperKit/FlipperPlugin.h +++ b/iOS/FlipperKit/FlipperPlugin.h @@ -11,7 +11,7 @@ SK_EXTERN_C_BEGIN void FlipperPerformBlockOnMainThread( - void (^block)(), + void (^block)(void), id responder); SK_EXTERN_C_END diff --git a/iOS/FlipperKit/FlipperUtil.m b/iOS/FlipperKit/FlipperUtil.m index c57549254..4caa2d6fc 100644 --- a/iOS/FlipperKit/FlipperUtil.m +++ b/iOS/FlipperKit/FlipperUtil.m @@ -10,7 +10,7 @@ #import "FlipperResponder.h" void FlipperPerformBlockOnMainThread( - void (^block)(), + void (^block)(void), id responder) { if ([NSThread isMainThread]) { @try { diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm index 6494908b1..99365cb4a 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm @@ -177,7 +177,7 @@ static CK::StaticMutex _mutex = CK_MUTEX_INITIALIZER; NSMutableArray*>* responders = [NSMutableArray new]; - for (const auto action : _actions) { + for (const auto& action : _actions) { if ((action.first & [controlEvent integerValue]) == 0) { continue; } diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKButtonDescriptor.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKButtonDescriptor.mm index b7f4da76f..63b6c5530 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKButtonDescriptor.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKButtonDescriptor.mm @@ -46,7 +46,6 @@ @"currentTitleColor" : SKMutableObject(node.currentTitleColor), }]]; - return data; } diff --git a/iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h b/iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h index 15775625b..7a0204789 100644 --- a/iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h +++ b/iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h @@ -16,8 +16,7 @@ @interface FlipperKitNetworkPlugin : SKBufferingPlugin -- (instancetype)initWithNetworkAdapter:(id)adapter - NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithNetworkAdapter:(id)adapter; - (instancetype)initWithNetworkAdapter:(id)adapter queue:(dispatch_queue_t) queue; // For test purposes diff --git a/iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h b/iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h index d265a455a..4747973de 100644 --- a/iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h +++ b/iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h @@ -13,7 +13,7 @@ @interface SKBufferingPlugin : NSObject -- (instancetype)initWithQueue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithQueue:(dispatch_queue_t)queue; - (void)send:(NSString*)method sonarObject:(NSDictionary*)sonarObject; diff --git a/iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h b/iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h index 3bfb60222..c7d4f4186 100644 --- a/iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h +++ b/iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h @@ -10,13 +10,13 @@ @interface SKRequestInfo : NSObject @property(assign, readwrite) int64_t identifier; @property(assign, readwrite) uint64_t timestamp; -@property(strong, nonatomic) NSURLRequest* request; -@property(strong, nonatomic) NSString* body; +@property(strong, nonatomic) NSURLRequest* _Nullable request; +@property(strong, nonatomic) NSString* _Nullable body; -- (instancetype)initWithIdentifier:(int64_t)identifier - timestamp:(uint64_t)timestamp - request:(NSURLRequest*)request - data:(NSData*)data; +- (instancetype _Nonnull)initWithIdentifier:(int64_t)identifier + timestamp:(uint64_t)timestamp + request:(NSURLRequest* _Nullable)request + data:(NSData* _Nullable)data; - (void)setBodyFromData:(NSData* _Nullable)data; @end diff --git a/iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h b/iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h index 3e9f55723..c486650b8 100644 --- a/iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h +++ b/iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h @@ -11,13 +11,13 @@ @property(assign, readwrite) int64_t identifier; @property(assign, readwrite) uint64_t timestamp; -@property(strong, nonatomic) NSURLResponse* response; -@property(strong, nonatomic) NSString* body; +@property(strong, nonatomic) NSURLResponse* _Nullable response; +@property(strong, nonatomic) NSString* _Nullable body; -- (instancetype)initWithIndentifier:(int64_t)identifier - timestamp:(uint64_t)timestamp - response:(NSURLResponse*)response - data:(NSData*)data; +- (instancetype _Nonnull)initWithIndentifier:(int64_t)identifier + timestamp:(uint64_t)timestamp + response:(NSURLResponse* _Nullable)response + data:(NSData* _Nullable)data; - (void)setBodyFromData:(NSData* _Nullable)data; @end diff --git a/iOS/Sample/Podfile b/iOS/Sample/Podfile index a49cd424f..29d2762f3 100644 --- a/iOS/Sample/Podfile +++ b/iOS/Sample/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/facebook/Sonar.git' source 'https://github.com/CocoaPods/Specs' target 'Sample' do - platform :ios, '9.0' + platform :ios, '10.0' pod 'FlipperKit', :path => '../../FlipperKit.podspec' pod 'FlipperKit/FlipperKitLayoutComponentKitSupport', :path => '../../FlipperKit.podspec' pod 'FlipperKit/SKIOSNetworkPlugin', :path => '../../FlipperKit.podspec' diff --git a/iOS/SampleSwift/Podfile b/iOS/SampleSwift/Podfile index ad8cf3c51..843ba0e96 100644 --- a/iOS/SampleSwift/Podfile +++ b/iOS/SampleSwift/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/facebook/Sonar.git' source 'https://github.com/CocoaPods/Specs' target 'SampleSwift' do - platform :ios, '9.0' + platform :ios, '10.0' pod 'Flipper', :path => '../../Flipper.podspec' pod 'FlipperKit', :path => '../../FlipperKit.podspec' pod 'FlipperKit/SKIOSNetworkPlugin', :path => '../../FlipperKit.podspec' diff --git a/iOS/Tutorial/Podfile b/iOS/Tutorial/Podfile index aa3bd4884..f55c95e04 100644 --- a/iOS/Tutorial/Podfile +++ b/iOS/Tutorial/Podfile @@ -4,7 +4,7 @@ flipperkit_version = '0.31.2' use_frameworks! target 'Tutorial' do - platform :ios, '9.0' + platform :ios, '10.0' pod 'FlipperKit', '~>' + flipperkit_version # Layout and network plugins are not yet supported for swift projects