Commit 95cdf5a60f730a926391e0ed70b0b1813e221778

Authored by 梁星国
1 parent 34fc12a0

提交使用pod.subspec

Showing 43 changed files with 35 additions and 13 deletions
CNLiveUploadManager.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |s| @@ -16,7 +16,7 @@ Pod::Spec.new do |s|
16 # 16 #
17 17
18 s.name = "CNLiveUploadManager" # 项目名称 18 s.name = "CNLiveUploadManager" # 项目名称
19 - s.version = "0.0.6" # 版本号 与 你仓库的标签号 对应 19 + s.version = "0.0.7" # 版本号 与 你仓库的标签号 对应
20 s.summary = "图片,视频上传" # 项目简介 20 s.summary = "图片,视频上传" # 项目简介
21 21
22 # This description is used to generate tags and improve search results. 22 # This description is used to generate tags and improve search results.
@@ -92,8 +92,38 @@ TODO:加入压缩测试 @@ -92,8 +92,38 @@ TODO:加入压缩测试
92 # Not including the public_header_files will make all headers public. 92 # Not including the public_header_files will make all headers public.
93 # 93 #
94 94
95 - s.source_files = "CNLiveUploadManager/**/*" #文件路径  
96 - s.exclude_files = "Classes/Exclude" 95 + s.subspec "util" do |ssss|
  96 + ssss.source_files = "CNLiveUploadManager/util/*.{h,m}"
  97 + ssss.frameworks = "UIKit", "Foundation"
  98 +
  99 + end
  100 +
  101 + s.subspec "ZipData" do |sss|
  102 + sss.source_files = "CNLiveUploadManager/ZipData/*.{h,m}"
  103 + sss.public_header_files = "CNLiveUploadManager/ZipData/*.h"
  104 + sss.frameworks = "UIKit", "Foundation","Photos"
  105 +
  106 + end
  107 +
  108 + # TODO: 静态库导入总是出问题
  109 + s.subspec "upload" do |ss|
  110 + ss.source_files = "CNLiveUploadManager/Upload/CNLiveUploadManager.{h,m}"
  111 + ss.public_header_files = "CNLiveUploadManager/Upload/CNLiveUploadManager.h"
  112 + ss.frameworks = "UIKit", "Foundation"
  113 + # 依赖类库
  114 + ss.dependency "AFNetworking", "~> 3.1.0"
  115 + ss.dependency "Qiniu", "~> 7.1"
  116 + # ss.dependency "PLShortVideoKit", "~> 1.13.1"
  117 + # ss.dependency "PLPlayerKit", "~> 3.3.3"
  118 +
  119 + # SDK依赖库
  120 + s.static_framework = true
  121 + s.vendored_frameworks = "CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework"
  122 + s.vendored_library = "CNLiveUploadManager/PLShortVideoSDK/libMuseProcessor.a"
  123 +
  124 + end
  125 +
  126 + #s.exclude_files = "Classes/Exclude"
97 127
98 # s.public_header_files = "Classes/**/*.h" 128 # s.public_header_files = "Classes/**/*.h"
99 129
@@ -119,7 +149,7 @@ TODO:加入压缩测试 @@ -119,7 +149,7 @@ TODO:加入压缩测试
119 # 149 #
120 150
121 # s.framework = "SomeFramework" 151 # s.framework = "SomeFramework"
122 - s.frameworks = "UIKit", "Foundation" 152 + # s.frameworks = "UIKit", "Foundation"
123 153
124 # s.library = "iconv" 154 # s.library = "iconv"
125 # s.libraries = "iconv", "xml2" 155 # s.libraries = "iconv", "xml2"
@@ -135,15 +165,7 @@ TODO:加入压缩测试 @@ -135,15 +165,7 @@ TODO:加入压缩测试
135 165
136 # s.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" } 166 # s.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" }
137 167
138 - # 依赖类库  
139 - s.dependency "AFNetworking", "~> 3.1.0"  
140 - s.dependency "Qiniu", "~> 7.1"  
141 - # s.dependency "PLShortVideoKit", "~> 1.13.1"  
142 - # s.dependency "PLPlayerKit", "~> 3.3.3"  
143 -  
144 - # SDK依赖库  
145 - s.vendored_frameworks = 'CNLiveUploadManager/PLShortVideoKit.framework'  
146 - s.vendored_library = 'CNLiveUploadManager/libMuseProcessor.a' 168 +
147 169
148 170
149 end 171 end
CNLiveUploadManager/PLShortVideoKit.framework/Headers/AVAsset+PLSExtendProperty.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/AVAsset+PLSExtendProperty.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSAVAssetExportSession.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSAVAssetExportSession.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSAudioConfiguration.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSAudioConfiguration.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSAudioMixConfiguration.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSAudioMixConfiguration.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSEditPlayer.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSEditPlayer.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSEditSettings.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSEditSettings.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSFadeTranstion.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSFadeTranstion.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSFilter.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSFilter.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSGifComposer.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSGifComposer.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSImageRotateRecorder.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSImageRotateRecorder.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSImageSetting.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSImageSetting.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSImageToMovieComposer.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSImageToMovieComposer.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSMixMediaItem.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSMixMediaItem.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSMovieComposer.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSMovieComposer.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSMultiVideoMixer.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSMultiVideoMixer.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSPositionTransition.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSPositionTransition.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSRangeMedia.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSRangeMedia.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSRangeMediaTools.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSRangeMediaTools.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSRangeMovieExport.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSRangeMovieExport.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSReverserEffect.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSReverserEffect.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSRotateTransition.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSRotateTransition.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSScaleTransition.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSScaleTransition.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSTextSetting.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSTextSetting.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSTransition.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSTransition.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSTransitionMaker.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSTransitionMaker.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSTypeDefines.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSTypeDefines.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSUploaderConfiguration.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSUploaderConfiguration.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSUploaderResponseInfo.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSUploaderResponseInfo.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSVideoConfiguration.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSVideoConfiguration.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSVideoMixConfiguration.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSVideoMixConfiguration.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLSVideoMixRecorder.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLSVideoMixRecorder.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLShortVideoAsset.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLShortVideoAsset.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLShortVideoEditor.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLShortVideoEditor.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLShortVideoKit.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLShortVideoKit.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLShortVideoKitEnv.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLShortVideoKitEnv.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLShortVideoRecorder.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLShortVideoRecorder.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLShortVideoTranscoder.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLShortVideoTranscoder.h
CNLiveUploadManager/PLShortVideoKit.framework/Headers/PLShortVideoUploader.h renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Headers/PLShortVideoUploader.h
CNLiveUploadManager/PLShortVideoKit.framework/Info.plist renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Info.plist
No preview for this file type
CNLiveUploadManager/PLShortVideoKit.framework/Modules/module.modulemap renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/Modules/module.modulemap
CNLiveUploadManager/PLShortVideoKit.framework/PLShortVideoKit renamed to CNLiveUploadManager/PLShortVideoSDK/PLShortVideoKit.framework/PLShortVideoKit
No preview for this file type
CNLiveUploadManager/libMuseProcessor.a renamed to CNLiveUploadManager/PLShortVideoSDK/libMuseProcessor.a
No preview for this file type