jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump SocketRocket 0.7.0

Browse Source 
Summary:
About to release React Native 0.72.1. This version of React Native has to depend on SocketRocket 0.7.0, released yesterday.

Cocoapods is failing to install dependencies with the following error:
```
In snapshot (Podfile.lock):
    SocketRocket (= 0.7.0)

  In Podfile:
    FlipperKit/FlipperKitReactPlugin (= 0.182.0) was resolved to 0.182.0, which depends on
      FlipperKit/Core (= 0.182.0) was resolved to 0.182.0, which depends on
        SocketRocket (~> 0.6.0)

    React-Core/RCTWebSocket (from `../react-native/`) was resolved to 1000.0.0, which depends on
      SocketRocket (= 0.7.0)

    React-CoreModules (from `../react-native/React/CoreModules`) was resolved to 1000.0.0, which depends on
      SocketRocket
```

By bumping the SocketRocket dependencies and publishing a new version of FlipperKit, we would be able to release React Native.

Reviewed By: passy, cipolleschi

Differential Revision: D47125059

fbshipit-source-id: d0797880c502c14db9f0261c3e8abf2652e7bba2
This commit is contained in:
Lorenzo Blasa
2023-06-29 10:21:06 -07:00
committed by Facebook GitHub Bot
parent 5584cf817c
commit 883993d2ec
12 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FlipperKit.podspec
View File

@@ -76,7 +76,7 @@ Pod::Spec.new do |spec|
ss.dependency 'FlipperKit/CppBridge' ss.dependency 'FlipperKit/CppBridge'
ss.dependency 'FlipperKit/FKPortForwarding' ss.dependency 'FlipperKit/FKPortForwarding'
ss.dependency 'Flipper', '~>'+flipperkit_version ss.dependency 'Flipper', '~>'+flipperkit_version
ss.dependency 'SocketRocket', '~> 0.6.0' ss.dependency 'SocketRocket', '~> 0.7.0'
ss.compiler_flags = folly_compiler_flags ss.compiler_flags = folly_compiler_flags
ss.source_files = 'iOS/FlipperKit/*.{h,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}' 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' ss.public_header_files = 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros,FlipperKitCertificateProvider}.h'

4
iOS/FlipperKit.xcodeproj/project.pbxproj
View File

@@ -463,7 +463,7 @@
); );
INFOPLIST_FILE = "$(SRCROOT)/FlipperKit/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/FlipperKit/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; 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"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
OTHER_CPLUSPLUSFLAGS = ( OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)", "$(OTHER_CFLAGS)",
@@ -540,7 +540,7 @@
); );
INFOPLIST_FILE = "$(SRCROOT)/FlipperKit/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/FlipperKit/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; 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"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
OTHER_CPLUSPLUSFLAGS = ( OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)", "$(OTHER_CFLAGS)",

4
iOS/Podfile
View File

@@ -1,7 +1,7 @@
# Uncomment the next line to define a global platform for your project # Uncomment the next line to define a global platform for your project
source 'https://github.com/facebook/flipper.git' source 'https://github.com/facebook/flipper.git'
source 'https://github.com/CocoaPods/Specs' source 'https://github.com/CocoaPods/Specs'
platform :ios, '10.0' platform :ios, '11.0'
swift_version = "4.1" swift_version = "4.1"
target 'FlipperKit' do target 'FlipperKit' do
# Uncomment the next line if you're using Swift or would like to use dynamic frameworks # 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 'glog', '~>0.3'
pod 'Flipper-Folly', '~>2.2' pod 'Flipper-Folly', '~>2.2'
pod 'CocoaAsyncSocket', '~>7.6' pod 'CocoaAsyncSocket', '~>7.6'
pod 'SocketRocket', '~> 0.6.0' pod 'SocketRocket', '~> 0.7.0'
end end

12
iOS/Podfile.lock
View File

@@ -1,7 +1,7 @@
PODS: PODS:
- CocoaAsyncSocket (7.6.5) - CocoaAsyncSocket (7.6.5)
- DoubleConversion (1.1.5) - DoubleConversion (1.1.5)
- Flipper (0.135.0): - Flipper (0.198.0):
- Flipper-Folly (~> 2.6) - Flipper-Folly (~> 2.6)
- Flipper-Boost-iOSX (1.76.0.1.11) - Flipper-Boost-iOSX (1.76.0.1.11)
- Flipper-DoubleConversion (3.1.7) - Flipper-DoubleConversion (3.1.7)
@@ -18,7 +18,7 @@ PODS:
- glog (0.3.4) - glog (0.3.4)
- libevent (2.1.12) - libevent (2.1.12)
- OpenSSL-Universal (1.1.1100) - OpenSSL-Universal (1.1.1100)
- SocketRocket (0.6.0) - SocketRocket (0.7.0)
DEPENDENCIES: DEPENDENCIES:
- CocoaAsyncSocket (~> 7.6) - CocoaAsyncSocket (~> 7.6)
@@ -27,7 +27,7 @@ DEPENDENCIES:
- Flipper-Folly (~> 2.2) - Flipper-Folly (~> 2.2)
- Flipper-PeerTalk (~> 0.0) - Flipper-PeerTalk (~> 0.0)
- glog (~> 0.3) - glog (~> 0.3)
- SocketRocket (~> 0.6.0) - SocketRocket (~> 0.7.0)
SPEC REPOS: SPEC REPOS:
https://github.com/CocoaPods/Specs: https://github.com/CocoaPods/Specs:
@@ -51,7 +51,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c
Flipper: 8d280c95b6a6d87a456d6b030df58e8859448267 Flipper: 76b4b7f7e1db6082dcd7012cc13998b6d59a76b0
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c
Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
@@ -61,8 +61,8 @@ SPEC CHECKSUMS:
glog: 1de0bb937dccdc981596d3b5825ebfb765017ded glog: 1de0bb937dccdc981596d3b5825ebfb765017ded
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
PODFILE CHECKSUM: 75371a02c3eedd0de3d666960d97e308c70edd88 PODFILE CHECKSUM: abf37c1df1aeaa21dc8787782160e039dc2a64a8
COCOAPODS: 1.11.2 COCOAPODS: 1.11.2

4
iOS/Sample/Podfile
View File

@@ -3,7 +3,7 @@ source 'https://github.com/facebook/flipper.git'
source 'https://github.com/CocoaPods/Specs' source 'https://github.com/CocoaPods/Specs'
target 'Sample' do target 'Sample' do
platform :ios, '10.0' platform :ios, '11.0'
# See docs/getting-started/ios-native.mdx # See docs/getting-started/ios-native.mdx
pod 'FlipperKit', :path => '../../FlipperKit.podspec', :configuration => 'Debug' pod 'FlipperKit', :path => '../../FlipperKit.podspec', :configuration => 'Debug'
@@ -21,6 +21,6 @@ target 'Sample' do
pod 'Flipper-Boost-iOSX', :configuration => 'Debug' pod 'Flipper-Boost-iOSX', :configuration => 'Debug'
pod 'OpenSSL-Universal', :configuration => 'Debug' pod 'OpenSSL-Universal', :configuration => 'Debug'
pod 'CocoaAsyncSocket', :configuration => 'Debug' pod 'CocoaAsyncSocket', :configuration => 'Debug'
pod 'SocketRocket', '~> 0.6.0' pod 'SocketRocket', '~> 0.7.0'
end end

12
iOS/Sample/Podfile.lock
View File

@@ -22,7 +22,7 @@ PODS:
- FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBCxxFollyDynamicConvert
- FlipperKit/FBDefines - FlipperKit/FBDefines
- FlipperKit/FKPortForwarding - FlipperKit/FKPortForwarding
- SocketRocket (~> 0.6.0) - SocketRocket (~> 0.7.0)
- FlipperKit/CppBridge (0.202.0): - FlipperKit/CppBridge (0.202.0):
- Flipper (~> 0.202.0) - Flipper (~> 0.202.0)
- FlipperKit/FBCxxFollyDynamicConvert (0.202.0): - FlipperKit/FBCxxFollyDynamicConvert (0.202.0):
@@ -60,7 +60,7 @@ PODS:
- FlipperKit/FlipperKitNetworkPlugin - FlipperKit/FlipperKitNetworkPlugin
- libevent (2.1.12) - libevent (2.1.12)
- OpenSSL-Universal (1.1.1100) - OpenSSL-Universal (1.1.1100)
- SocketRocket (0.6.0) - SocketRocket (0.7.0)
DEPENDENCIES: DEPENDENCIES:
- CocoaAsyncSocket - CocoaAsyncSocket
@@ -78,7 +78,7 @@ DEPENDENCIES:
- FlipperKit/SKIOSNetworkPlugin (from `../../FlipperKit.podspec`) - FlipperKit/SKIOSNetworkPlugin (from `../../FlipperKit.podspec`)
- libevent - libevent
- OpenSSL-Universal - OpenSSL-Universal
- SocketRocket (~> 0.6.0) - SocketRocket (~> 0.7.0)
SPEC REPOS: SPEC REPOS:
https://github.com/CocoaPods/Specs: https://github.com/CocoaPods/Specs:
@@ -111,8 +111,8 @@ SPEC CHECKSUMS:
FlipperKit: 6a2be223aff449e4c0b1e7c55a636f67ac050b15 FlipperKit: 6a2be223aff449e4c0b1e7c55a636f67ac050b15
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
PODFILE CHECKSUM: 7dae704c5712701d2a19d89e7f391cfa926d728c PODFILE CHECKSUM: 4d30d7695e19226b890d64952dd09dde3e2d80fc
COCOAPODS: 1.12.1 COCOAPODS: 1.11.2

4
iOS/Sample/Sample.xcodeproj/project.pbxproj
View File

@@ -364,7 +364,7 @@
"\"${PODS_ROOT}/Headers/Public/libevent\"", "\"${PODS_ROOT}/Headers/Public/libevent\"",
); );
INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 10.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
/usr/lib/swift, /usr/lib/swift,
"$(inherited)", "$(inherited)",
@@ -428,7 +428,7 @@
"\"${PODS_ROOT}/Headers/Public/libevent\"", "\"${PODS_ROOT}/Headers/Public/libevent\"",
); );
INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 10.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
/usr/lib/swift, /usr/lib/swift,
"$(inherited)", "$(inherited)",

2
iOS/SampleSwift/Podfile
View File

@@ -3,7 +3,7 @@ source 'https://github.com/facebook/flipper.git'
source 'https://github.com/CocoaPods/Specs' source 'https://github.com/CocoaPods/Specs'
target 'SampleSwift' do target 'SampleSwift' do
platform :ios, '10.0' platform :ios, '11.0'
# See docs/getting-started/ios-native.mdx # See docs/getting-started/ios-native.mdx
pod 'FlipperKit', :path => '../../FlipperKit.podspec', :configuration => 'Debug' pod 'FlipperKit', :path => '../../FlipperKit.podspec', :configuration => 'Debug'

12
iOS/SampleSwift/Podfile.lock
View File

@@ -23,7 +23,7 @@ PODS:
- FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBCxxFollyDynamicConvert
- FlipperKit/FBDefines - FlipperKit/FBDefines
- FlipperKit/FKPortForwarding - FlipperKit/FKPortForwarding
- SocketRocket (~> 0.6.0) - SocketRocket (~> 0.7.0)
- FlipperKit/CppBridge (0.202.0): - FlipperKit/CppBridge (0.202.0):
- Flipper (~> 0.202.0) - Flipper (~> 0.202.0)
- FlipperKit/FBCxxFollyDynamicConvert (0.202.0): - FlipperKit/FBCxxFollyDynamicConvert (0.202.0):
@@ -59,7 +59,7 @@ PODS:
- FlipperKit/FlipperKitNetworkPlugin - FlipperKit/FlipperKitNetworkPlugin
- libevent (2.1.12) - libevent (2.1.12)
- OpenSSL-Universal (1.1.1100) - OpenSSL-Universal (1.1.1100)
- SocketRocket (0.6.0) - SocketRocket (0.7.0)
DEPENDENCIES: DEPENDENCIES:
- boost-for-react-native - boost-for-react-native
@@ -107,11 +107,11 @@ SPEC CHECKSUMS:
Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3 Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3
Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446 Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
FlipperKit: 6a2be223aff449e4c0b1e7c55a636f67ac050b15 FlipperKit: cd21c3d45c212fa801b1122829f7d6ec80b9f255
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
PODFILE CHECKSUM: d4e5b460eb545e577a9a2a6843c68eb15ea4f4d9 PODFILE CHECKSUM: 91787ba7cc4ea0c7dbba9f798e5b572e6f0c5f08
COCOAPODS: 1.12.1 COCOAPODS: 1.11.2

2
iOS/Tutorial/Podfile
View File

@@ -4,7 +4,7 @@ flipperkit_version = '0.202.0'
use_frameworks! use_frameworks!
target 'Tutorial' do target 'Tutorial' do
platform :ios, '10.0' platform :ios, '11.0'
pod 'FlipperKit', '~>' + flipperkit_version pod 'FlipperKit', '~>' + flipperkit_version
# Layout and network plugins are not yet supported for swift projects # Layout and network plugins are not yet supported for swift projects

6
iOS/Tutorial/Podfile.lock
View File

@@ -68,7 +68,7 @@ PODS:
- libevent (2.1.12) - libevent (2.1.12)
- OpenSSL-Universal (1.1.1100) - OpenSSL-Universal (1.1.1100)
- RenderCore (0.31) - RenderCore (0.31)
- SocketRocket (0.6.0) - SocketRocket (0.6.1)
- Yoga (1.14.0) - Yoga (1.14.0)
DEPENDENCIES: DEPENDENCIES:
@@ -109,9 +109,9 @@ SPEC CHECKSUMS:
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
RenderCore: 090beb17b5bff80b86929a7ceb49df789923d23a RenderCore: 090beb17b5bff80b86929a7ceb49df789923d23a
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c
PODFILE CHECKSUM: 56cead5fb78b13d37cf53ec82af754613862122f PODFILE CHECKSUM: 9e05a8202a727b5dbb5ec9f1b24b697fe353178f
COCOAPODS: 1.12.1 COCOAPODS: 1.12.1

4
react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample.xcodeproj/project.pbxproj
View File

@@ -615,7 +615,7 @@
"$(inherited)", "$(inherited)",
); );
INFOPLIST_FILE = ReactNativeFlipperExampleTests/Info.plist; 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"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-ObjC", "-ObjC",
@@ -635,7 +635,7 @@
BUNDLE_LOADER = "$(TEST_HOST)"; BUNDLE_LOADER = "$(TEST_HOST)";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
INFOPLIST_FILE = ReactNativeFlipperExampleTests/Info.plist; 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"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-ObjC", "-ObjC",