Fix the broken iOS OSS job
Summary: Fixes the iOS OSS job which was failing. The root cause of the problem is as follows: - RSocket was referring the master branch of rsocket/rsocket-cpp, fixed it by forking it and making its own release, unfortunately they don't make a release. - Folly referred to the January's release. The current master branch of RSocket doesn't build with the latest release of the Folly, [this commit](b51dc569eb) is responsible for the breakage. Thus I made a Rsocket release, right before this [commit](b51dc569eb), so that it builds.Although, the current master branch of Folly builds with the current master branch of rsocket, but we will have to wait on Folly team to make a release. Once they do that I will update bit RSocket and Folly releases. Reviewed By: jknoxville Differential Revision: D14668686 fbshipit-source-id: 6b0362632c26355a69a3f33a031b71c88e7dd45b
This commit is contained in:
committed by
Facebook Github Bot
parent
a0e0b434ee
commit
d044ae991f
@@ -61,7 +61,7 @@ Pod::Spec.new do |spec|
|
|||||||
ss.dependency 'FlipperKit/FBCxxUtils'
|
ss.dependency 'FlipperKit/FBCxxUtils'
|
||||||
ss.dependency 'FlipperKit/CppBridge'
|
ss.dependency 'FlipperKit/CppBridge'
|
||||||
ss.dependency 'FlipperKit/FKPortForwarding'
|
ss.dependency 'FlipperKit/FKPortForwarding'
|
||||||
ss.dependency 'Flipper-Folly', '~>1.2'
|
ss.dependency 'Flipper-Folly', '1.3.0'
|
||||||
ss.dependency 'Flipper', '~>'+flipperkit_version
|
ss.dependency 'Flipper', '~>'+flipperkit_version
|
||||||
ss.dependency 'OpenSSL-Static', '1.0.2.c1'
|
ss.dependency 'OpenSSL-Static', '1.0.2.c1'
|
||||||
ss.compiler_flags = folly_compiler_flags
|
ss.compiler_flags = folly_compiler_flags
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
Pod::Spec.new do |spec|
|
Pod::Spec.new do |spec|
|
||||||
spec.name = 'Flipper-Folly'
|
spec.name = 'Flipper-Folly'
|
||||||
spec.version = '1.2.0'
|
spec.version = '1.3.0'
|
||||||
spec.license = { :type => 'Apache License, Version 2.0' }
|
spec.license = { :type => 'Apache License, Version 2.0' }
|
||||||
spec.homepage = 'https://github.com/facebook/folly'
|
spec.homepage = 'https://github.com/facebook/folly'
|
||||||
spec.summary = 'An open-source C++ library developed and used at Facebook.'
|
spec.summary = 'An open-source C++ library developed and used at Facebook.'
|
||||||
spec.authors = 'Facebook'
|
spec.authors = 'Facebook'
|
||||||
spec.source = { :git => 'https://github.com/facebook/folly.git',
|
spec.source = { :git => 'https://github.com/facebook/folly.git',
|
||||||
:tag => "v2019.01.14.00"}
|
:tag => "v2019.03.25.00"}
|
||||||
spec.module_name = 'folly'
|
spec.module_name = 'folly'
|
||||||
spec.dependency 'boost-for-react-native'
|
spec.dependency 'boost-for-react-native'
|
||||||
spec.dependency 'DoubleConversion'
|
spec.dependency 'DoubleConversion'
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
Pod::Spec.new do |spec|
|
Pod::Spec.new do |spec|
|
||||||
spec.name = 'Flipper-RSocket'
|
spec.name = 'Flipper-RSocket'
|
||||||
spec.version = '0.10.1'
|
spec.version = '0.10.4'
|
||||||
spec.license = { :type => 'MIT' }
|
spec.license = { :type => 'MIT' }
|
||||||
spec.homepage = 'https://github.com/rsocket/rsocket-cpp'
|
spec.homepage = 'https://github.com/rsocket/rsocket-cpp'
|
||||||
spec.summary = 'C++ implementation of RSocket'
|
spec.summary = 'C++ implementation of RSocket'
|
||||||
spec.authors = 'Facebook'
|
spec.authors = 'Facebook'
|
||||||
spec.source = { :git => 'https://github.com/rsocket/rsocket-cpp.git', :branch => "master"}
|
spec.source = { :git => 'https://github.com/priteshrnandgaonkar/rsocket-cpp.git', :tag => "0.10.4"}
|
||||||
spec.module_name = 'RSocket'
|
spec.module_name = 'RSocket'
|
||||||
spec.static_framework = true
|
spec.static_framework = true
|
||||||
spec.source_files = 'rsocket/benchmarks/*',
|
spec.source_files = 'rsocket/benchmarks/*',
|
||||||
@@ -20,7 +20,7 @@ Pod::Spec.new do |spec|
|
|||||||
|
|
||||||
spec.libraries = "stdc++"
|
spec.libraries = "stdc++"
|
||||||
spec.compiler_flags = '-std=c++1y'
|
spec.compiler_flags = '-std=c++1y'
|
||||||
spec.dependency 'Flipper-Folly', '~>1.2'
|
spec.dependency 'Flipper-Folly', '~>1.3'
|
||||||
spec.compiler_flags = '-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 -frtti
|
spec.compiler_flags = '-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 -frtti
|
||||||
-fexceptions
|
-fexceptions
|
||||||
-std=c++14
|
-std=c++14
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ Pod::Spec.new do |spec|
|
|||||||
spec.public_header_files = 'xplat/Flipper/*.h','xplat/utils/*.h'
|
spec.public_header_files = 'xplat/Flipper/*.h','xplat/utils/*.h'
|
||||||
spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}','xplat/Flipper/utils/*.{h,cpp,m,mm}'
|
spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}','xplat/Flipper/utils/*.{h,cpp,m,mm}'
|
||||||
spec.libraries = "stdc++"
|
spec.libraries = "stdc++"
|
||||||
spec.dependency 'Flipper-Folly', '~>1.2'
|
spec.dependency 'Flipper-Folly', '1.3.0'
|
||||||
spec.dependency 'Flipper-RSocket', '~>0.10'
|
spec.dependency 'Flipper-RSocket', '0.10.4'
|
||||||
spec.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 -Wall
|
spec.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 -Wall
|
||||||
-std=c++14
|
-std=c++14
|
||||||
-Wno-global-constructors'
|
-Wno-global-constructors'
|
||||||
|
|||||||
Reference in New Issue
Block a user