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

Update all flipper transitive deps to latest versions (#2245)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/flipper/pull/2245

This diff does the following:
- Updates Folly to the latest version.
- Updates boost to latest version and the boost is added as pre built artefact
- Updates RSocket to the latest version
- Updates ComponentKit to the latest version which has a fix for XCode 12.5
- Adds Flipper-Glog dependency updated with a fix for the issue mentioned [here](https://github.com/facebook/flipper/issues/2174)
- This diff also ensures that Flipper, FlipperKit builds with Sample and SampleSwift app.
- This diff also ensures that the bug mentioned [here](https://github.com/facebook/flipper/issues/2248) is addressed.

Note: For Tutorial App to work we will have to make a release of Flipper and FlipperKit to CococaPods. Because the tutorial app refers the released version of Flipper and FlipperKit. It doesn't refer it locally.

Reviewed By: passy

Differential Revision: D28058972

fbshipit-source-id: d45dfc7315ace5d5c7d3a4ba94911fd4b58bdc31
This commit is contained in:
Pritesh Nandgaonkar
2021-05-04 05:01:59 -07:00
committed by Facebook GitHub Bot
parent 3586f8ebbb
commit e9ae8f45f9
9 changed files with 195 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
iOS/Podspecs/Flipper-Fmt.podspec Normal file
View File

@@ -0,0 +1,26 @@
# Copyright (c) Facebook, Inc. and its affiliates.
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
Pod::Spec.new do |spec|
spec.name = 'Flipper-Fmt'
spec.version = '7.1.7'
spec.license = { :type => 'MIT' }
spec.homepage = 'https://github.com/fmtlib/fmt'
spec.authors = { 'Pritesh Nandgaonkar' => 'prit91@fb.com' }
spec.summary = '{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams. '
spec.source = { :git => "https://github.com/priteshrnandgaonkar/fmt.git",
:tag => "7.1.7" }
spec.source_files = "src/format.cc", "include/**/*.h",
spec.public_header_files = "include/**/*.h"
spec.requires_arc = true
spec.ios.deployment_target = '10.0'
spec.header_dir = 'fmt'
spec.libraries = "stdc++"
spec.exclude_files = "src/fmt.cc", "src/fmt.cc"
spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/include/\""
}
end

88
iOS/Podspecs/Flipper-Folly.podspec
View File

@@ -5,20 +5,21 @@
Pod::Spec.new do |spec|
spec.name = 'Flipper-Folly'
spec.version = '2.5.1'
spec.version = '2.6.7'
spec.license = { :type => 'Apache License, Version 2.0' }
spec.homepage = 'https://github.com/facebook/folly'
spec.summary = 'An open-source C++ library developed and used at Facebook.'
spec.authors = 'Facebook'
spec.source = { :git => 'https://github.com/facebook/folly.git',
:tag => "v2020.04.06.00"}
:tag => "v2021.04.26.00"}
spec.module_name = 'folly'
spec.dependency 'boost-for-react-native'
spec.dependency 'Flipper-Boost-iOSX'
spec.dependency 'Flipper-Glog'
spec.dependency 'Flipper-DoubleConversion'
spec.dependency 'OpenSSL-Universal', '1.1.180'
spec.dependency 'libevent', '~> 2.1.12'
spec.compiler_flags = '-DFOLLY_HAVE_PTHREAD=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
spec.dependency 'Flipper-Fmt', '7.1.7'
spec.compiler_flags = '-DFOLLY_HAVE_BACKTRACE=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_PTHREAD=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
-frtti
-fexceptions
-std=c++14
@@ -28,11 +29,13 @@ Pod::Spec.new do |spec|
-Wno-sign-compare
-Wno-comment
-Wno-return-type
-Wno-global-constructors'
-Wno-global-constructors
-Wno-comma'
spec.source_files = "folly/*.h",
"folly/concurrency/*.h",
"folly/container/*.h",
"folly/container/*.cpp",
"folly/container/detail/*.h",
"folly/detail/*.h",
"folly/executors/**/*.h",
@@ -52,14 +55,16 @@ Pod::Spec.new do |spec|
"folly/memory/detail/*.h",
"folly/net/*.h",
"folly/net/detail/*.h",
"folly/portability/*.h",
"folly/ssl/*.h",
"folly/ssl/detail/*.h",
"folly/synchronization/*.h",
"folly/synchronization/detail/*.h",
"folly/synchronization/detail/*.cpp",
"folly/system/*.h",
"folly/tracing/*.h",
"folly/tracing/*.cpp",
"folly/chrono/*.h",
"folly/chrono/*.cpp",
"folly/*.cpp",
"folly/concurrency/*.cpp",
"folly/container/detail/*.cpp",
@@ -76,12 +81,75 @@ Pod::Spec.new do |spec|
"folly/memory/*.cpp",
"folly/memory/detail/*.cpp",
"folly/net/*.cpp",
"folly/portability/*.cpp",
"folly/ssl/*.cpp",
"folly/ssl/detail/*.cpp",
"folly/String.cpp",
"folly/synchronization/*.cpp",
"folly/system/*.cpp"
"folly/system/*.cpp",
"folly/experimental/coro/*.h",
"folly/experimental/symbolizer/*.h",
"folly/experimental/symbolizer/*.cpp",
"folly/fibers/*.h",
"folly/fibers/*.cpp",
"folly/experimental/symbolizer/detail/*.h",
"folly/experimental/symbolizer/detail/*.cpp",
"folly/logging/*.h",
"folly/logging/*.cpp",
"folly/experimental/coro/detail/*.h",
"folly/experimental/coro/detail/*.cpp",
"folly/portability/Unistd.h",
"folly/portability/Unistd.cpp",
"folly/portability/Config.h",
"folly/portability/Constexpr.h",
"folly/portability/Builtins.h",
"folly/portability/Builtins.cpp",
"folly/portability/Malloc.h",
"folly/portability/Malloc.cpp",
"folly/portability/Math.h",
"folly/portability/Asm.h",
"folly/portability/OpenSSL.h",
"folly/portability/OpenSSL.cpp",
"folly/portability/PThread.cpp",
"folly/portability/PThread.h",
"folly/portability/Windows.h",
"folly/portability/SysResource.h",
"folly/portability/SysResource.cpp",
"folly/portability/Event.h",
"folly/experimental/observer/*.h",
"folly/experimental/observer/*.cpp",
"folly/portability/Time.h",
"folly/portability/Time.cpp",
"folly/portability/IOVec.h",
"folly/portability/SysTypes.h",
"folly/portability/GFlags.h",
"folly/portability/SysSyscall.h",
"folly/portability/SysUio.h",
"folly/portability/SysUio.cpp",
"folly/portability/SysTime.h",
"folly/portability/SysTime.cpp",
"folly/portability/SysStat.h",
"folly/portability/SysStat.cpp",
"folly/portability/SysMman.h",
"folly/portability/SysMman.cpp",
"folly/portability/Sockets.h",
"folly/portability/Sockets.cpp",
"folly/portability/SysMembarrier.h",
"folly/portability/SysMembarrier.cpp",
"folly/portability/SysFile.h",
"folly/portability/SysFile.cpp",
"folly/portability/String.h",
"folly/portability/String.cpp",
"folly/portability/Fcntl.h",
"folly/portability/Fcntl.cpp",
"folly/portability/Stdlib.h",
"folly/portability/Stdlib.cpp",
"folly/portability/Stdio.h",
"folly/portability/Stdio.cpp",
"folly/portability/FmtCompile.h",
"folly/portability/Sched.h",
"folly/portability/Sched.cpp",
"folly/experimental/observer/detail/*.h",
"folly/experimental/observer/detail/*.cpp",
spec.exclude_files = "folly/synchronization/Rcu.cpp", "folly/synchronization/Rcu.h"
spec.header_mappings_dir = 'folly'
@@ -91,8 +159,8 @@ Pod::Spec.new do |spec|
spec.public_header_files = "folly/**/*.h"
spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
"CLANG_CXX_LANGUAGE_STANDARD" => "c++11",
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Flipper-DoubleConversion\" \"$(PODS_ROOT)/libevent/include\""
"CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Flipper-Boost-iOSX\" \"$(PODS_ROOT)/Flipper-DoubleConversion\" \"$(PODS_ROOT)/libevent/include\""
}
spec.platforms = { :ios => "10.0"}
end

31
iOS/Podspecs/Flipper-RSocket.podspec
View File

@@ -5,12 +5,12 @@
Pod::Spec.new do |spec|
spec.name = 'Flipper-RSocket'
spec.version = '1.3.1'
spec.version = '1.4.3'
spec.license = { :type => 'MIT' }
spec.homepage = 'https://github.com/rsocket/rsocket-cpp'
spec.summary = 'C++ implementation of RSocket'
spec.authors = 'Facebook'
spec.source = { :git => 'https://github.com/priteshrnandgaonkar/rsocket-cpp.git', :tag => "0.11.0"}
spec.source = { :git => 'https://github.com/rsocket/rsocket-cpp.git', :tag => "v2021.04.26.00"}
spec.module_name = 'RSocket'
spec.static_framework = true
spec.source_files = 'rsocket/benchmarks/*.{h,cpp,m,mm}',
@@ -25,17 +25,20 @@ Pod::Spec.new do |spec|
spec.libraries = "stdc++"
spec.compiler_flags = '-std=c++1y'
spec.dependency 'Flipper-Folly', '~> 2.5'
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
-std=c++14
-Wno-error
-Wno-unused-local-typedefs
-Wno-unused-variable
-Wno-sign-compare
-Wno-comment
-Wno-return-type
-Wno-global-constructors'
spec.dependency 'Flipper-Folly', '~> 2.6'
spec.compiler_flags = '-DFOLLY_HAVE_BACKTRACE=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_PTHREAD=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
-frtti
-fexceptions
-std=c++14
-Wno-error
-Wno-unused-local-typedefs
-Wno-unused-variable
-Wno-sign-compare
-Wno-comment
-Wno-return-type
-Wno-global-constructors
-Wno-comma'
spec.preserve_paths = 'rsocket/benchmarks/*.h',
'rsocket/framing/*.h',
'rsocket/internal/*.h',
@@ -53,7 +56,7 @@ Pod::Spec.new do |spec|
spec.header_dir = './'
spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
"CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/libevent/include\" \"$(PODS_ROOT)/DoubleConversion\"/**" }
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/** \"$(PODS_ROOT)/Flipper-Boost-iOSX\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/libevent/include\" \"$(PODS_ROOT)/DoubleConversion\"/**" }
spec.platforms = { :ios => "10.0" }
end