Commit 411de330af5c69b4208ec72a3888ea6109ed2cff

Authored by 梁星国
1 parent 94421f7a

提交

CNLiveAVCamera.podspec
... ... @@ -11,12 +11,6 @@ Pod::Spec.new do |s|
11 11 s.version = '0.1.1'
12 12 s.summary = '常用相机'
13 13  
14   -# This description is used to generate tags and improve search results.
15   -# * Think: What does it do? Why did you write it? What is the focus?
16   -# * Try to keep it short, snappy and to the point.
17   -# * Write the description between the DESC delimiters below.
18   -# * Finally, don't worry about the indent, CocoaPods strips it!
19   -
20 14 s.description = <<-DESC
21 15 TODO: Add long description of the pod here.
22 16 DESC
... ... @@ -32,9 +26,9 @@ TODO: Add long description of the pod here.
32 26  
33 27 s.source_files = 'CNLiveAVCamera/Classes/XFAVCamera/*.{h,m}'
34 28  
35   - s.resource_bundles = {
36   - 'CNLiveAVCamera' => ['CNLiveAVCamera/Assets/Media.xcassets']
37   - }
  29 + # s.resource_bundles = {
  30 + # 'CNLiveAVCamera' => ['CNLiveAVCamera/Assets/Media.xcassets']
  31 + #}
38 32 s.frameworks = 'UIKit', 'Photos'
39 33 s.dependency 'Masonry', '~> 1.0.2'
40 34  
... ...
Example/CNLiveAVCamera.xcodeproj/project.pbxproj
... ... @@ -226,6 +226,7 @@
226 226 6003F5AA195388D20070C39A /* Sources */,
227 227 6003F5AB195388D20070C39A /* Frameworks */,
228 228 6003F5AC195388D20070C39A /* Resources */,
  229 + E5FB82D83C5E4059CE0F5A8A /* [CP] Embed Pods Frameworks */,
229 230 );
230 231 buildRules = (
231 232 );
... ... @@ -307,13 +308,13 @@
307 308 );
308 309 inputPaths = (
309 310 "${SRCROOT}/Pods/Target Support Files/Pods-CNLiveAVCamera_Example/Pods-CNLiveAVCamera_Example-frameworks.sh",
310   - "${BUILT_PRODUCTS_DIR}/CNLiveAVCamera/CNLiveAVCamera.framework",
  311 + "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
311 312 );
312 313 name = "[CP] Embed Pods Frameworks";
313 314 outputFileListPaths = (
314 315 );
315 316 outputPaths = (
316   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveAVCamera.framework",
  317 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
317 318 );
318 319 runOnlyForDeploymentPostprocessing = 0;
319 320 shellPath = /bin/sh;
... ... @@ -364,6 +365,28 @@
364 365 shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
365 366 showEnvVarsInLog = 0;
366 367 };
  368 + E5FB82D83C5E4059CE0F5A8A /* [CP] Embed Pods Frameworks */ = {
  369 + isa = PBXShellScriptBuildPhase;
  370 + buildActionMask = 2147483647;
  371 + files = (
  372 + );
  373 + inputFileListPaths = (
  374 + );
  375 + inputPaths = (
  376 + "${SRCROOT}/Pods/Target Support Files/Pods-CNLiveAVCamera_Tests/Pods-CNLiveAVCamera_Tests-frameworks.sh",
  377 + "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
  378 + );
  379 + name = "[CP] Embed Pods Frameworks";
  380 + outputFileListPaths = (
  381 + );
  382 + outputPaths = (
  383 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
  384 + );
  385 + runOnlyForDeploymentPostprocessing = 0;
  386 + shellPath = /bin/sh;
  387 + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CNLiveAVCamera_Tests/Pods-CNLiveAVCamera_Tests-frameworks.sh\"\n";
  388 + showEnvVarsInLog = 0;
  389 + };
367 390 /* End PBXShellScriptBuildPhase section */
368 391  
369 392 /* Begin PBXSourcesBuildPhase section */
... ...
Example/Podfile
... ... @@ -10,7 +10,6 @@ target &#39;CNLiveAVCamera_Example&#39; do
10 10 inherit! :search_paths
11 11 pod 'Masonry', '~> 1.0.2'
12 12  
13   -
14 13  
15 14 end
16 15 end
... ...