Commit b3ba9fff5657acaf0a7c26498c77408574ec3556

Authored by daojian
1 parent db633d04

0.0.5 版本 Xcode 13 适配

CNLiveBUserAgreement.podspec
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveBUserAgreement' 10 s.name = 'CNLiveBUserAgreement'
11 - s.version = '0.0.4' 11 + s.version = '0.0.5'
12 s.summary = 'CNLiveBUserAgreement.' 12 s.summary = 'CNLiveBUserAgreement.'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
@@ -28,7 +28,7 @@ TODO: 网家家企业端-用户协议. @@ -28,7 +28,7 @@ TODO: 网家家企业端-用户协议.
28 s.source = { :git => 'http://bj.gitlab.cnlive.com/ios-team/CNLiveBUserAgreement.git', :tag => s.version.to_s } 28 s.source = { :git => 'http://bj.gitlab.cnlive.com/ios-team/CNLiveBUserAgreement.git', :tag => s.version.to_s }
29 # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>' 29 # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
30 30
31 - s.ios.deployment_target = '9.0' 31 + s.ios.deployment_target = '10.0'
32 32
33 s.source_files = 'CNLiveBUserAgreement/Classes/**/*' 33 s.source_files = 'CNLiveBUserAgreement/Classes/**/*'
34 34
@@ -38,7 +38,7 @@ TODO: 网家家企业端-用户协议. @@ -38,7 +38,7 @@ TODO: 网家家企业端-用户协议.
38 38
39 s.public_header_files = 'CNLiveBUserAgreement/Classes/**/*.h' 39 s.public_header_files = 'CNLiveBUserAgreement/Classes/**/*.h'
40 # s.frameworks = 'UIKit', 'MapKit' 40 # s.frameworks = 'UIKit', 'MapKit'
41 - s.dependency 'CNLiveTripartiteManagement/AFNetworking' 41 + s.dependency 'CNLiveNewTripartiteManagement/AFNetworking'
42 42
43 # 数据请求 43 # 数据请求
44 s.dependency 'CNLiveRequestBastKit' 44 s.dependency 'CNLiveRequestBastKit'
CNLiveBUserAgreement/Classes/CNLiveUserAgreementController.m
@@ -14,8 +14,8 @@ @@ -14,8 +14,8 @@
14 14
15 #import <AVFoundation/AVCaptureDevice.h> 15 #import <AVFoundation/AVCaptureDevice.h>
16 #import <AVFoundation/AVMediaFormat.h> 16 #import <AVFoundation/AVMediaFormat.h>
17 -#import "XFCameraController.h"  
18 -#import "TZImagePickerController.h" 17 +#import <CNLiveAVCamera/XFCameraController.h>
  18 +#import <CNLiveImagePickerController/TZImagePickerController.h>
19 #import <CNLiveRequestBastKit/CNLiveNetworking.h> 19 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
20 #import "CNLiveManager.h" 20 #import "CNLiveManager.h"
21 #import "CNLiveEnvironment.h" 21 #import "CNLiveEnvironment.h"
Example/CNLiveBUserAgreement.xcodeproj/project.pbxproj
@@ -207,8 +207,8 @@ @@ -207,8 +207,8 @@
207 6003F586195388D20070C39A /* Sources */, 207 6003F586195388D20070C39A /* Sources */,
208 6003F587195388D20070C39A /* Frameworks */, 208 6003F587195388D20070C39A /* Frameworks */,
209 6003F588195388D20070C39A /* Resources */, 209 6003F588195388D20070C39A /* Resources */,
210 - 570977C65A1DFAAA9C5638F0 /* [CP] Embed Pods Frameworks */,  
211 D4F1D34CD77503C77B90F598 /* [CP] Copy Pods Resources */, 210 D4F1D34CD77503C77B90F598 /* [CP] Copy Pods Resources */,
  211 + 52613F632CDACE17B9C60C15 /* [CP] Embed Pods Frameworks */,
212 ); 212 );
213 buildRules = ( 213 buildRules = (
214 ); 214 );
@@ -299,7 +299,7 @@ @@ -299,7 +299,7 @@
299 /* End PBXResourcesBuildPhase section */ 299 /* End PBXResourcesBuildPhase section */
300 300
301 /* Begin PBXShellScriptBuildPhase section */ 301 /* Begin PBXShellScriptBuildPhase section */
302 - 570977C65A1DFAAA9C5638F0 /* [CP] Embed Pods Frameworks */ = { 302 + 52613F632CDACE17B9C60C15 /* [CP] Embed Pods Frameworks */ = {
303 isa = PBXShellScriptBuildPhase; 303 isa = PBXShellScriptBuildPhase;
304 buildActionMask = 2147483647; 304 buildActionMask = 2147483647;
305 files = ( 305 files = (
@@ -318,8 +318,8 @@ @@ -318,8 +318,8 @@
318 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", 318 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
319 "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework", 319 "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
320 "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework", 320 "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework",
  321 + "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework",
321 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", 322 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
322 - "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",  
323 "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework", 323 "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
324 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", 324 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
325 "${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework", 325 "${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
@@ -328,9 +328,15 @@ @@ -328,9 +328,15 @@
328 "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework", 328 "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
329 "${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework", 329 "${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework",
330 "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework", 330 "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework",
331 - "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",  
332 "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework", 331 "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework",
333 - "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework", 332 + "${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework",
  333 + "${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework",
  334 + "${BUILT_PRODUCTS_DIR}/YYCategories/YYCategories.framework",
  335 + "${BUILT_PRODUCTS_DIR}/YYDispatchQueuePool/YYDispatchQueuePool.framework",
  336 + "${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
  337 + "${BUILT_PRODUCTS_DIR}/YYModel/YYModel.framework",
  338 + "${BUILT_PRODUCTS_DIR}/YYText/YYText.framework",
  339 + "${BUILT_PRODUCTS_DIR}/YYWebImage/YYWebImage.framework",
334 ); 340 );
335 name = "[CP] Embed Pods Frameworks"; 341 name = "[CP] Embed Pods Frameworks";
336 outputPaths = ( 342 outputPaths = (
@@ -346,8 +352,8 @@ @@ -346,8 +352,8 @@
346 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", 352 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
347 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework", 353 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
348 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework", 354 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework",
  355 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework",
349 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", 356 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
350 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",  
351 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework", 357 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework",
352 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", 358 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
353 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework", 359 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
@@ -356,9 +362,15 @@ @@ -356,9 +362,15 @@
356 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework", 362 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
357 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework", 363 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework",
358 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework", 364 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework",
359 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",  
360 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework", 365 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework",
361 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework", 366 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework",
  367 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework",
  368 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCategories.framework",
  369 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYDispatchQueuePool.framework",
  370 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
  371 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYModel.framework",
  372 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYText.framework",
  373 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYWebImage.framework",
362 ); 374 );
363 runOnlyForDeploymentPostprocessing = 0; 375 runOnlyForDeploymentPostprocessing = 0;
364 shellPath = /bin/sh; 376 shellPath = /bin/sh;
Example/Podfile
1 -source 'https://github.com/CocoaPods/Specs.git' 1 +#source 'https://github.com/CocoaPods/Specs.git'
  2 +source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
2 source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git' 3 source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git'
3 use_frameworks! 4 use_frameworks!
4 5
5 -platform :ios, '9.0' 6 +platform :ios, '10.0'
6 target 'CNLiveBUserAgreement_Example' do 7 target 'CNLiveBUserAgreement_Example' do
7 pod 'CNLiveBUserAgreement', :path => '../' 8 pod 'CNLiveBUserAgreement', :path => '../'
8 #依赖三方私有库,如果里面有.a的时候加上这个 9 #依赖三方私有库,如果里面有.a的时候加上这个
README.md
@@ -27,3 +27,6 @@ iOS-Xiaowen, 153993236@qq.com @@ -27,3 +27,6 @@ iOS-Xiaowen, 153993236@qq.com
27 ## License 27 ## License
28 28
29 CNLiveBUserAgreement is available under the MIT license. See the LICENSE file for more info. 29 CNLiveBUserAgreement is available under the MIT license. See the LICENSE file for more info.
  30 +## 推送
  31 +pod repo push CNLiveRepos CNLiveBUserAgreement.podspec --verbose --use-libraries --skip-import-validation --allow-warnings
  32 +