From 2f009882d399932dadc69a3db4ad4fde5b582c11 Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Tue, 7 Aug 2018 08:25:27 -0700 Subject: [PATCH] Use tags instead of master branch for folly Summary: Prior to this diff the OSS sonar project depended on folly's master branch instead of tags, which is not good as things can break, which broke recently. So this diff adds the folly dependency thru tags to avoid any future failures. This diff releases a new folly dependency which relies on a tag Reviewed By: danielbuechele Differential Revision: D9194966 fbshipit-source-id: 0a0956f0bd457e375fcbb86b3fec412aeb759a47 --- Specs/Folly/1.1.0/Folly.podspec.json | 176 +++++++++++++++++++++++++++ iOS/SonarKit.podspec | 2 +- xplat/Sonar/Sonar.podspec | 2 +- 3 files changed, 178 insertions(+), 2 deletions(-) create mode 100644 Specs/Folly/1.1.0/Folly.podspec.json diff --git a/Specs/Folly/1.1.0/Folly.podspec.json b/Specs/Folly/1.1.0/Folly.podspec.json new file mode 100644 index 000000000..1193f1d5d --- /dev/null +++ b/Specs/Folly/1.1.0/Folly.podspec.json @@ -0,0 +1,176 @@ +{ + "name": "Folly", + "version": "1.1.0", + "license": { + "type": "Apache License, Version 2.0" + }, + "homepage": "https://github.com/facebook/folly", + "summary": "An open-source C++ library developed and used at Facebook.", + "authors": "Facebook", + "source": { + "git": "https://github.com/facebook/folly.git", + "tag": "v2018.08.06.00" + }, + "module_name": "folly", + "dependencies": { + "boost-for-react-native": [ + + ], + "DoubleConversion": [ + + ], + "glog": [ + + ], + "OpenSSL-Static": [ + "1.0.2.c1" + ], + "CocoaLibEvent": [ + "~> 1.0" + ] + }, + "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\n -fexceptions\n -std=c++14\n -Wno-error\n -Wno-unused-local-typedefs\n -Wno-unused-variable\n -Wno-sign-compare\n -Wno-comment\n -Wno-return-type\n -Wno-global-constructors", + "source_files": [ + "folly/system/*.cpp", + "folly/portability/Config.h", + "folly/Executor.h", + "folly/Function.h", + "folly/Utility.h", + "folly/Portability.h", + "folly/Traits.h", + "folly/functional/Invoke.h", + "folly/CPortability.h", + "folly/dynamic.h", + "folly/json_pointer.h", + "folly/Expected.h", + "folly/Preprocessor.h", + "folly/Optional.h", + "folly/Unit.h", + "folly/Utility.h", + "folly/lang/ColdClass.h", + "folly/CppAttributes.h", + "folly/json.h", + "folly/Range.h", + "folly/hash/SpookyHashV2.h", + "folly/lang/Exception.h", + "folly/portability/Constexpr.h", + "folly/CpuId.h", + "folly/Likely.h", + "folly/detail/RangeCommon.h", + "folly/detail/RangeSse42.h", + "folly/portability/String.h", + "folly/dynamic-inl.h", + "folly/Conv.h", + "folly/Demangle.h", + "folly/FBString.h", + "folly/hash/Hash.h", + "folly/memory/Malloc.h", + "folly/io/async/AsyncTimeout.h", + "folly/**/*.h", + "folly/memory/detail/MallocImpl.h", + "folly/String.h", + "folly/*.h", + "folly/portability/PThread.h", + "folly/futures/*.h", + "folly/futures/detail/*.h", + "folly/Executor.cpp", + "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/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/container/detail/*.cpp" + ], + "preserve_paths": [ + "folly/*.h", + "folly/portability/*.h", + "folly/lang/*.h", + "folly/functional/*.h", + "folly/detail/*.h", + "folly/hash/*.h", + "folly/memory/*.h", + "folly/**/*.h", + "folly/futures/detail/*.h", + "folly/futures/*.h" + ], + "header_mappings_dir": "folly", + "header_dir": "folly", + "libraries": "stdc++", + "private_header_files": [ + "folly/portability/Stdlib.h", + "folly/portability/Stdio.h" + ], + "public_header_files": [ + "folly/portability/Config.h", + "folly/Executor.h", + "folly/Function.h", + "folly/Utility.h", + "folly/Portability.h", + "folly/Traits.h", + "folly/functional/Invoke.h", + "folly/CPortability.h", + "folly/dynamic.h", + "folly/json_pointer.h", + "folly/Expected.h", + "folly/Preprocessor.h", + "folly/Optional.h", + "folly/Unit.h", + "folly/Utility.h", + "folly/lang/ColdClass.h", + "folly/CppAttributes.h", + "folly/json.h", + "folly/Range.h", + "folly/hash/SpookyHashV2.h", + "folly/lang/Exception.h", + "folly/portability/Constexpr.h", + "folly/CpuId.h", + "folly/Likely.h", + "folly/detail/RangeCommon.h", + "folly/detail/RangeSse42.h", + "folly/portability/String.h", + "folly/dynamic-inl.h", + "folly/Conv.h", + "folly/Demangle.h", + "folly/FBString.h", + "folly/hash/Hash.h", + "folly/memory/Malloc.h", + "folly/io/async/AsyncTimeout.h", + "folly/**/*.h", + "folly/memory/detail/MallocImpl.h", + "folly/String.h", + "folly/*.h", + "folly/portability/PThread.h", + "folly/futures/*.h", + "folly/futures/detail/*.h" + ], + "user_target_xcconfig": { + "ONLY_ACTIVE_ARCH": "YES" + }, + "pod_target_xcconfig": { + "USE_HEADERMAP": "NO", + "ONLY_ACTIVE_ARCH": "YES", + "CLANG_CXX_LANGUAGE_STANDARD": "c++11", + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\"" + }, + "platforms": { + "ios": "8.0" + } +} diff --git a/iOS/SonarKit.podspec b/iOS/SonarKit.podspec index 76009c55b..ef18b8791 100644 --- a/iOS/SonarKit.podspec +++ b/iOS/SonarKit.podspec @@ -50,7 +50,7 @@ Pod::Spec.new do |spec| ss.dependency 'SonarKit/FBDefines' ss.dependency 'SonarKit/FBCxxUtils' ss.dependency 'SonarKit/CppBridge' - ss.dependency 'Folly', '~>1.0' + ss.dependency 'Folly', '~>1.1' ss.dependency 'Sonar', '~>'+sonarkit_version ss.dependency 'CocoaAsyncSocket', '~> 7.6' ss.dependency 'PeerTalk', '~>0.0.2' diff --git a/xplat/Sonar/Sonar.podspec b/xplat/Sonar/Sonar.podspec index df83b57d1..60eca8fc9 100644 --- a/xplat/Sonar/Sonar.podspec +++ b/xplat/Sonar/Sonar.podspec @@ -12,7 +12,7 @@ Pod::Spec.new do |spec| spec.public_header_files = 'xplat/Sonar/*.h' spec.source_files = 'xplat/Sonar/*.{h,cpp,m,mm}' spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.0' + spec.dependency 'Folly', '~>1.1' spec.dependency 'RSocket', '~>0.10' spec.compiler_flags = '-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