Skip to content
This repository was archived by the owner on Nov 22, 2024. It is now read-only.

Commit d2708d4

Browse files
priteshrnandgaonkarfacebook-github-bot
priteshrnandgaonkar
authored and
facebook-github-bot
committed
Release 0.6.15 with a fix which broke the release
Summary: Release 0.6.15 Reviewed By: danielbuechele Differential Revision: D9117554 fbshipit-source-id: 1096705c8d9b25c36df4b824d70c0c49fd6c50af
1 parent a5585aa commit d2708d4

File tree

5 files changed

+155
-3
lines changed

5 files changed

+155
-3
lines changed

‎Specs/Sonar/0.6.15/Sonar.podspec

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
sonarkit_version = '0.6.15'
2+
Pod::Spec.new do |spec|
3+
spec.name = 'Sonar'
4+
spec.version = sonarkit_version
5+
spec.license = { :type => 'MIT' }
6+
spec.homepage = 'https://github.com/facebook/sonar'
7+
spec.summary = 'SonarKit core cpp code with network implementation'
8+
spec.authors = 'Facebook'
9+
spec.source = { :git => 'https://github.com/facebook/Sonar.git',
10+
:tag => 'v'+sonarkit_version }
11+
spec.module_name = 'Sonar'
12+
spec.public_header_files = 'xplat/Sonar/*.h'
13+
spec.source_files = 'xplat/Sonar/*.{h,cpp,m,mm}'
14+
spec.libraries = "stdc++"
15+
spec.dependency 'Folly', '~>1.0'
16+
spec.dependency 'RSocket', '~>0.10'
17+
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
18+
-std=c++14
19+
-Wno-global-constructors'
20+
spec.platforms = { :ios => "8.0" }
21+
spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
22+
"CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
23+
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" }
24+
end

‎Specs/SonarKit/0.6.15/SonarKit.podspec

+128
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
folly_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'
2+
yoga_version = '~> 1.9'
3+
yogakit_version = '~>1.8'
4+
sonarkit_version = '0.6.15'
5+
Pod::Spec.new do |spec|
6+
spec.name = 'SonarKit'
7+
spec.version = sonarkit_version
8+
spec.license = { :type => 'MIT' }
9+
spec.homepage = 'https://github.com/facebook/Sonar'
10+
spec.summary = 'Sonar iOS podspec'
11+
spec.authors = 'Facebook'
12+
spec.static_framework = true
13+
spec.source = { :git => 'https://github.com/facebook/Sonar.git',
14+
:tag=> "v"+sonarkit_version }
15+
spec.module_name = 'SonarKit'
16+
spec.platforms = { :ios => "8.4" }
17+
spec.default_subspecs = "Core"
18+
19+
# This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h>
20+
# inside SKMacros.h, which is a public header file. Defining this directory as a
21+
# subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't
22+
# generally (you would need to import <SonarKit/FBDefines/FBMacros.h>)
23+
spec.subspec 'FBDefines' do |ss|
24+
ss.header_dir = 'FBDefines'
25+
ss.compiler_flags = folly_compiler_flags
26+
ss.source_files = 'iOS/FBDefines/**/*.h'
27+
ss.public_header_files = 'iOS/FBDefines/**/*.h'
28+
end
29+
30+
spec.subspec 'CppBridge' do |ss|
31+
ss.header_dir = 'CppBridge'
32+
ss.compiler_flags = folly_compiler_flags
33+
ss.source_files = 'iOS/SonarKit/CppBridge/**/*.{h,mm}'
34+
# We set these files as private headers since they only need to be accessed
35+
# by other SonarKit source files
36+
ss.private_header_files = 'iOS/SonarKit/CppBridge/**/*.h'
37+
ss.preserve_path = 'SonarKit/CppBridge/**/*.h'
38+
end
39+
40+
spec.subspec 'FBCxxUtils' do |ss|
41+
ss.header_dir = 'FBCxxUtils'
42+
ss.compiler_flags = folly_compiler_flags
43+
ss.source_files = 'iOS/SonarKit/FBCxxUtils/**/*.{h,mm}'
44+
# We set these files as private headers since they only need to be accessed
45+
# by other SonarKit source files
46+
ss.private_header_files = 'iOS/SonarKit/FBCxxUtils/**/*.h'
47+
end
48+
49+
spec.subspec "Core" do |ss|
50+
ss.dependency 'SonarKit/FBDefines'
51+
ss.dependency 'SonarKit/FBCxxUtils'
52+
ss.dependency 'SonarKit/CppBridge'
53+
ss.dependency 'Folly', '~>1.0'
54+
ss.dependency 'Sonar', '~>'+sonarkit_version
55+
ss.dependency 'CocoaAsyncSocket', '~> 7.6'
56+
ss.dependency 'PeerTalk', '~>0.0.2'
57+
ss.dependency 'OpenSSL-Static', '1.0.2.c1'
58+
ss.compiler_flags = folly_compiler_flags
59+
ss.source_files = 'iOS/SonarKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/SonarKit/CppBridge/*.{h,mm}', 'iOS/SonarKit/FBCxxUtils/*.{h,mm}', 'iOS/SonarKit/Utilities/**/*.{h,m}', 'iOS/SonarKit/*.{h,m,mm}'
60+
ss.public_header_files = 'iOS/SonarKit/**/{SonarClient,SonarPlugin,SonarConnection,SonarResponder,SKMacros}.h'
61+
header_search_paths = "\"$(PODS_ROOT)/SonarKit/iOS/SonarKit\" \"$(PODS_ROOT)\"/Headers/Private/SonarKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\""
62+
ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
63+
"DEFINES_MODULE" => "YES",
64+
"HEADER_SEARCH_PATHS" => header_search_paths }
65+
end
66+
67+
spec.subspec "SonarKitLayoutPlugin" do |ss|
68+
ss.header_dir = "SonarKitLayoutPlugin"
69+
ss.dependency 'SonarKit/Core'
70+
ss.dependency 'Yoga', yoga_version
71+
ss.dependency 'YogaKit', yogakit_version
72+
ss.compiler_flags = folly_compiler_flags
73+
ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h',
74+
'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTouch.h',
75+
'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKDescriptorMapper.h',
76+
'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNodeDescriptor.h',
77+
'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKInvalidation.h',
78+
'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNamed.h',
79+
'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTapListener.h',
80+
'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKObject.h',
81+
'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKHighlightOverlay.h',
82+
'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIColor+SKSonarValueCoder.h',
83+
'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKObjectHash.h',
84+
'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKSwizzle.h',
85+
'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKYogaKitHelper.h'
86+
ss.source_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/**/*.{h,cpp,m,mm}'
87+
end
88+
89+
spec.subspec "SonarKitLayoutComponentKitSupport" do |ss|
90+
ss.header_dir = "SonarKitLayoutComponentKitSupport"
91+
ss.dependency 'SonarKit/Core'
92+
ss.dependency 'Yoga', yoga_version
93+
ss.dependency 'ComponentKit'
94+
ss.dependency 'SonarKit/SonarKitLayoutPlugin'
95+
ss.compiler_flags = folly_compiler_flags
96+
ss.dependency 'SonarKit/SonarKitLayoutPlugin'
97+
ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h',
98+
'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h'
99+
100+
ss.source_files = "iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}"
101+
ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
102+
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" }
103+
end
104+
105+
spec.subspec "SonarKitNetworkPlugin" do |ss|
106+
ss.header_dir = "SonarKitNetworkPlugin"
107+
ss.dependency 'SonarKit/Core'
108+
ss.compiler_flags = folly_compiler_flags
109+
ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h',
110+
'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h',
111+
'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKDispatchQueue.h',
112+
'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKNetworkReporter.h'
113+
ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/*.{h,cpp,m,mm}"
114+
ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
115+
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" }
116+
end
117+
118+
spec.subspec "SKIOSNetworkPlugin" do |ss|
119+
ss.header_dir = "SKIOSNetworkPlugin"
120+
ss.dependency 'SonarKit/Core'
121+
ss.dependency 'SonarKit/SonarKitNetworkPlugin'
122+
ss.compiler_flags = folly_compiler_flags
123+
ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h'
124+
ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}"
125+
ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
126+
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" }
127+
end
128+
end

‎iOS/Sample/Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ project 'Sample.xcodeproj'
22
source 'https://github.com/facebook/Sonar.git'
33
source 'https://github.com/CocoaPods/Specs'
44
swift_version = "4.1"
5-
sonarkit_version = '0.6.14'
5+
sonarkit_version = '0.6.15'
66

77
target 'Sample' do
88
pod 'SonarKit', '~>'+sonarkit_version

‎iOS/SonarKit.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
folly_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'
22
yoga_version = '~> 1.9'
33
yogakit_version = '~>1.8'
4-
sonarkit_version = '0.6.14'
4+
sonarkit_version = '0.6.15'
55
Pod::Spec.new do |spec|
66
spec.name = 'SonarKit'
77
spec.version = sonarkit_version

‎xplat/Sonar/Sonar.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
sonarkit_version = '0.6.14'
1+
sonarkit_version = '0.6.15'
22
Pod::Spec.new do |spec|
33
spec.name = 'Sonar'
44
spec.version = sonarkit_version

0 commit comments

Comments
 (0)