diff --git a/FlipperKit.podspec b/FlipperKit.podspec index 1073d50eb..085ece400 100644 --- a/FlipperKit.podspec +++ b/FlipperKit.podspec @@ -76,7 +76,7 @@ Pod::Spec.new do |spec| ss.dependency 'FlipperKit/CppBridge' ss.dependency 'FlipperKit/FKPortForwarding' ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'SocketRocket', '~> 0.6.0' + ss.dependency 'SocketRocket', '~> 0.7.0' ss.compiler_flags = folly_compiler_flags ss.source_files = 'iOS/FlipperKit/*.{h,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}' ss.public_header_files = 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros,FlipperKitCertificateProvider}.h' diff --git a/iOS/FlipperKit.xcodeproj/project.pbxproj b/iOS/FlipperKit.xcodeproj/project.pbxproj index 0be0462eb..69a65e2f2 100644 --- a/iOS/FlipperKit.xcodeproj/project.pbxproj +++ b/iOS/FlipperKit.xcodeproj/project.pbxproj @@ -463,7 +463,7 @@ ); INFOPLIST_FILE = "$(SRCROOT)/FlipperKit/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -540,7 +540,7 @@ ); INFOPLIST_FILE = "$(SRCROOT)/FlipperKit/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", diff --git a/iOS/Podfile b/iOS/Podfile index 336debf32..49cbe5db0 100644 --- a/iOS/Podfile +++ b/iOS/Podfile @@ -1,7 +1,7 @@ # Uncomment the next line to define a global platform for your project source 'https://github.com/facebook/flipper.git' source 'https://github.com/CocoaPods/Specs' -platform :ios, '10.0' +platform :ios, '11.0' swift_version = "4.1" target 'FlipperKit' do # Uncomment the next line if you're using Swift or would like to use dynamic frameworks @@ -15,6 +15,6 @@ target 'FlipperKit' do pod 'glog', '~>0.3' pod 'Flipper-Folly', '~>2.2' pod 'CocoaAsyncSocket', '~>7.6' - pod 'SocketRocket', '~> 0.6.0' + pod 'SocketRocket', '~> 0.7.0' end diff --git a/iOS/Podfile.lock b/iOS/Podfile.lock index 88f9b5898..cb531417c 100644 --- a/iOS/Podfile.lock +++ b/iOS/Podfile.lock @@ -1,7 +1,7 @@ PODS: - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.5) - - Flipper (0.135.0): + - Flipper (0.198.0): - Flipper-Folly (~> 2.6) - Flipper-Boost-iOSX (1.76.0.1.11) - Flipper-DoubleConversion (3.1.7) @@ -18,7 +18,7 @@ PODS: - glog (0.3.4) - libevent (2.1.12) - OpenSSL-Universal (1.1.1100) - - SocketRocket (0.6.0) + - SocketRocket (0.7.0) DEPENDENCIES: - CocoaAsyncSocket (~> 7.6) @@ -27,7 +27,7 @@ DEPENDENCIES: - Flipper-Folly (~> 2.2) - Flipper-PeerTalk (~> 0.0) - glog (~> 0.3) - - SocketRocket (~> 0.6.0) + - SocketRocket (~> 0.7.0) SPEC REPOS: https://github.com/CocoaPods/Specs: @@ -51,7 +51,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c - Flipper: 8d280c95b6a6d87a456d6b030df58e8859448267 + Flipper: 76b4b7f7e1db6082dcd7012cc13998b6d59a76b0 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b @@ -61,8 +61,8 @@ SPEC CHECKSUMS: glog: 1de0bb937dccdc981596d3b5825ebfb765017ded libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c - SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 + SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d -PODFILE CHECKSUM: 75371a02c3eedd0de3d666960d97e308c70edd88 +PODFILE CHECKSUM: abf37c1df1aeaa21dc8787782160e039dc2a64a8 COCOAPODS: 1.11.2 diff --git a/iOS/Sample/Podfile b/iOS/Sample/Podfile index cd49c16aa..320e73f61 100644 --- a/iOS/Sample/Podfile +++ b/iOS/Sample/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/facebook/flipper.git' source 'https://github.com/CocoaPods/Specs' target 'Sample' do - platform :ios, '10.0' + platform :ios, '11.0' # See docs/getting-started/ios-native.mdx pod 'FlipperKit', :path => '../../FlipperKit.podspec', :configuration => 'Debug' @@ -21,6 +21,6 @@ target 'Sample' do pod 'Flipper-Boost-iOSX', :configuration => 'Debug' pod 'OpenSSL-Universal', :configuration => 'Debug' pod 'CocoaAsyncSocket', :configuration => 'Debug' - pod 'SocketRocket', '~> 0.6.0' + pod 'SocketRocket', '~> 0.7.0' end diff --git a/iOS/Sample/Podfile.lock b/iOS/Sample/Podfile.lock index 71c8b481d..c480e336e 100644 --- a/iOS/Sample/Podfile.lock +++ b/iOS/Sample/Podfile.lock @@ -22,7 +22,7 @@ PODS: - FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBDefines - FlipperKit/FKPortForwarding - - SocketRocket (~> 0.6.0) + - SocketRocket (~> 0.7.0) - FlipperKit/CppBridge (0.202.0): - Flipper (~> 0.202.0) - FlipperKit/FBCxxFollyDynamicConvert (0.202.0): @@ -60,7 +60,7 @@ PODS: - FlipperKit/FlipperKitNetworkPlugin - libevent (2.1.12) - OpenSSL-Universal (1.1.1100) - - SocketRocket (0.6.0) + - SocketRocket (0.7.0) DEPENDENCIES: - CocoaAsyncSocket @@ -78,7 +78,7 @@ DEPENDENCIES: - FlipperKit/SKIOSNetworkPlugin (from `../../FlipperKit.podspec`) - libevent - OpenSSL-Universal - - SocketRocket (~> 0.6.0) + - SocketRocket (~> 0.7.0) SPEC REPOS: https://github.com/CocoaPods/Specs: @@ -111,8 +111,8 @@ SPEC CHECKSUMS: FlipperKit: 6a2be223aff449e4c0b1e7c55a636f67ac050b15 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c - SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 + SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d -PODFILE CHECKSUM: 7dae704c5712701d2a19d89e7f391cfa926d728c +PODFILE CHECKSUM: 4d30d7695e19226b890d64952dd09dde3e2d80fc -COCOAPODS: 1.12.1 +COCOAPODS: 1.11.2 diff --git a/iOS/Sample/Sample.xcodeproj/project.pbxproj b/iOS/Sample/Sample.xcodeproj/project.pbxproj index 188805211..d6642af8f 100644 --- a/iOS/Sample/Sample.xcodeproj/project.pbxproj +++ b/iOS/Sample/Sample.xcodeproj/project.pbxproj @@ -364,7 +364,7 @@ "\"${PODS_ROOT}/Headers/Public/libevent\"", ); INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", @@ -428,7 +428,7 @@ "\"${PODS_ROOT}/Headers/Public/libevent\"", ); INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", diff --git a/iOS/SampleSwift/Podfile b/iOS/SampleSwift/Podfile index d16c3ec13..6431a9248 100644 --- a/iOS/SampleSwift/Podfile +++ b/iOS/SampleSwift/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/facebook/flipper.git' source 'https://github.com/CocoaPods/Specs' target 'SampleSwift' do - platform :ios, '10.0' + platform :ios, '11.0' # See docs/getting-started/ios-native.mdx pod 'FlipperKit', :path => '../../FlipperKit.podspec', :configuration => 'Debug' diff --git a/iOS/SampleSwift/Podfile.lock b/iOS/SampleSwift/Podfile.lock index c92183b97..6c3c0d4ef 100644 --- a/iOS/SampleSwift/Podfile.lock +++ b/iOS/SampleSwift/Podfile.lock @@ -23,7 +23,7 @@ PODS: - FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBDefines - FlipperKit/FKPortForwarding - - SocketRocket (~> 0.6.0) + - SocketRocket (~> 0.7.0) - FlipperKit/CppBridge (0.202.0): - Flipper (~> 0.202.0) - FlipperKit/FBCxxFollyDynamicConvert (0.202.0): @@ -59,7 +59,7 @@ PODS: - FlipperKit/FlipperKitNetworkPlugin - libevent (2.1.12) - OpenSSL-Universal (1.1.1100) - - SocketRocket (0.6.0) + - SocketRocket (0.7.0) DEPENDENCIES: - boost-for-react-native @@ -107,11 +107,11 @@ SPEC CHECKSUMS: Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3 Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - FlipperKit: 6a2be223aff449e4c0b1e7c55a636f67ac050b15 + FlipperKit: cd21c3d45c212fa801b1122829f7d6ec80b9f255 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c - SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 + SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d -PODFILE CHECKSUM: d4e5b460eb545e577a9a2a6843c68eb15ea4f4d9 +PODFILE CHECKSUM: 91787ba7cc4ea0c7dbba9f798e5b572e6f0c5f08 -COCOAPODS: 1.12.1 +COCOAPODS: 1.11.2 diff --git a/iOS/Tutorial/Podfile b/iOS/Tutorial/Podfile index 502391e3e..663384c84 100644 --- a/iOS/Tutorial/Podfile +++ b/iOS/Tutorial/Podfile @@ -4,7 +4,7 @@ flipperkit_version = '0.202.0' use_frameworks! target 'Tutorial' do - platform :ios, '10.0' + platform :ios, '11.0' pod 'FlipperKit', '~>' + flipperkit_version # Layout and network plugins are not yet supported for swift projects diff --git a/iOS/Tutorial/Podfile.lock b/iOS/Tutorial/Podfile.lock index b6b7bf1a6..7de4c45cd 100644 --- a/iOS/Tutorial/Podfile.lock +++ b/iOS/Tutorial/Podfile.lock @@ -68,7 +68,7 @@ PODS: - libevent (2.1.12) - OpenSSL-Universal (1.1.1100) - RenderCore (0.31) - - SocketRocket (0.6.0) + - SocketRocket (0.6.1) - Yoga (1.14.0) DEPENDENCIES: @@ -109,9 +109,9 @@ SPEC CHECKSUMS: libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RenderCore: 090beb17b5bff80b86929a7ceb49df789923d23a - SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 + SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c -PODFILE CHECKSUM: 56cead5fb78b13d37cf53ec82af754613862122f +PODFILE CHECKSUM: 9e05a8202a727b5dbb5ec9f1b24b697fe353178f COCOAPODS: 1.12.1 diff --git a/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample.xcodeproj/project.pbxproj b/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample.xcodeproj/project.pbxproj index 3bcfb4cd6..9cb5a3ed8 100644 --- a/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample.xcodeproj/project.pbxproj +++ b/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample.xcodeproj/project.pbxproj @@ -615,7 +615,7 @@ "$(inherited)", ); INFOPLIST_FILE = ReactNativeFlipperExampleTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_LDFLAGS = ( "-ObjC", @@ -635,7 +635,7 @@ BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; INFOPLIST_FILE = ReactNativeFlipperExampleTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_LDFLAGS = ( "-ObjC",