iOS Team / CNLiveAVCamera · Commits

Commit 94f3d216d1f91391b14f77664466f23e3e779f0e

Authored by 梁星国
1 parent 08208d66

提交

Inline Side-by-side
Showing 3 changed files with 15 additions and 19 deletions
CNLiveAVCamera.podspec
  View file @94f3d21
@@ -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 = 'CNLiveAVCamera' 10 s.name = 'CNLiveAVCamera'
11 - s.version = '0.1.2' 11 + s.version = '0.1.3'
12 s.summary = '自定义相机' 12 s.summary = '自定义相机'
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.
@@ -39,9 +39,9 @@ Pod::Spec.new do |s| @@ -39,9 +39,9 @@ Pod::Spec.new do |s|
39 39
40 # s.public_header_files = 'Pod/Classes/**/*.h' 40 # s.public_header_files = 'Pod/Classes/**/*.h'
41 s.frameworks = 'UIKit', 'Photos' 41 s.frameworks = 'UIKit', 'Photos'
42 - s.dependency 'Masonry', '~> 1.0.2'  
43 s.dependency 'CNLiveBaseKit' 42 s.dependency 'CNLiveBaseKit'
44 - s.dependency 'QMUIKit', '~> 3.1.7' 43 + s.dependency 'CNLiveTripartiteManagement/Masonry'
  44 + s.dependency 'CNLiveTripartiteManagement/QMUIKit'
45 s.dependency 'CNLiveBusinessTools' 45 s.dependency 'CNLiveBusinessTools'
46 s.dependency 'CNLiveCommonCategory' 46 s.dependency 'CNLiveCommonCategory'
47 47
Example/CNLiveAVCamera.xcodeproj/project.pbxproj
  View file @94f3d21
@@ -326,14 +326,13 @@ @@ -326,14 +326,13 @@
326 buildActionMask = 2147483647; 326 buildActionMask = 2147483647;
327 files = ( 327 files = (
328 ); 328 );
329 - inputFileListPaths = (  
330 - );  
331 inputPaths = ( 329 inputPaths = (
332 - "${SRCROOT}/Pods/Target Support Files/Pods-CNLiveAVCamera_Example/Pods-CNLiveAVCamera_Example-frameworks.sh", 330 + "${PODS_ROOT}/Target Support Files/Pods-CNLiveAVCamera_Example/Pods-CNLiveAVCamera_Example-frameworks.sh",
333 "${BUILT_PRODUCTS_DIR}/CNLiveAVCamera/CNLiveAVCamera.framework", 331 "${BUILT_PRODUCTS_DIR}/CNLiveAVCamera/CNLiveAVCamera.framework",
334 "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework", 332 "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
335 "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework", 333 "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
336 "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework", 334 "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
  335 + "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
337 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", 336 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
338 "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", 337 "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
339 "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework", 338 "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
@@ -341,13 +340,12 @@ @@ -341,13 +340,12 @@
341 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", 340 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
342 ); 341 );
343 name = "[CP] Embed Pods Frameworks"; 342 name = "[CP] Embed Pods Frameworks";
344 - outputFileListPaths = (  
345 - );  
346 outputPaths = ( 343 outputPaths = (
347 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveAVCamera.framework", 344 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveAVCamera.framework",
348 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework", 345 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
349 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework", 346 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
350 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework", 347 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
  348 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
351 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", 349 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
352 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", 350 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
353 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework", 351 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
@@ -356,7 +354,7 @@ @@ -356,7 +354,7 @@
356 ); 354 );
357 runOnlyForDeploymentPostprocessing = 0; 355 runOnlyForDeploymentPostprocessing = 0;
358 shellPath = /bin/sh; 356 shellPath = /bin/sh;
359 - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CNLiveAVCamera_Example/Pods-CNLiveAVCamera_Example-frameworks.sh\"\n"; 357 + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveAVCamera_Example/Pods-CNLiveAVCamera_Example-frameworks.sh\"\n";
360 showEnvVarsInLog = 0; 358 showEnvVarsInLog = 0;
361 }; 359 };
362 9080C32D0AD68113F8131D42 /* [CP] Embed Pods Frameworks */ = { 360 9080C32D0AD68113F8131D42 /* [CP] Embed Pods Frameworks */ = {
@@ -364,13 +362,12 @@ @@ -364,13 +362,12 @@
364 buildActionMask = 2147483647; 362 buildActionMask = 2147483647;
365 files = ( 363 files = (
366 ); 364 );
367 - inputFileListPaths = (  
368 - );  
369 inputPaths = ( 365 inputPaths = (
370 - "${SRCROOT}/Pods/Target Support Files/Pods-CNLiveAVCamera_Tests/Pods-CNLiveAVCamera_Tests-frameworks.sh", 366 + "${PODS_ROOT}/Target Support Files/Pods-CNLiveAVCamera_Tests/Pods-CNLiveAVCamera_Tests-frameworks.sh",
371 "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework", 367 "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
372 "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework", 368 "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
373 "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework", 369 "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
  370 + "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
374 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", 371 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
375 "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", 372 "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
376 "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework", 373 "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
@@ -378,12 +375,11 @@ @@ -378,12 +375,11 @@
378 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", 375 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
379 ); 376 );
380 name = "[CP] Embed Pods Frameworks"; 377 name = "[CP] Embed Pods Frameworks";
381 - outputFileListPaths = (  
382 - );  
383 outputPaths = ( 378 outputPaths = (
384 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework", 379 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
385 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework", 380 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
386 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework", 381 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
  382 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
387 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", 383 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
388 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", 384 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
389 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework", 385 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
@@ -392,7 +388,7 @@ @@ -392,7 +388,7 @@
392 ); 388 );
393 runOnlyForDeploymentPostprocessing = 0; 389 runOnlyForDeploymentPostprocessing = 0;
394 shellPath = /bin/sh; 390 shellPath = /bin/sh;
395 - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CNLiveAVCamera_Tests/Pods-CNLiveAVCamera_Tests-frameworks.sh\"\n"; 391 + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveAVCamera_Tests/Pods-CNLiveAVCamera_Tests-frameworks.sh\"\n";
396 showEnvVarsInLog = 0; 392 showEnvVarsInLog = 0;
397 }; 393 };
398 CFC16709BBBEA2470565BEAB /* [CP] Check Pods Manifest.lock */ = { 394 CFC16709BBBEA2470565BEAB /* [CP] Check Pods Manifest.lock */ = {
Example/Podfile
  View file @94f3d21
@@ -8,18 +8,18 @@ platform :ios, '9.0' @@ -8,18 +8,18 @@ platform :ios, '9.0'
8 target 'CNLiveAVCamera_Example' do 8 target 'CNLiveAVCamera_Example' do
9 pod 'CNLiveAVCamera', :path => '../' 9 pod 'CNLiveAVCamera', :path => '../'
10 10
11 - pod 'Masonry', '~> 1.0.2' 11 + pod 'CNLiveTripartiteManagement/Masonry'
12 pod 'CNLiveBaseKit' 12 pod 'CNLiveBaseKit'
13 - pod 'QMUIKit','~> 3.1.7' 13 + pod 'CNLiveTripartiteManagement/QMUIKit'
14 pod 'CNLiveBusinessTools' 14 pod 'CNLiveBusinessTools'
15 pod 'CNLiveCommonCategory' 15 pod 'CNLiveCommonCategory'
16 16
17 target 'CNLiveAVCamera_Tests' do 17 target 'CNLiveAVCamera_Tests' do
18 inherit! :search_paths 18 inherit! :search_paths
19 19
20 - pod 'Masonry', '~> 1.0.2' 20 + pod 'CNLiveTripartiteManagement/Masonry'
21 pod 'CNLiveBaseKit' 21 pod 'CNLiveBaseKit'
22 - pod 'QMUIKit','~> 3.1.7' 22 + pod 'CNLiveTripartiteManagement/QMUIKit'
23 pod 'CNLiveBusinessTools' 23 pod 'CNLiveBusinessTools'
24 pod 'CNLiveCommonCategory' 24 pod 'CNLiveCommonCategory'
25 25