iOS Team / CNLiveBusinessTools · Commits

Commit 325377028de1cf89c1c2fee00183b5629055809a

Authored by 张旭
1 parent f3d37f10

0.1.25

Inline Side-by-side
Showing 3 changed files with 43 additions and 47 deletions
CNLiveBusinessTools.podspec
  View file @3253770
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveBusinessTools'
11   - s.version = '0.1.24'
  11 + s.version = '0.1.25'
12 12 s.summary = '业务工具集合组件.'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ... @@ -22,29 +22,23 @@ Pod::Spec.new do |s|
22 22 DESC
23 23  
24 24 s.homepage = 'http://bj.gitlab.cnlive.com/ios-team/CNLiveBusinessTools.git'
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 = { '郭瑞朋' => 'guoruipeng@cnlive.com' }
28 27 s.source = { :git => 'http://bj.gitlab.cnlive.com/ios-team/CNLiveBusinessTools.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 = 'CNLiveBusinessTools/Classes/**/*'
34 32  
35   - # s.resource_bun/Users/open/CNLiveBaseKit/CNLiveBaseKit.podspecdles = {
36   - # 'CNLiveBusinessTools' => ['CNLiveBusinessTools/Assets/*.png']
37   - # }
38 33 s.resource_bundles = {
39 34 'CNLiveBusinessTools' => ['CNLiveBusinessTools/Assets/*.bundle']
40 35 }
41 36  
42   - # s.public_header_files = 'Pod/Classes/**/*.h'
43 37 s.frameworks = 'UIKit', 'MapKit','Photos'
44 38 s.dependency 'CNLiveEnvironment'
45 39 s.dependency 'CNLiveUserManagement'
46 40 s.dependency 'CNLiveBaseKit'
47 41 s.dependency 'CNLiveRequestBastKit'
48   - s.dependency 'CNLiveTripartiteManagement/QMUIKit'
49   - s.dependency 'CNLiveTripartiteManagement/YYKit'
  42 + s.dependency 'CNLiveNewTripartiteManagement/QMUIKit'
  43 + s.dependency 'CNLiveNewTripartiteManagement/YYKit'
50 44 end
... ...
Example/CNLiveBusinessTools.xcodeproj/project.pbxproj 100755 → 100644
  View file @3253770
... ... @@ -207,7 +207,7 @@
207 207 6003F586195388D20070C39A /* Sources */,
208 208 6003F587195388D20070C39A /* Frameworks */,
209 209 6003F588195388D20070C39A /* Resources */,
210   - FB47CD5550AF5CBC50CAF8AB /* [CP] Embed Pods Frameworks */,
  210 + 5116E172A05050C84C2BB94B /* [CP] Embed Pods Frameworks */,
211 211 );
212 212 buildRules = (
213 213 );
... ... @@ -297,29 +297,45 @@
297 297 /* End PBXResourcesBuildPhase section */
298 298  
299 299 /* Begin PBXShellScriptBuildPhase section */
300   - 8EC89BB3E783A11E7E4DEB0B /* [CP] Check Pods Manifest.lock */ = {
  300 + 5116E172A05050C84C2BB94B /* [CP] Embed Pods Frameworks */ = {
301 301 isa = PBXShellScriptBuildPhase;
302 302 buildActionMask = 2147483647;
303 303 files = (
304 304 );
305   - inputFileListPaths = (
306   - );
307 305 inputPaths = (
308   - "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
309   - "${PODS_ROOT}/Manifest.lock",
310   - );
311   - name = "[CP] Check Pods Manifest.lock";
312   - outputFileListPaths = (
  306 + "${PODS_ROOT}/Target Support Files/Pods-CNLiveBusinessTools_Example/Pods-CNLiveBusinessTools_Example-frameworks.sh",
  307 + "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
  308 + "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
  309 + "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
  310 + "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
  311 + "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework",
  312 + "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
  313 + "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
  314 + "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
  315 + "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
  316 + "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
  317 + "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
313 318 );
  319 + name = "[CP] Embed Pods Frameworks";
314 320 outputPaths = (
315   - "$(DERIVED_FILE_DIR)/Pods-CNLiveBusinessTools_Tests-checkManifestLockResult.txt",
  321 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
  322 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
  323 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
  324 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
  325 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework",
  326 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
  327 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
  328 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
  329 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
  330 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
  331 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
316 332 );
317 333 runOnlyForDeploymentPostprocessing = 0;
318 334 shellPath = /bin/sh;
319   - 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";
  335 + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBusinessTools_Example/Pods-CNLiveBusinessTools_Example-frameworks.sh\"\n";
320 336 showEnvVarsInLog = 0;
321 337 };
322   - E8231C3E5CBA7CDBED05E71D /* [CP] Check Pods Manifest.lock */ = {
  338 + 8EC89BB3E783A11E7E4DEB0B /* [CP] Check Pods Manifest.lock */ = {
323 339 isa = PBXShellScriptBuildPhase;
324 340 buildActionMask = 2147483647;
325 341 files = (
... ... @@ -334,47 +350,33 @@
334 350 outputFileListPaths = (
335 351 );
336 352 outputPaths = (
337   - "$(DERIVED_FILE_DIR)/Pods-CNLiveBusinessTools_Example-checkManifestLockResult.txt",
  353 + "$(DERIVED_FILE_DIR)/Pods-CNLiveBusinessTools_Tests-checkManifestLockResult.txt",
338 354 );
339 355 runOnlyForDeploymentPostprocessing = 0;
340 356 shellPath = /bin/sh;
341 357 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";
342 358 showEnvVarsInLog = 0;
343 359 };
344   - FB47CD5550AF5CBC50CAF8AB /* [CP] Embed Pods Frameworks */ = {
  360 + E8231C3E5CBA7CDBED05E71D /* [CP] Check Pods Manifest.lock */ = {
345 361 isa = PBXShellScriptBuildPhase;
346 362 buildActionMask = 2147483647;
347 363 files = (
348 364 );
  365 + inputFileListPaths = (
  366 + );
349 367 inputPaths = (
350   - "${PODS_ROOT}/Target Support Files/Pods-CNLiveBusinessTools_Example/Pods-CNLiveBusinessTools_Example-frameworks.sh",
351   - "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
352   - "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
353   - "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
354   - "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
355   - "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
356   - "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
357   - "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
358   - "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
359   - "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
360   - "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
  368 + "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
  369 + "${PODS_ROOT}/Manifest.lock",
  370 + );
  371 + name = "[CP] Check Pods Manifest.lock";
  372 + outputFileListPaths = (
361 373 );
362   - name = "[CP] Embed Pods Frameworks";
363 374 outputPaths = (
364   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
365   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
366   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
367   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
368   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
369   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
370   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
371   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
372   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
373   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
  375 + "$(DERIVED_FILE_DIR)/Pods-CNLiveBusinessTools_Example-checkManifestLockResult.txt",
374 376 );
375 377 runOnlyForDeploymentPostprocessing = 0;
376 378 shellPath = /bin/sh;
377   - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBusinessTools_Example/Pods-CNLiveBusinessTools_Example-frameworks.sh\"\n";
  379 + 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";
378 380 showEnvVarsInLog = 0;
379 381 };
380 382 /* End PBXShellScriptBuildPhase section */
... ...
Example/Podfile
  View file @3253770
... ... @@ -4,7 +4,7 @@ source &#39;https://github.com/CocoaPods/Specs.git&#39;
4 4  
5 5 use_frameworks!
6 6  
7   -platform :ios, '9.0'
  7 +platform :ios, '10.0'
8 8  
9 9 target 'CNLiveBusinessTools_Example' do
10 10 pod 'CNLiveBusinessTools', :path => '../'
... ...