iOS Team / CNLiveUploadManager · Commits

Commit 44fa0bab8c9f4fc79a9508dd3adb57df4a9e0c01

Authored by 张旭
1 parent 1390f35c

0.1.27

Inline Side-by-side
Showing 4 changed files with 67 additions and 66 deletions
CNLiveUploadManager.podspec
  View file @44fa0ba
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveUploadManager'
11   - s.version = '0.1.26'
  11 + s.version = '0.1.27'
12 12 s.summary = '压缩上传,组件化中加入新参数加入outPath,不在直接取'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ... @@ -22,39 +22,26 @@ Pod::Spec.new do |s|
22 22 DESC
23 23  
24 24 s.homepage = 'http://bj.gitlab.cnlive.com/ios-team/CNLiveUploadManager'
25   - # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2'
26 25 s.license = { :type => 'MIT', :file => 'LICENSE' }
27 26 s.author = { 'jyyjkt' => 'jyyjkt@qq.com' }
28 27 s.source = { :git => 'http://bj.gitlab.cnlive.com/ios-team/CNLiveUploadManager.git', :tag => s.version.to_s }
29   - # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
30 28  
31 29 s.ios.deployment_target = '10.0'
32 30  
33 31 s.source_files = 'CNLiveUploadManager/Classes/**/*'
34 32  
35   - # s.resource_bundles = {
36   - # 'CNLiveUploadManager' => ['CNLiveUploadManager/Assets/*.png']
37   - # }
38   -
39   - # s.public_header_files = 'Pod/Classes/**/*.h'
40   -
41   - s.pod_target_xcconfig = { 'VALID_ARCHS[sdk=iphonesimulator*]' => 'CNLiveTripartiteManagement/PLShortVideoKit' }
  33 + s.pod_target_xcconfig = { 'VALID_ARCHS[sdk=iphonesimulator*]' => 'CNLiveNewTripartiteManagement/PLShortVideoKit' }
42 34  
43 35 s.frameworks = 'UIKit'
44   - s.dependency 'CNLiveTripartiteManagement/AFNetworking'
  36 + s.dependency 'CNLiveNewTripartiteManagement/AFNetworking'
45 37 s.dependency 'CNLiveRequestBastKit'
46   - s.dependency 'CNLiveTripartiteManagement/MJExtension'
47   - s.dependency 'CNLiveTripartiteManagement/YYKit'
48   - s.dependency 'CNLiveTripartiteManagement/PLShortVideoKit'
  38 + s.dependency 'CNLiveNewTripartiteManagement/MJExtension'
  39 + s.dependency 'CNLiveNewTripartiteManagement/YYKit'
  40 + s.dependency 'CNLiveNewTripartiteManagement/PLShortVideoKit'
49 41 s.dependency 'CNLiveCommonCategory'
50 42 s.dependency 'CNLiveBaseKit'
51 43 s.dependency 'CNLiveBusinessTools'
52 44 s.dependency 'CNLiveBaseTools'
53 45 s.dependency 'CNLiveUserManagement'
54   -
55   -
56   -
57   -
58   -
59 46  
60 47 end
... ...
Example/CNLiveUploadManager.xcodeproj/project.pbxproj
  View file @44fa0ba
... ... @@ -207,7 +207,7 @@
207 207 6003F586195388D20070C39A /* Sources */,
208 208 6003F587195388D20070C39A /* Frameworks */,
209 209 6003F588195388D20070C39A /* Resources */,
210   - D822F07312753F058F25C33B /* [CP] Embed Pods Frameworks */,
  210 + 0E6B770CB4ADFB49ADC97E7C /* [CP] Embed Pods Frameworks */,
211 211 );
212 212 buildRules = (
213 213 );
... ... @@ -298,51 +298,7 @@
298 298 /* End PBXResourcesBuildPhase section */
299 299  
300 300 /* Begin PBXShellScriptBuildPhase section */
301   - 7C560A8631178CC8822FC5E5 /* [CP] Check Pods Manifest.lock */ = {
302   - isa = PBXShellScriptBuildPhase;
303   - buildActionMask = 2147483647;
304   - files = (
305   - );
306   - inputFileListPaths = (
307   - );
308   - inputPaths = (
309   - "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
310   - "${PODS_ROOT}/Manifest.lock",
311   - );
312   - name = "[CP] Check Pods Manifest.lock";
313   - outputFileListPaths = (
314   - );
315   - outputPaths = (
316   - "$(DERIVED_FILE_DIR)/Pods-CNLiveUploadManager_Tests-checkManifestLockResult.txt",
317   - );
318   - runOnlyForDeploymentPostprocessing = 0;
319   - shellPath = /bin/sh;
320   - 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";
321   - showEnvVarsInLog = 0;
322   - };
323   - 911C7D4119E8161DA3F894EB /* [CP] Check Pods Manifest.lock */ = {
324   - isa = PBXShellScriptBuildPhase;
325   - buildActionMask = 2147483647;
326   - files = (
327   - );
328   - inputFileListPaths = (
329   - );
330   - inputPaths = (
331   - "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
332   - "${PODS_ROOT}/Manifest.lock",
333   - );
334   - name = "[CP] Check Pods Manifest.lock";
335   - outputFileListPaths = (
336   - );
337   - outputPaths = (
338   - "$(DERIVED_FILE_DIR)/Pods-CNLiveUploadManager_Example-checkManifestLockResult.txt",
339   - );
340   - runOnlyForDeploymentPostprocessing = 0;
341   - shellPath = /bin/sh;
342   - 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";
343   - showEnvVarsInLog = 0;
344   - };
345   - D822F07312753F058F25C33B /* [CP] Embed Pods Frameworks */ = {
  301 + 0E6B770CB4ADFB49ADC97E7C /* [CP] Embed Pods Frameworks */ = {
346 302 isa = PBXShellScriptBuildPhase;
347 303 buildActionMask = 2147483647;
348 304 files = (
... ... @@ -355,6 +311,7 @@
355 311 "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
356 312 "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
357 313 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
  314 + "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework",
358 315 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
359 316 "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
360 317 "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
... ... @@ -374,6 +331,7 @@
374 331 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
375 332 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
376 333 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
  334 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework",
377 335 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
378 336 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
379 337 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework",
... ... @@ -390,6 +348,50 @@
390 348 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveUploadManager_Example/Pods-CNLiveUploadManager_Example-frameworks.sh\"\n";
391 349 showEnvVarsInLog = 0;
392 350 };
  351 + 7C560A8631178CC8822FC5E5 /* [CP] Check Pods Manifest.lock */ = {
  352 + isa = PBXShellScriptBuildPhase;
  353 + buildActionMask = 2147483647;
  354 + files = (
  355 + );
  356 + inputFileListPaths = (
  357 + );
  358 + inputPaths = (
  359 + "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
  360 + "${PODS_ROOT}/Manifest.lock",
  361 + );
  362 + name = "[CP] Check Pods Manifest.lock";
  363 + outputFileListPaths = (
  364 + );
  365 + outputPaths = (
  366 + "$(DERIVED_FILE_DIR)/Pods-CNLiveUploadManager_Tests-checkManifestLockResult.txt",
  367 + );
  368 + runOnlyForDeploymentPostprocessing = 0;
  369 + shellPath = /bin/sh;
  370 + 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";
  371 + showEnvVarsInLog = 0;
  372 + };
  373 + 911C7D4119E8161DA3F894EB /* [CP] Check Pods Manifest.lock */ = {
  374 + isa = PBXShellScriptBuildPhase;
  375 + buildActionMask = 2147483647;
  376 + files = (
  377 + );
  378 + inputFileListPaths = (
  379 + );
  380 + inputPaths = (
  381 + "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
  382 + "${PODS_ROOT}/Manifest.lock",
  383 + );
  384 + name = "[CP] Check Pods Manifest.lock";
  385 + outputFileListPaths = (
  386 + );
  387 + outputPaths = (
  388 + "$(DERIVED_FILE_DIR)/Pods-CNLiveUploadManager_Example-checkManifestLockResult.txt",
  389 + );
  390 + runOnlyForDeploymentPostprocessing = 0;
  391 + shellPath = /bin/sh;
  392 + 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";
  393 + showEnvVarsInLog = 0;
  394 + };
393 395 /* End PBXShellScriptBuildPhase section */
394 396  
395 397 /* Begin PBXSourcesBuildPhase section */
... ...
Example/Podfile
  View file @44fa0ba
... ... @@ -4,7 +4,7 @@ use_frameworks!
4 4 source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git'
5 5 source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
6 6  
7   -platform :ios, '9.0'
  7 +platform :ios, '10.0'
8 8  
9 9 target 'CNLiveUploadManager_Example' do
10 10 pod 'CNLiveUploadManager', :path => '../'
... ...
README.md
  View file @44fa0ba
1 1 # CNLiveUploadManager
2 2  
  3 +本地验证
  4 +pod lib lint --allow-warnings --no-clean --use-libraries --skip-import-validation --sources=http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git,https://github.com/CocoaPods/Specs.git,http://bj.gitlab.cnlive.com/DSIOSTeam/DSSpecRepos.git --verbose
  5 +
  6 +本地+远程验证
  7 +pod spec lint --allow-warnings --no-clean --use-libraries --skip-import-validation --sources=http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git,https://github.com/CocoaPods/Specs.git,http://bj.gitlab.cnlive.com/DSIOSTeam/DSSpecRepos.git --verbose
  8 +
  9 +推送
  10 +pod repo push CNLiveRepos CNLiveNewTripartiteManagement.podspec --allow-warnings --use-libraries --skip-import-validation --sources=http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git,https://github.com/CocoaPods/Specs.git,http://bj.gitlab.cnlive.com/DSIOSTeam/DSSpecRepos.git --verbose
  11 +
  12 +
  13 +
  14 +
3 15 [![CI Status](https://img.shields.io/travis/jyyjkt/CNLiveUploadManager.svg?style=flat)](https://travis-ci.org/jyyjkt/CNLiveUploadManager)
4 16 [![Version](https://img.shields.io/cocoapods/v/CNLiveUploadManager.svg?style=flat)](https://cocoapods.org/pods/CNLiveUploadManager)
5 17 [![License](https://img.shields.io/cocoapods/l/CNLiveUploadManager.svg?style=flat)](https://cocoapods.org/pods/CNLiveUploadManager)
... ...