conflict fix
Showing
... | @@ -64,7 +64,7 @@ TODO: Add long description of the pod here. | ... | @@ -64,7 +64,7 @@ TODO: Add long description of the pod here. |
# s.frameworks = 'UIKit', 'MapKit' | # s.frameworks = 'UIKit', 'MapKit' | ||
# s.dependency 'AFNetworking', '~> 2.3' | # s.dependency 'AFNetworking', '~> 2.3' | ||
# s.sta | # s.sta | ||
s.vendored_frameworks = 'GMAILab/Frameworks/*.framework' | s.vendored_frameworks = 'GMAILab/Frameworks/*.framework' | ||
s.dependency 'GMBase' | s.dependency 'GMBase' | ||
s.dependency 'GMKit' | s.dependency 'GMKit' | ||
... | @@ -77,7 +77,7 @@ s.vendored_frameworks = 'GMAILab/Frameworks/*.framework' | ... | @@ -77,7 +77,7 @@ s.vendored_frameworks = 'GMAILab/Frameworks/*.framework' |
s.dependency 'GMRouter' | s.dependency 'GMRouter' | ||
s.dependency 'lottie-ios', '2.5.2' | s.dependency 'lottie-ios', '2.5.2' | ||
s.dependency 'YYText' | s.dependency 'YYText' | ||
s.dependency 'GMShareSDK', '0.2.1' | s.dependency 'GMShareSDK' | ||
s.dependency 'DouyinOpenSDK', '1.4.1' | s.dependency 'DouyinOpenSDK', '1.4.1' | ||
s.dependency 'GMBaseWeb' | s.dependency 'GMBaseWeb' | ||
... | @@ -89,13 +89,13 @@ s.vendored_frameworks = 'GMAILab/Frameworks/*.framework' | ... | @@ -89,13 +89,13 @@ s.vendored_frameworks = 'GMAILab/Frameworks/*.framework' |
s.dependency 'Qiniu' | s.dependency 'Qiniu' | ||
# s.libraries = "z", "c++", "xml2", "sqlite3" | s.libraries = "z", "c++", "xml2", "sqlite3" | ||
# s.frameworks = 'ReplayKit', 'CoreTelephony', 'SystemConfiguration' | s.frameworks = 'ReplayKit', 'CoreTelephony', 'SystemConfiguration' | ||
# s.pod_target_xcconfig = { 'VALID_ARCHS[sdk=iphonesimulator*]' => '' } | # s.pod_target_xcconfig = { 'VALID_ARCHS[sdk=iphonesimulator*]' => '' } | ||
s.dependency 'TTTRtcEngineKit_iOS' | # s.dependency 'TTTRtcEngineKit_iOS' | ||
s.dependency 'TTTPlayerKit_iOS' | # s.dependency 'TTTPlayerKit_iOS' | ||
s.static_framework = true | s.static_framework = true | ||
# s.pod_target_xcconfig = { 'VALID_ARCHS' => 'armv7' } | # s.pod_target_xcconfig = { 'VALID_ARCHS' => 'armv7' } | ||
... | ... |
File added
File added
File added
File added
Please
register
or
sign in
to comment