diff --git a/HelloUniMPDemo/Podfile b/HelloUniMPDemo/Podfile index cf2bca18fd70e1fd41146e302d0e8e79bc00d28d..bc94f2617f1699c4b4912dbff2c7a17a76701f52 100644 --- a/HelloUniMPDemo/Podfile +++ b/HelloUniMPDemo/Podfile @@ -1,7 +1,7 @@ #source 'https://gitee.com/mirrors/CocoaPods-Specs.git' -source 'https://github.com/Cocoapods/Specs.git' -source 'https://gitcode.net/dcloud/unimpsdk-ios.git' - +#source 'https://github.com/Cocoapods/Specs.git' +#source 'https://gitcode.net/dcloud/unimpsdk-ios.git' +#source 'https://cdn.cocoapods.org/' target 'HelloUniMPDemo' do @@ -33,33 +33,40 @@ target 'HelloUniMPDemo' do # 'BlueTooth', ##蓝牙 # 'Speech-Baidu', ##语音识别-百度 # 'Statistic-Umeng', ##友盟统计 -# ##定位模块(百度高德不能同时引用) -# 'Geolocation', ##系统定位 -# 'Geolocation-Gaode', ##高德定位 + ##定位模块(百度高德不能同时引用) + 'Geolocation', ##系统定位 + 'Geolocation-Gaode', ##高德定位 # 'Geolocation-Baidu', ##百度定位 -# ##地图(二选一) -# 'Map-Gaode', ##高德地图 + ##地图(二选一) + 'Map-Gaode', ##高德地图 # 'Map-Baidu', ##百度地图 -# ##支付 + ##支付 # 'Payment-IAP', ##苹果内购 # 'Payment-AliPay', ##支付宝支付 # 'Payment-Wechat', ##微信支付-同时使用微信分享或登录,必需使用包含支付的依赖库 -# 'Payment-Paypal', ##Paypal支付 iOS13+ -# 'Payment-Stripe', ##stripe支付 iOS13+ 依赖库较大如果超时建议使用代理 -# ##分享 + 'Payment-Paypal', ##Paypal支付 iOS13+ + 'Payment-Stripe', ##stripe支付 iOS13+ 依赖库较大如果超时建议使用代理 + ##分享 # 'Share-Wechat', ##微信分享-包含支付 # 'Share-Wechat-Nopay', ##微信分享-不包含支付 # 'Share-QQ', ##QQ分享 # 'Share-Sina', ##新浪微博分享 -# ##登录 + ##登录 # 'Oauth-Apple', ##苹果登录 # 'Oauth-QQ', ##QQ登录 # 'Oauth-Wechat', ##微信登录-包含支付 # 'Oauth-Wechat-Nopay', ##微信登录-不包含支付 # 'Oauth-Sina', ##新浪微博登录 # 'Oauth-Google', ##Google登录 -# 'Oauth-Facebook', ##Facebook登录 iOS12+ + 'Oauth-Facebook', ##Facebook登录 iOS12+ ] + + pod 'FBSDKLoginKit','16.2.1' ##使用Oauth-Facebook 时需单独添加 + + pod 'Stripe','23.18.2' ##使用Payment-Stripe 时需添加该依赖 + + pod 'PayPalCheckout','1.2.0' ##使用Payment-Paypal 时需添加该依赖 + end diff --git a/UniMPSDK/Constacts/Libs/liblibContacts.a b/UniMPSDK/Constacts/Libs/liblibContacts.a deleted file mode 100644 index a1fe2ca3c4bc44f85c59cd652e2b65bb1baccbe1..0000000000000000000000000000000000000000 --- a/UniMPSDK/Constacts/Libs/liblibContacts.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c8e1393edf80d0934df27c651e73d8b3014dd105770cba5f212b07b20aa86686 -size 372512 diff --git a/UniMPSDK/Contacts/Libs/liblibContacts.a b/UniMPSDK/Contacts/Libs/liblibContacts.a new file mode 100644 index 0000000000000000000000000000000000000000..874571ed527f4e5a70803322b63c054520b1e396 Binary files /dev/null and b/UniMPSDK/Contacts/Libs/liblibContacts.a differ diff --git a/unimp.podspec b/unimp.podspec index ba326b589064b3ee57e10899b411c7a5f565abe2..d08c0452d31c85bd6407ac39febfd50deaab33a3 100644 --- a/unimp.podspec +++ b/unimp.podspec @@ -230,13 +230,13 @@ Pod::Spec.new do |s| s.subspec 'Payment-Paypal' do |ss| ss.vendored_libraries = 'UniMPSDK/Payment/Paypal/Libs/*.{a}' - ss.dependency 'PayPalCheckout','1.2.0' + # ss.dependency 'PayPalCheckout','1.2.0' ss.dependency 'unimp/Payment' end s.subspec 'Payment-Stripe' do |ss| ss.vendored_libraries = 'UniMPSDK/Payment/Stripe/Libs/*.{a}' - ss.dependency 'Stripe','23.18.2' + # ss.dependency 'Stripe','23.18.2' ss.dependency 'unimp/Payment' end @@ -315,7 +315,7 @@ Pod::Spec.new do |s| s.subspec 'Oauth-Facebook' do |ss| ss.vendored_libraries = 'UniMPSDK/Oauth/Facebook/Libs/*.{a}' - ss.dependency 'FBSDKLoginKit','16.2.1' + # ss.dependency 'FBSDKLoginKit','16.2.1' ss.dependency 'unimp/Oauth' end