From 34b0cad824ce49474a2b50d747329c8b1242bc85 Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Wed, 1 May 2019 06:02:46 -0700 Subject: [PATCH] Moved Flipper podspec outside (#423) Summary: Removed the symlink and moved `Flipper.podspec` and `FlipperKit.podspec` to the root directory. Also published `Flipper.podspec` and `FlipperKit.podspec`on cocoapods http://cocoapods.org/pods/Flipper http://cocoapods.org/pods/FlipperKit Also removed the stub podspec files. Released Flipper and FlipperKit on Cocoapods Pull Request resolved: https://github.com/facebook/flipper/pull/423 Reviewed By: passy Differential Revision: D15146621 Pulled By: priteshrnandgaonkar fbshipit-source-id: 86ee16773a81b0896548169cba49810250122ec1 --- Flipper.podspec | 25 ++++- FlipperKit.podspec | 164 ++++++++++++++++++++++++++++++- StubPodspecs/Flipper.podspec | 14 --- StubPodspecs/FlipperKit.podspec | 14 --- StubPodspecs/README.md | 1 - iOS/FlipperKit.podspec | 169 -------------------------------- xplat/Flipper/Flipper.podspec | 24 ----- 7 files changed, 187 insertions(+), 224 deletions(-) mode change 120000 => 100644 Flipper.podspec mode change 120000 => 100644 FlipperKit.podspec delete mode 100644 StubPodspecs/Flipper.podspec delete mode 100644 StubPodspecs/FlipperKit.podspec delete mode 100644 StubPodspecs/README.md delete mode 100644 iOS/FlipperKit.podspec delete mode 100644 xplat/Flipper/Flipper.podspec diff --git a/Flipper.podspec b/Flipper.podspec deleted file mode 120000 index d0f50a15f71..00000000000 --- a/Flipper.podspec +++ /dev/null @@ -1 +0,0 @@ -xplat/Flipper/Flipper.podspec \ No newline at end of file diff --git a/Flipper.podspec b/Flipper.podspec new file mode 100644 index 00000000000..e3b68e5748b --- /dev/null +++ b/Flipper.podspec @@ -0,0 +1,24 @@ +flipperkit_version = '0.20.0' +Pod::Spec.new do |spec| + spec.name = 'Flipper' + spec.version = flipperkit_version + spec.license = { :type => 'MIT' } + spec.homepage = 'https://github.com/facebook/sonar' + spec.summary = 'SonarKit core cpp code with network implementation' + spec.authors = 'Facebook' + spec.source = { :git => 'https://github.com/facebook/Sonar.git', + :tag => 'v'+flipperkit_version } + spec.module_name = 'Flipper' + 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.libraries = "stdc++" + spec.dependency 'Flipper-Folly', '1.3.0' + 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 + -std=c++14 + -Wno-global-constructors' + spec.platforms = { :ios => "8.0" } + 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)/Flipper-RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } +end diff --git a/FlipperKit.podspec b/FlipperKit.podspec deleted file mode 120000 index 01cdfc86ea4..00000000000 --- a/FlipperKit.podspec +++ /dev/null @@ -1 +0,0 @@ -iOS/FlipperKit.podspec \ No newline at end of file diff --git a/FlipperKit.podspec b/FlipperKit.podspec new file mode 100644 index 00000000000..52b950a2d0a --- /dev/null +++ b/FlipperKit.podspec @@ -0,0 +1,163 @@ +folly_compiler_flags = '-DDEBUG=1 -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' +yoga_version = '~> 1.14' +yogakit_version = '~> 1.14' +flipperkit_version = '0.20.0' +Pod::Spec.new do |spec| + spec.name = 'FlipperKit' + spec.version = flipperkit_version + spec.license = { :type => 'MIT' } + spec.homepage = 'https://github.com/facebook/Sonar' + spec.summary = 'Sonar iOS podspec' + spec.authors = 'Facebook' + spec.static_framework = true + spec.source = { :git => 'https://github.com/facebook/Sonar.git', + :tag=> "v"+flipperkit_version } + spec.module_name = 'FlipperKit' + spec.platforms = { :ios => "8.4" } + spec.default_subspecs = "Core" + + # This subspec is necessary since FBDefines.h is imported as + # inside SKMacros.h, which is a public header file. Defining this directory as a + # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't + # generally (you would need to import ) + spec.subspec 'FBDefines' do |ss| + ss.header_dir = 'FBDefines' + ss.compiler_flags = folly_compiler_flags + ss.source_files = 'iOS/FBDefines/**/*.h' + ss.public_header_files = 'iOS/FBDefines/**/*.h' + end + + spec.subspec 'CppBridge' do |ss| + ss.header_dir = 'CppBridge' + ss.dependency 'Flipper', '~>'+flipperkit_version + ss.compiler_flags = folly_compiler_flags + ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h}' + # We set these files as private headers since they only need to be accessed + # by other FlipperKit source files + ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' + ss.preserve_path = 'iOS/FlipperKit/CppBridge/**/*.h' + header_search_paths = "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/FlipperKit/iOS/**/\"" + ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", + "ONLY_ACTIVE_ARCH": "YES", + "DEFINES_MODULE" => "YES", + "HEADER_SEARCH_PATHS" => header_search_paths } + end + + spec.subspec 'FBCxxUtils' do |ss| + ss.header_dir = 'FBCxxUtils' + ss.compiler_flags = folly_compiler_flags + ss.dependency 'Flipper-Folly', '1.3.0' + ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' + # We set these files as private headers since they only need to be accessed + # by other FlipperKit source files + ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' + header_search_paths = "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\"" + ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", + "ONLY_ACTIVE_ARCH": "YES", + "DEFINES_MODULE" => "YES", + "HEADER_SEARCH_PATHS" => header_search_paths } + end + + spec.subspec "FKPortForwarding" do |ss| + ss.header_dir = "FKPortForwarding" + ss.dependency 'CocoaAsyncSocket', '~> 7.6' + ss.dependency 'Flipper-PeerTalk', '~>0.0.4' + ss.compiler_flags = folly_compiler_flags + ss.source_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.{h,m}' + ss.private_header_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.h' + end + + spec.subspec "Core" do |ss| + ss.dependency 'FlipperKit/FBDefines' + ss.dependency 'FlipperKit/FBCxxUtils' + ss.dependency 'FlipperKit/CppBridge' + ss.dependency 'FlipperKit/FKPortForwarding' + ss.dependency 'Flipper', '~>'+flipperkit_version + ss.compiler_flags = folly_compiler_flags + 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}.h' + header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit/\" \"$(PODS_ROOT)/Headers/Private/FlipperKit/\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/boost-for-react-native\"" + ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", + "ONLY_ACTIVE_ARCH": "YES", + "DEFINES_MODULE" => "YES", + "HEADER_SEARCH_PATHS" => header_search_paths } + end + + spec.subspec "FlipperKitLayoutPlugin" do |ss| + ss.header_dir = "FlipperKitLayoutPlugin" + ss.dependency 'FlipperKit/Core' + ss.dependency 'Yoga', yoga_version + ss.dependency 'YogaKit', yogakit_version + ss.compiler_flags = folly_compiler_flags + ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', + 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', + 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', + 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h' + ss.private_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', + 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', + 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', + 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', + 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', + 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', + 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', + 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKSwizzle.h', + 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKYogaKitHelper.h' + ss.source_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/**/*.{h,cpp,m,mm}' + ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**", "ONLY_ACTIVE_ARCH": "YES" } + end + + spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| + ss.header_dir = "FlipperKitLayoutComponentKitSupport" + ss.dependency 'FlipperKit/Core' + ss.dependency 'Yoga', yoga_version + ss.dependency 'ComponentKit', '~> 0.27' + ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' + ss.compiler_flags = folly_compiler_flags + ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', + 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h' + ss.source_files = "iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}" + ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**","ONLY_ACTIVE_ARCH": "YES" } + + end + + spec.subspec "FlipperKitNetworkPlugin" do |ss| + ss.header_dir = "FlipperKitNetworkPlugin" + ss.dependency 'FlipperKit/Core' + ss.compiler_flags = folly_compiler_flags + ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', + 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', + 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', + 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', + 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' + ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" + ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } + end + + spec.subspec "SKIOSNetworkPlugin" do |ss| + ss.header_dir = "SKIOSNetworkPlugin" + ss.dependency 'FlipperKit/Core' + ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' + ss.compiler_flags = folly_compiler_flags + ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' + ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" + ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } + end + + spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| + ss.header_dir = "FlipperKitUserDefaultsPlugin" + ss.dependency 'FlipperKit/Core' + ss.compiler_flags = folly_compiler_flags + ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' + ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" + ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } + end + + spec.subspec "FlipperKitExamplePlugin" do |ss| + ss.header_dir = "FlipperKitExamplePlugin" + ss.dependency 'FlipperKit/Core' + ss.compiler_flags = folly_compiler_flags + ss.public_header_files = 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h' + ss.source_files = "iOS/Plugins/FlipperKitExamplePlugin/**/*.{h,mm}" + ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } + end +end diff --git a/StubPodspecs/Flipper.podspec b/StubPodspecs/Flipper.podspec deleted file mode 100644 index f6621524d4a..00000000000 --- a/StubPodspecs/Flipper.podspec +++ /dev/null @@ -1,14 +0,0 @@ -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = '0.11.1' - spec.license = { :type => 'MIT' } - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v0.11.1" } - spec.homepage = 'https://github.com/facebook/flipper' - spec.source_files = 'README.md' - spec.summary = 'Flipper iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.module_name = 'Flipper' - spec.platforms = { :ios => "8.4" } -end diff --git a/StubPodspecs/FlipperKit.podspec b/StubPodspecs/FlipperKit.podspec deleted file mode 100644 index 16444e4e666..00000000000 --- a/StubPodspecs/FlipperKit.podspec +++ /dev/null @@ -1,14 +0,0 @@ -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = '0.11.1' - spec.license = { :type => 'MIT' } - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v0.11.1" } - spec.homepage = 'https://github.com/facebook/flipper' - spec.source_files = 'README.md' - spec.summary = 'FlipperKit iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } -end diff --git a/StubPodspecs/README.md b/StubPodspecs/README.md deleted file mode 100644 index a79941d91fc..00000000000 --- a/StubPodspecs/README.md +++ /dev/null @@ -1 +0,0 @@ -These podspecs are the stubs and are solely meant to reserve the name on cocoapods repo until this [issue](https://github.com/facebook/flipper/issues/132) is solved. diff --git a/iOS/FlipperKit.podspec b/iOS/FlipperKit.podspec deleted file mode 100644 index 5f40e68b7b3..00000000000 --- a/iOS/FlipperKit.podspec +++ /dev/null @@ -1,169 +0,0 @@ -folly_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' -yoga_version = '~> 1.14' -yogakit_version = '~> 1.14' -flipperkit_version = '0.20.0' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBDefines.h is imported as - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import ) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "FKPortForwarding" do |ss| - ss.header_dir = "FKPortForwarding" - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'Flipper-PeerTalk', '~>0.0.4' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.{h,m}' - ss.private_header_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.h' - end - - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'FlipperKit/FKPortForwarding' - ss.dependency 'Flipper-Folly', '1.3.0' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h', - 'iOS/FBDefines/FBDefines.h', - 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h', - 'iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.h', - 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h' - ss.private_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKSwizzle.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKYogaKitHelper.h' - ss.source_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/**/*.{h,cpp,m,mm}' - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit', '~> 0.27' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h' - ss.source_files = "iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| - ss.header_dir = "FlipperKitUserDefaultsPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitExamplePlugin" do |ss| - ss.header_dir = "FlipperKitExamplePlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitExamplePlugin/**/*.{h,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/xplat/Flipper/Flipper.podspec b/xplat/Flipper/Flipper.podspec deleted file mode 100644 index e3b68e5748b..00000000000 --- a/xplat/Flipper/Flipper.podspec +++ /dev/null @@ -1,24 +0,0 @@ -flipperkit_version = '0.20.0' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - 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.libraries = "stdc++" - spec.dependency 'Flipper-Folly', '1.3.0' - 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 - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - 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)/Flipper-RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end