diff --git a/iOS/Sample/Podfile b/iOS/Sample/Podfile index 8294ce99d..f4e5846aa 100644 --- a/iOS/Sample/Podfile +++ b/iOS/Sample/Podfile @@ -18,7 +18,8 @@ target 'Sample' do pod 'SonarKit', :podspec => '../SonarKit.podspec' pod 'SonarKit/SonarKitLayoutComponentKitSupport', :podspec => '../SonarKit.podspec' pod 'SonarKit/SKIOSNetworkPlugin', :podspec => '../SonarKit.podspec' - + pod 'OpenSSL-Universal', '~> 1.0' + pod 'CocoaLibEvent', '~> 1.0' post_install do |installer| installer.pods_project.targets.each do |target| if ['YogaKit'].include? target.name diff --git a/iOS/Sample/Podfile.lock b/iOS/Sample/Podfile.lock new file mode 100644 index 000000000..7a60bbe54 --- /dev/null +++ b/iOS/Sample/Podfile.lock @@ -0,0 +1,150 @@ +PODS: + - boost-for-react-native (1.63.0) + - CocoaAsyncSocket (7.6.3) + - CocoaLibEvent (1.0.0) + - ComponentKit (0.21): + - Yoga + - DoubleConversion (3.0.0) + - EasyWSClient (1.0.0) + - Folly (2018.05.28.00): + - boost-for-react-native + - DoubleConversion + - glog + - glog (0.3.5) + - OpenSSL-Universal (1.0.2.13) + - PeerTalk (0.0.2) + - RSocket (0.10.0): + - Folly + - Sonar (1.0.0): + - Folly + - RSocket + - SonarKit (1.0.0): + - CocoaAsyncSocket (~> 7.6) + - Folly + - OpenSSL-Universal (~> 1.0) + - PeerTalk + - Sonar + - SonarKit/SKIOSNetworkPlugin (= 1.0.0) + - SonarKit/SonarKitLayoutComponentKitSupport (= 1.0.0) + - SonarKit/SonarKitLayoutPlugin (= 1.0.0) + - SonarKit/SonarKitNetworkPlugin (= 1.0.0) + - SonarKit/SonarKitNetworkPlugin (= 1.0.0) + - SonarKit/SKIOSNetworkPlugin (1.0.0): + - CocoaAsyncSocket (~> 7.6) + - Folly + - OpenSSL-Universal (~> 1.0) + - PeerTalk + - Sonar + - SonarKit/SonarKitNetworkPlugin + - SonarKit/SonarKitLayoutComponentKitSupport (1.0.0): + - CocoaAsyncSocket (~> 7.6) + - ComponentKit + - Folly + - OpenSSL-Universal (~> 1.0) + - PeerTalk + - Sonar + - SonarKit/SonarKitLayoutPlugin + - Yoga (= 1.8.1) + - SonarKit/SonarKitLayoutPlugin (1.0.0): + - CocoaAsyncSocket (~> 7.6) + - Folly + - OpenSSL-Universal (~> 1.0) + - PeerTalk + - Sonar + - Yoga (= 1.8.1) + - YogaKit (= 1.8.1) + - SonarKit/SonarKitNetworkPlugin (1.0.0): + - CocoaAsyncSocket (~> 7.6) + - Folly + - OpenSSL-Universal (~> 1.0) + - PeerTalk + - Sonar + - Yoga (1.8.1) + - YogaKit (1.8.1): + - Yoga (~> 1.8.1) + +DEPENDENCIES: + - CocoaLibEvent (~> 1.0) + - ComponentKit (from `../third-party-podspecs/ComponentKit.podspec`) + - DoubleConversion (from `../third-party-podspecs/DoubleConversion.podspec`) + - EasyWSClient (from `../third-party-podspecs/EasyWSClient.podspec`) + - Folly (from `../third-party-podspecs/Folly.podspec`) + - glog (from `../third-party-podspecs/glog.podspec`) + - OpenSSL-Universal (~> 1.0) + - PeerTalk (from `https://github.com/rsms/peertalk`) + - RSocket (from `../third-party-podspecs/RSocket.podspec`) + - Sonar (from `../../xplat/Sonar/SonarKitCPP.podspec`) + - SonarKit (from `../SonarKit.podspec`) + - SonarKit/SKIOSNetworkPlugin (from `../SonarKit.podspec`) + - SonarKit/SonarKitLayoutComponentKitSupport (from `../SonarKit.podspec`) + - Yoga (~> 1.8.1) + +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - boost-for-react-native + - CocoaAsyncSocket + - CocoaLibEvent + - OpenSSL-Universal + - Yoga + - YogaKit + +EXTERNAL SOURCES: + ComponentKit: + :podspec: "../third-party-podspecs/ComponentKit.podspec" + DoubleConversion: + :podspec: "../third-party-podspecs/DoubleConversion.podspec" + EasyWSClient: + :podspec: "../third-party-podspecs/EasyWSClient.podspec" + Folly: + :podspec: "../third-party-podspecs/Folly.podspec" + glog: + :podspec: "../third-party-podspecs/glog.podspec" + PeerTalk: + :git: https://github.com/rsms/peertalk + RSocket: + :podspec: "../third-party-podspecs/RSocket.podspec" + Sonar: + :podspec: "../../xplat/Sonar/SonarKitCPP.podspec" + SonarKit: + :podspec: "../SonarKit.podspec" + +CHECKOUT OPTIONS: + ComponentKit: + :commit: 663f97614c4b398b029bbc0f6b31330e426c6aa7 + :git: https://github.com/facebook/ComponentKit.git + EasyWSClient: + :commit: 9b87dc488048900a8cd684f51ddc98143682dbc3 + :git: https://github.com/dhbaird/easywsclient.git + PeerTalk: + :commit: 588303b43efa5082d654b6f75d1b84a6ba4b5b9e + :git: https://github.com/rsms/peertalk + RSocket: + :commit: 804eabc02afdec8756a16517e4513ec9301a3315 + :git: https://github.com/rsocket/rsocket-cpp.git + Sonar: + :commit: 703c8a0829255f1962bd01d507074d9d3b4697ae + :git: https://github.com/facebook/Sonar.git + SonarKit: + :commit: 703c8a0829255f1962bd01d507074d9d3b4697ae + :git: https://github.com/facebook/Sonar.git + +SPEC CHECKSUMS: + boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c + CocoaAsyncSocket: eafaa68a7e0ec99ead0a7b35015e0bf25d2c8987 + CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f + ComponentKit: 7bd0ad508946aeb68dd52ed8739ced9846ff3671 + DoubleConversion: 310ccd7cdf00175c32883664f84fe026025604df + EasyWSClient: 7ec8effe7d86f6061a47d19a55355769c9edfd2f + Folly: 6a1cc25ddcc61d794309b9eb69e1e7c5343f4a98 + glog: f175af2df1f453be65bd355b287a07c842927a99 + OpenSSL-Universal: 401888162f11c33ebbd46f782d9229da35c61327 + PeerTalk: f5389c286e4d477e59b73dfbf25c5c70a2464761 + RSocket: 0b49004a22945bbf00a5760d9fd9e7e57be5478d + Sonar: 545507863c4238b9c016b8f6813f9829256fc2cc + SonarKit: f3d6be4f167b11e702dffd27c6e52529e510bbb6 + Yoga: e6f1fed82138c17da5332e15e5770abf0e9cc386 + YogaKit: bb90d11e297e06abef7e0cfb20e035a6bd00cdc4 + +PODFILE CHECKSUM: 1904a24f0191377e3743dc726e5d7e52455b7ff4 + +COCOAPODS: 1.5.2 diff --git a/iOS/SonarKit.podspec b/iOS/SonarKit.podspec index b9344a274..929797e5e 100644 --- a/iOS/SonarKit.podspec +++ b/iOS/SonarKit.podspec @@ -11,12 +11,13 @@ Pod::Spec.new do |spec| spec.authors = 'Facebook' # spec.prepare_command = 'mv src double-conversion' spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :branch=> "master" } + :branch=> "iOS-RSocket" } spec.module_name = 'SonarKit' spec.dependency 'Folly' spec.dependency 'Sonar' spec.dependency 'CocoaAsyncSocket', '~> 7.6' spec.dependency 'PeerTalk' + spec.dependency 'OpenSSL-Universal', '~> 1.0' spec.source_files = 'iOS/FBDefines/*.{h,cpp,m,mm}', 'iOS/SonarKit/**/*.{h,cpp,m,mm}', 'iOS/SonarKit/FBCxxUtils/*.{h, mm}', spec.public_header_files = 'iOS/SonarKit/CppBridge/*.{h}', 'iOS/SonarKit/FBCxxUtils/*.{h}', diff --git a/iOS/third-party-podspecs/Folly.podspec b/iOS/third-party-podspecs/Folly.podspec index 3006b51e9..af8bc68b1 100755 --- a/iOS/third-party-podspecs/Folly.podspec +++ b/iOS/third-party-podspecs/Folly.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'Folly' - spec.version = '2018.05.07.00' + spec.version = '2018.05.28.00' 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.' @@ -11,7 +11,7 @@ Pod::Spec.new do |spec| spec.dependency 'boost-for-react-native' spec.dependency 'DoubleConversion' spec.dependency 'glog' - 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_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 -frtti -fexceptions -std=c++14 -Wno-error @@ -25,11 +25,27 @@ Pod::Spec.new do |spec| 'folly/memory/detail/MallocImpl.cpp', 'folly/String.cpp', 'folly/*.cpp', + 'folly/detail/*.cpp', + 'folly/hash/*.cpp', 'folly/portability/*.cpp', 'folly/ScopeGuard.h', 'folly/lang/ColdClass.cpp', 'folly/lang/Assume.h', - 'folly/lang/Assume.cpp' + 'folly/lang/Assume.cpp', + 'folly/io/async/*.cpp', + 'folly/io/async/ssl/*.cpp', + 'folly/io/*.cpp', + 'folly/synchronization/*.cpp', + 'folly/lang/*.cpp', + 'folly/memory/*.cpp', + 'folly/futures/*.cpp', + 'folly/futures/detail/*.cpp', + 'folly/experimental/hazptr/*.cpp', + 'folly/executors/*.cpp', + 'folly/concurrency/*.cpp', + 'folly/ssl/*.cpp', + 'folly/ssl/detail/*.cpp', + 'folly/system/*.cpp' # workaround for https://github.com/facebook/react-native/issues/14326 spec.preserve_paths = 'folly/*.h', @@ -39,7 +55,9 @@ Pod::Spec.new do |spec| 'folly/detail/*.h', 'folly/hash/*.h', 'folly/memory/*.h', - 'folly/**/*.h' + 'folly/**/*.h', + 'folly/futures/detail/*.h', + 'folly/futures/*.h' spec.header_mappings_dir = 'folly' spec.header_dir = 'folly' @@ -85,11 +103,13 @@ Pod::Spec.new do |spec| 'folly/memory/detail/MallocImpl.h', 'folly/String.h', 'folly/*.h', - 'folly/portability/PThread.h' + 'folly/portability/PThread.h', + 'folly/futures/*.h', + 'folly/futures/detail/*.h' spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", "CLANG_CXX_LANGUAGE_STANDARD" => "c++11", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"/usr/local/Cellar/openssl/1.0.2o_1/include\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\"" } + "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"/usr/local/include\" \"/usr/local/Cellar/openssl/1.0.2o_1/include\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\"" } # Pinning to the same version as React.podspec. spec.platforms = { :ios => "8.0", :tvos => "10.0" } diff --git a/iOS/third-party-podspecs/LibEvent.podspec b/iOS/third-party-podspecs/LibEvent.podspec index a91521c19..3dc29d42b 100644 --- a/iOS/third-party-podspecs/LibEvent.podspec +++ b/iOS/third-party-podspecs/LibEvent.podspec @@ -1,14 +1,29 @@ -# This podspec is not being used instead the hard coded path to local LibEvent is used. -# TODO use this spec instead of hard coded path `/usr/local/include` -Pod::Spec.new do |spec| - spec.name = 'LibEvent' - spec.version = '2.1.8' - spec.license = { :file => 'LICENSE'} - spec.homepage = 'https://github.com/rsocket/rsocket-cpp' - spec.summary = 'LibEvent' - spec.authors = 'LibEvent' - spec.source = { :git => 'https://github.com/libevent/libevent.git', :tag => "release-2.1.8-stable"} - spec.module_name = 'LibEvent' - spec.source_files = '**/*.h' - spec.platforms = { :ios => "8.0", :tvos => "9.2" } +Pod::Spec.new do |s| + + s.name = "libevent" + s.version = "1.0" + s.summary = "Unofficial libevent mirror for Cocoapods" + + s.description = <<-DESC + This is a binary distribution of the libevent library built for iOS. + The library uses configure which makes it a bit tricky to cross compile. + DESC + + s.homepage = "http://libevent.org/" + s.license = "BSD" + s.authors = { "liguangming" => "cute@liguangming.com" } + s.social_media_url = "http://twitter.com/liguangming" + s.ios.deployment_target = "6.0" + s.source = { :git => "https://github.com/cute/libevent.git", :tag => "1.0" } + s.header_dir = "event2" + s.source_files = "include/**/*.h" + s.ios.library = "event" + s.preserve_paths = "include", "lib" + s.requires_arc = false + s.xcconfig = { + "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/libevent/include", + "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/libevent/include/event2", + "LIBRARY_SEARCH_PATHS" => "$(PODS_ROOT)/libevent/lib", + } + end diff --git a/iOS/third-party-podspecs/RSocket.podspec b/iOS/third-party-podspecs/RSocket.podspec index adb05f21c..84a44e585 100644 --- a/iOS/third-party-podspecs/RSocket.podspec +++ b/iOS/third-party-podspecs/RSocket.podspec @@ -12,7 +12,10 @@ Pod::Spec.new do |spec| 'rsocket/internal/*', 'rsocket/statemachine/*', 'rsocket/transports/*', - 'yarnpl/**/*' + 'rsocket/transports/**/*', + 'yarpl/observable/*', + 'yarpl/flowable/*', + 'rsocket/*' spec.libraries = "stdc++" spec.compiler_flags = '-std=c++1y' @@ -33,12 +36,12 @@ Pod::Spec.new do |spec| 'rsocket/statemachine/*.h', 'rsocket/transports/*.h', 'rsocket/*.h', - 'yarnpl/flowable/*.h', - 'yarnpl/observable/*.h', - 'yarnpl/perf/*.h', - 'yarnpl/single/*.h', - 'yarnpl/utils/*.h', - 'yarnpl/*.h', + 'yarpl/flowable/*.h', + 'yarpl/observable/*.h', + 'yarpl/perf/*.h', + 'yarpl/single/*.h', + 'yarpl/utils/*.h', + 'yarpl/*.h', '**/*.h' spec.header_mappings_dir = './*' spec.header_dir = './*' diff --git a/xplat/Sonar/SonarKitCPP.podspec b/xplat/Sonar/SonarKitCPP.podspec index 68546afcf..50338a96b 100644 --- a/xplat/Sonar/SonarKitCPP.podspec +++ b/xplat/Sonar/SonarKitCPP.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |spec| spec.authors = 'Facebook' # spec.prepare_command = 'mv src double-conversion' spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :branch => 'master' } + :branch => 'iOS-RSocket' } spec.module_name = 'Sonar' spec.public_header_files = 'xplat/Sonar/*.h' spec.source_files = 'xplat/Sonar/*.{h,cpp,m,mm}'