diff --git a/.gitignore b/.gitignore index d607a8db..085f3143 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ QiniuSDK.xcworkspace/xcshareddata/ Pods/ Podfile.lock .Podfile.swo +.swiftpm diff --git a/CHANGELOG.md b/CHANGELOG.md index c59f38c1..2a1feff1 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ #Changelog + +## 8.4.1(2021-11-26) +- 支持 Swift Package Manager + ## 8.4.0(2021-12-07) ## 优化 - DNS 预解析支持 DoH (DNS over HTTPS) diff --git a/Package.swift b/Package.swift new file mode 100644 index 00000000..fc087925 --- /dev/null +++ b/Package.swift @@ -0,0 +1,38 @@ +// swift-tools-version:5.5 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "Qiniu", + platforms: [ + .macOS(.v10_10), + .iOS(.v8) + ], + products: [ + // Products define the executables and libraries a package produces, and make them visible to other packages. + .library( + name: "Qiniu", + targets: ["QiniuSDK"]), + ], + dependencies: [ + .package(name:"HappyDNS", url: "https://github.com/qiniu/happy-dns-objc", "1.0.1"..<"1.1.0"), + ], + targets: [ + .target( + name: "QiniuSDK", + dependencies: ["HappyDNS"], + path: "QiniuSDK", + sources: ["BigData", "Collect", "Common", "Http", "Recorder", "Storage", "Transaction", "Utils"], + cSettings: [ + .headerSearchPath("BigData"), + .headerSearchPath("Collect"), + .headerSearchPath("Common"), + .headerSearchPath("Http"), + .headerSearchPath("Recorder"), + .headerSearchPath("Storage"), + .headerSearchPath("Transaction"), + .headerSearchPath("Utils"), + ]), + ] +) diff --git a/Podfile b/Podfile index 8c459e69..eb48dd85 100755 --- a/Podfile +++ b/Podfile @@ -1,8 +1,8 @@ source 'https://github.com/CocoaPods/Specs.git' def shared_dependencies - pod 'HappyDNS', '1.0.0' -# pod 'HappyDNS', :path => '../HappyDns_iOS' + pod 'HappyDNS', '~> 1.0.0' + # pod 'HappyDNS', :path => '../HappyDns_iOS' end def test_dependencies diff --git a/Qiniu.podspec b/Qiniu.podspec index 0fa88027..282b8c37 100755 --- a/Qiniu.podspec +++ b/Qiniu.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Qiniu' - s.version = '8.4.0' + s.version = '8.4.1' s.summary = 'Qiniu Resource Storage SDK for iOS and Mac' s.homepage = 'https://github.com/qiniu/objc-sdk' s.social_media_url = 'http://weibo.com/qiniutek' @@ -10,7 +10,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = '7.0' s.osx.deployment_target = '10.9' - s.source_files = "QiniuSDK/**/*.{h,m}" + s.source_files = 'QiniuSDK/BigData/**/*.{h,m}','QiniuSDK/Collect/**/*.{h,m}','QiniuSDK/Common/**/*.{h,m}','QiniuSDK/Http/**/*.{h,m}','QiniuSDK/Recorder/**/*.{h,m}','QiniuSDK/Storage/**/*.{h,m}','QiniuSDK/Transaction/**/*.{h,m}','QiniuSDK/Utils/**/*.{h,m}','QiniuSDK/QiniuSDK.h' s.requires_arc = true s.libraries = 'z' s.dependency 'HappyDNS', '~> 1.0.0' diff --git a/QiniuSDK/Utils/QNVersion.h b/QiniuSDK/Utils/QNVersion.h index b0d96064..5fea075a 100755 --- a/QiniuSDK/Utils/QNVersion.h +++ b/QiniuSDK/Utils/QNVersion.h @@ -11,4 +11,4 @@ /** * sdk 版本 */ -static NSString *const kQiniuVersion = @"8.4.0"; +static NSString *const kQiniuVersion = @"8.4.1"; diff --git a/QiniuSDK/include/NSData+QNGZip.h b/QiniuSDK/include/NSData+QNGZip.h new file mode 120000 index 00000000..d1076e34 --- /dev/null +++ b/QiniuSDK/include/NSData+QNGZip.h @@ -0,0 +1 @@ +../Utils/NSData+QNGZip.h \ No newline at end of file diff --git a/QiniuSDK/include/NSData+QNMD5.h b/QiniuSDK/include/NSData+QNMD5.h new file mode 120000 index 00000000..40589b0e --- /dev/null +++ b/QiniuSDK/include/NSData+QNMD5.h @@ -0,0 +1 @@ +../Utils/NSData+QNMD5.h \ No newline at end of file diff --git a/QiniuSDK/include/NSObject+QNSwizzle.h b/QiniuSDK/include/NSObject+QNSwizzle.h new file mode 120000 index 00000000..5208a244 --- /dev/null +++ b/QiniuSDK/include/NSObject+QNSwizzle.h @@ -0,0 +1 @@ +../Utils/NSObject+QNSwizzle.h \ No newline at end of file diff --git a/QiniuSDK/include/NSURLRequest+QNRequest.h b/QiniuSDK/include/NSURLRequest+QNRequest.h new file mode 120000 index 00000000..1df07a99 --- /dev/null +++ b/QiniuSDK/include/NSURLRequest+QNRequest.h @@ -0,0 +1 @@ +../Http/Request/HttpClient/CFNetwork/NSURLRequest+QNRequest.h \ No newline at end of file diff --git a/QiniuSDK/include/QNALAssetFile.h b/QiniuSDK/include/QNALAssetFile.h new file mode 120000 index 00000000..bb20ae8e --- /dev/null +++ b/QiniuSDK/include/QNALAssetFile.h @@ -0,0 +1 @@ +../Utils/QNALAssetFile.h \ No newline at end of file diff --git a/QiniuSDK/include/QNAsyncRun.h b/QiniuSDK/include/QNAsyncRun.h new file mode 120000 index 00000000..e8904f3e --- /dev/null +++ b/QiniuSDK/include/QNAsyncRun.h @@ -0,0 +1 @@ +../Utils/QNAsyncRun.h \ No newline at end of file diff --git a/QiniuSDK/include/QNAutoZone.h b/QiniuSDK/include/QNAutoZone.h new file mode 120000 index 00000000..2b5adf9a --- /dev/null +++ b/QiniuSDK/include/QNAutoZone.h @@ -0,0 +1 @@ +../Common/QNAutoZone.h \ No newline at end of file diff --git a/QiniuSDK/include/QNBaseUpload.h b/QiniuSDK/include/QNBaseUpload.h new file mode 120000 index 00000000..0f620d59 --- /dev/null +++ b/QiniuSDK/include/QNBaseUpload.h @@ -0,0 +1 @@ +../Storage/QNBaseUpload.h \ No newline at end of file diff --git a/QiniuSDK/include/QNCFHttpClient.h b/QiniuSDK/include/QNCFHttpClient.h new file mode 120000 index 00000000..c3a75ae5 --- /dev/null +++ b/QiniuSDK/include/QNCFHttpClient.h @@ -0,0 +1 @@ +../Http/Request/HttpClient/CFNetwork/QNCFHttpClient.h \ No newline at end of file diff --git a/QiniuSDK/include/QNCFHttpClientInner.h b/QiniuSDK/include/QNCFHttpClientInner.h new file mode 120000 index 00000000..f36c4c95 --- /dev/null +++ b/QiniuSDK/include/QNCFHttpClientInner.h @@ -0,0 +1 @@ +../Http/Request/HttpClient/CFNetwork/QNCFHttpClientInner.h \ No newline at end of file diff --git a/QiniuSDK/include/QNCFHttpThreadPool.h b/QiniuSDK/include/QNCFHttpThreadPool.h new file mode 120000 index 00000000..6d31968d --- /dev/null +++ b/QiniuSDK/include/QNCFHttpThreadPool.h @@ -0,0 +1 @@ +../Http/Request/HttpClient/CFNetwork/QNCFHttpThreadPool.h \ No newline at end of file diff --git a/QiniuSDK/include/QNConcurrentResumeUpload.h b/QiniuSDK/include/QNConcurrentResumeUpload.h new file mode 120000 index 00000000..1b8ff99e --- /dev/null +++ b/QiniuSDK/include/QNConcurrentResumeUpload.h @@ -0,0 +1 @@ +../Storage/QNConcurrentResumeUpload.h \ No newline at end of file diff --git a/QiniuSDK/include/QNConfig.h b/QiniuSDK/include/QNConfig.h new file mode 120000 index 00000000..3433d4d7 --- /dev/null +++ b/QiniuSDK/include/QNConfig.h @@ -0,0 +1 @@ +../Common/QNConfig.h \ No newline at end of file diff --git a/QiniuSDK/include/QNConfiguration.h b/QiniuSDK/include/QNConfiguration.h new file mode 120000 index 00000000..29fbcd8f --- /dev/null +++ b/QiniuSDK/include/QNConfiguration.h @@ -0,0 +1 @@ +../Storage/QNConfiguration.h \ No newline at end of file diff --git a/QiniuSDK/include/QNConnectChecker.h b/QiniuSDK/include/QNConnectChecker.h new file mode 120000 index 00000000..ec665fdf --- /dev/null +++ b/QiniuSDK/include/QNConnectChecker.h @@ -0,0 +1 @@ +../Http/ConnectCheck/QNConnectChecker.h \ No newline at end of file diff --git a/QiniuSDK/include/QNCrc32.h b/QiniuSDK/include/QNCrc32.h new file mode 120000 index 00000000..6a70fdff --- /dev/null +++ b/QiniuSDK/include/QNCrc32.h @@ -0,0 +1 @@ +../Utils/QNCrc32.h \ No newline at end of file diff --git a/QiniuSDK/include/QNDefine.h b/QiniuSDK/include/QNDefine.h new file mode 120000 index 00000000..e1f851fd --- /dev/null +++ b/QiniuSDK/include/QNDefine.h @@ -0,0 +1 @@ +../Utils/QNDefine.h \ No newline at end of file diff --git a/QiniuSDK/include/QNDns.h b/QiniuSDK/include/QNDns.h new file mode 120000 index 00000000..0034ecd4 --- /dev/null +++ b/QiniuSDK/include/QNDns.h @@ -0,0 +1 @@ +../Http/Dns/QNDns.h \ No newline at end of file diff --git a/QiniuSDK/include/QNDnsCacheFile.h b/QiniuSDK/include/QNDnsCacheFile.h new file mode 120000 index 00000000..e73c98ec --- /dev/null +++ b/QiniuSDK/include/QNDnsCacheFile.h @@ -0,0 +1 @@ +../Http/Dns/QNDnsCacheFile.h \ No newline at end of file diff --git a/QiniuSDK/include/QNDnsCacheInfo.h b/QiniuSDK/include/QNDnsCacheInfo.h new file mode 120000 index 00000000..b481d381 --- /dev/null +++ b/QiniuSDK/include/QNDnsCacheInfo.h @@ -0,0 +1 @@ +../Http/Dns/QNDnsCacheInfo.h \ No newline at end of file diff --git a/QiniuSDK/include/QNDnsPrefetch.h b/QiniuSDK/include/QNDnsPrefetch.h new file mode 120000 index 00000000..f35c967e --- /dev/null +++ b/QiniuSDK/include/QNDnsPrefetch.h @@ -0,0 +1 @@ +../Http/Dns/QNDnsPrefetch.h \ No newline at end of file diff --git a/QiniuSDK/include/QNErrorCode.h b/QiniuSDK/include/QNErrorCode.h new file mode 120000 index 00000000..7b901c19 --- /dev/null +++ b/QiniuSDK/include/QNErrorCode.h @@ -0,0 +1 @@ +../Common/QNErrorCode.h \ No newline at end of file diff --git a/QiniuSDK/include/QNEtag.h b/QiniuSDK/include/QNEtag.h new file mode 120000 index 00000000..a0e1b8aa --- /dev/null +++ b/QiniuSDK/include/QNEtag.h @@ -0,0 +1 @@ +../Utils/QNEtag.h \ No newline at end of file diff --git a/QiniuSDK/include/QNFile.h b/QiniuSDK/include/QNFile.h new file mode 120000 index 00000000..e90ad77b --- /dev/null +++ b/QiniuSDK/include/QNFile.h @@ -0,0 +1 @@ +../Utils/QNFile.h \ No newline at end of file diff --git a/QiniuSDK/include/QNFileDelegate.h b/QiniuSDK/include/QNFileDelegate.h new file mode 120000 index 00000000..5b666c4d --- /dev/null +++ b/QiniuSDK/include/QNFileDelegate.h @@ -0,0 +1 @@ +../Utils/QNFileDelegate.h \ No newline at end of file diff --git a/QiniuSDK/include/QNFileRecorder.h b/QiniuSDK/include/QNFileRecorder.h new file mode 120000 index 00000000..2f934bc0 --- /dev/null +++ b/QiniuSDK/include/QNFileRecorder.h @@ -0,0 +1 @@ +../Recorder/QNFileRecorder.h \ No newline at end of file diff --git a/QiniuSDK/include/QNFixedZone.h b/QiniuSDK/include/QNFixedZone.h new file mode 120000 index 00000000..bee79804 --- /dev/null +++ b/QiniuSDK/include/QNFixedZone.h @@ -0,0 +1 @@ +../Common/QNFixedZone.h \ No newline at end of file diff --git a/QiniuSDK/include/QNFormUpload.h b/QiniuSDK/include/QNFormUpload.h new file mode 120000 index 00000000..25c3c663 --- /dev/null +++ b/QiniuSDK/include/QNFormUpload.h @@ -0,0 +1 @@ +../Storage/QNFormUpload.h \ No newline at end of file diff --git a/QiniuSDK/include/QNHttpRegionRequest.h b/QiniuSDK/include/QNHttpRegionRequest.h new file mode 120000 index 00000000..501eebe5 --- /dev/null +++ b/QiniuSDK/include/QNHttpRegionRequest.h @@ -0,0 +1 @@ +../Http/Request/QNHttpRegionRequest.h \ No newline at end of file diff --git a/QiniuSDK/include/QNHttpSingleRequest.h b/QiniuSDK/include/QNHttpSingleRequest.h new file mode 120000 index 00000000..c8fc0375 --- /dev/null +++ b/QiniuSDK/include/QNHttpSingleRequest.h @@ -0,0 +1 @@ +../Http/Request/QNHttpSingleRequest.h \ No newline at end of file diff --git a/QiniuSDK/include/QNIUploadServer.h b/QiniuSDK/include/QNIUploadServer.h new file mode 120000 index 00000000..81f67fcd --- /dev/null +++ b/QiniuSDK/include/QNIUploadServer.h @@ -0,0 +1 @@ +../Http/Request/QNIUploadServer.h \ No newline at end of file diff --git a/QiniuSDK/include/QNInetAddress.h b/QiniuSDK/include/QNInetAddress.h new file mode 120000 index 00000000..58f3856e --- /dev/null +++ b/QiniuSDK/include/QNInetAddress.h @@ -0,0 +1 @@ +../Http/Dns/QNInetAddress.h \ No newline at end of file diff --git a/QiniuSDK/include/QNLogUtil.h b/QiniuSDK/include/QNLogUtil.h new file mode 120000 index 00000000..dca6e5f7 --- /dev/null +++ b/QiniuSDK/include/QNLogUtil.h @@ -0,0 +1 @@ +../Utils/QNLogUtil.h \ No newline at end of file diff --git a/QiniuSDK/include/QNMutableArray.h b/QiniuSDK/include/QNMutableArray.h new file mode 120000 index 00000000..4ec6af7e --- /dev/null +++ b/QiniuSDK/include/QNMutableArray.h @@ -0,0 +1 @@ +../Utils/QNMutableArray.h \ No newline at end of file diff --git a/QiniuSDK/include/QNNetworkStatusManager.h b/QiniuSDK/include/QNNetworkStatusManager.h new file mode 120000 index 00000000..9fe6f69c --- /dev/null +++ b/QiniuSDK/include/QNNetworkStatusManager.h @@ -0,0 +1 @@ +../Http/NetworkStatus/QNNetworkStatusManager.h \ No newline at end of file diff --git a/QiniuSDK/include/QNPHAssetFile.h b/QiniuSDK/include/QNPHAssetFile.h new file mode 120000 index 00000000..eedb2082 --- /dev/null +++ b/QiniuSDK/include/QNPHAssetFile.h @@ -0,0 +1 @@ +../Utils/QNPHAssetFile.h \ No newline at end of file diff --git a/QiniuSDK/include/QNPHAssetResource.h b/QiniuSDK/include/QNPHAssetResource.h new file mode 120000 index 00000000..8246f629 --- /dev/null +++ b/QiniuSDK/include/QNPHAssetResource.h @@ -0,0 +1 @@ +../Utils/QNPHAssetResource.h \ No newline at end of file diff --git a/QiniuSDK/include/QNPartsUpload.h b/QiniuSDK/include/QNPartsUpload.h new file mode 120000 index 00000000..dbb22160 --- /dev/null +++ b/QiniuSDK/include/QNPartsUpload.h @@ -0,0 +1 @@ +../Storage/QNPartsUpload.h \ No newline at end of file diff --git a/QiniuSDK/include/QNPartsUploadPerformer.h b/QiniuSDK/include/QNPartsUploadPerformer.h new file mode 120000 index 00000000..9b1b5d52 --- /dev/null +++ b/QiniuSDK/include/QNPartsUploadPerformer.h @@ -0,0 +1 @@ +../Storage/QNPartsUploadPerformer.h \ No newline at end of file diff --git a/QiniuSDK/include/QNPartsUploadPerformerV1.h b/QiniuSDK/include/QNPartsUploadPerformerV1.h new file mode 120000 index 00000000..9855aaa8 --- /dev/null +++ b/QiniuSDK/include/QNPartsUploadPerformerV1.h @@ -0,0 +1 @@ +../Storage/QNPartsUploadPerformerV1.h \ No newline at end of file diff --git a/QiniuSDK/include/QNPartsUploadPerformerV2.h b/QiniuSDK/include/QNPartsUploadPerformerV2.h new file mode 120000 index 00000000..70bc0855 --- /dev/null +++ b/QiniuSDK/include/QNPartsUploadPerformerV2.h @@ -0,0 +1 @@ +../Storage/QNPartsUploadPerformerV2.h \ No newline at end of file diff --git a/QiniuSDK/include/QNPipeline.h b/QiniuSDK/include/QNPipeline.h new file mode 120000 index 00000000..207fd5b6 --- /dev/null +++ b/QiniuSDK/include/QNPipeline.h @@ -0,0 +1 @@ +../BigData/QNPipeline.h \ No newline at end of file diff --git a/QiniuSDK/include/QNRecorderDelegate.h b/QiniuSDK/include/QNRecorderDelegate.h new file mode 120000 index 00000000..a3aea929 --- /dev/null +++ b/QiniuSDK/include/QNRecorderDelegate.h @@ -0,0 +1 @@ +../Recorder/QNRecorderDelegate.h \ No newline at end of file diff --git a/QiniuSDK/include/QNReportConfig.h b/QiniuSDK/include/QNReportConfig.h new file mode 120000 index 00000000..42178cf7 --- /dev/null +++ b/QiniuSDK/include/QNReportConfig.h @@ -0,0 +1 @@ +../Collect/QNReportConfig.h \ No newline at end of file diff --git a/QiniuSDK/include/QNReportItem.h b/QiniuSDK/include/QNReportItem.h new file mode 120000 index 00000000..974fad0b --- /dev/null +++ b/QiniuSDK/include/QNReportItem.h @@ -0,0 +1 @@ +../Collect/QNReportItem.h \ No newline at end of file diff --git a/QiniuSDK/include/QNRequestClient.h b/QiniuSDK/include/QNRequestClient.h new file mode 120000 index 00000000..c5ce67a5 --- /dev/null +++ b/QiniuSDK/include/QNRequestClient.h @@ -0,0 +1 @@ +../Http/Request/QNRequestClient.h \ No newline at end of file diff --git a/QiniuSDK/include/QNRequestTransaction.h b/QiniuSDK/include/QNRequestTransaction.h new file mode 120000 index 00000000..8df8a41b --- /dev/null +++ b/QiniuSDK/include/QNRequestTransaction.h @@ -0,0 +1 @@ +../Http/Request/QNRequestTransaction.h \ No newline at end of file diff --git a/QiniuSDK/include/QNResponseInfo.h b/QiniuSDK/include/QNResponseInfo.h new file mode 120000 index 00000000..7e517c0e --- /dev/null +++ b/QiniuSDK/include/QNResponseInfo.h @@ -0,0 +1 @@ +../Http/QNResponseInfo.h \ No newline at end of file diff --git a/QiniuSDK/include/QNServerConfig.h b/QiniuSDK/include/QNServerConfig.h new file mode 120000 index 00000000..c49ec336 --- /dev/null +++ b/QiniuSDK/include/QNServerConfig.h @@ -0,0 +1 @@ +../Storage/ServerConfig/QNServerConfig.h \ No newline at end of file diff --git a/QiniuSDK/include/QNServerConfigCache.h b/QiniuSDK/include/QNServerConfigCache.h new file mode 120000 index 00000000..a8026df2 --- /dev/null +++ b/QiniuSDK/include/QNServerConfigCache.h @@ -0,0 +1 @@ +../Storage/ServerConfig/QNServerConfigCache.h \ No newline at end of file diff --git a/QiniuSDK/include/QNServerConfigMonitor.h b/QiniuSDK/include/QNServerConfigMonitor.h new file mode 120000 index 00000000..0355d4d6 --- /dev/null +++ b/QiniuSDK/include/QNServerConfigMonitor.h @@ -0,0 +1 @@ +../Storage/ServerConfig/QNServerConfigMonitor.h \ No newline at end of file diff --git a/QiniuSDK/include/QNServerConfigSynchronizer.h b/QiniuSDK/include/QNServerConfigSynchronizer.h new file mode 120000 index 00000000..0beb7f12 --- /dev/null +++ b/QiniuSDK/include/QNServerConfigSynchronizer.h @@ -0,0 +1 @@ +../Storage/ServerConfig/QNServerConfigSynchronizer.h \ No newline at end of file diff --git a/QiniuSDK/include/QNServerUserConfig.h b/QiniuSDK/include/QNServerUserConfig.h new file mode 120000 index 00000000..2075826b --- /dev/null +++ b/QiniuSDK/include/QNServerUserConfig.h @@ -0,0 +1 @@ +../Storage/ServerConfig/QNServerUserConfig.h \ No newline at end of file diff --git a/QiniuSDK/include/QNSessionManager.h b/QiniuSDK/include/QNSessionManager.h new file mode 120000 index 00000000..709658cf --- /dev/null +++ b/QiniuSDK/include/QNSessionManager.h @@ -0,0 +1 @@ +../BigData/QNSessionManager.h \ No newline at end of file diff --git a/QiniuSDK/include/QNSingleFlight.h b/QiniuSDK/include/QNSingleFlight.h new file mode 120000 index 00000000..d6187fe5 --- /dev/null +++ b/QiniuSDK/include/QNSingleFlight.h @@ -0,0 +1 @@ +../Utils/QNSingleFlight.h \ No newline at end of file diff --git a/QiniuSDK/include/QNSystem.h b/QiniuSDK/include/QNSystem.h new file mode 120000 index 00000000..f4bd5e4c --- /dev/null +++ b/QiniuSDK/include/QNSystem.h @@ -0,0 +1 @@ +../Utils/QNSystem.h \ No newline at end of file diff --git a/QiniuSDK/include/QNTransactionManager.h b/QiniuSDK/include/QNTransactionManager.h new file mode 120000 index 00000000..deadb4cc --- /dev/null +++ b/QiniuSDK/include/QNTransactionManager.h @@ -0,0 +1 @@ +../Transaction/QNTransactionManager.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUpProgress.h b/QiniuSDK/include/QNUpProgress.h new file mode 120000 index 00000000..6208c6ef --- /dev/null +++ b/QiniuSDK/include/QNUpProgress.h @@ -0,0 +1 @@ +../Storage/QNUpProgress.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUpToken.h b/QiniuSDK/include/QNUpToken.h new file mode 120000 index 00000000..0b7c833f --- /dev/null +++ b/QiniuSDK/include/QNUpToken.h @@ -0,0 +1 @@ +../Storage/QNUpToken.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadBlock.h b/QiniuSDK/include/QNUploadBlock.h new file mode 120000 index 00000000..1f7c48c3 --- /dev/null +++ b/QiniuSDK/include/QNUploadBlock.h @@ -0,0 +1 @@ +../Storage/QNUploadBlock.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadData.h b/QiniuSDK/include/QNUploadData.h new file mode 120000 index 00000000..4e29aee8 --- /dev/null +++ b/QiniuSDK/include/QNUploadData.h @@ -0,0 +1 @@ +../Storage/QNUploadData.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadDomainRegion.h b/QiniuSDK/include/QNUploadDomainRegion.h new file mode 120000 index 00000000..d8b57f16 --- /dev/null +++ b/QiniuSDK/include/QNUploadDomainRegion.h @@ -0,0 +1 @@ +../Http/ServerRegion/QNUploadDomainRegion.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadInfo.h b/QiniuSDK/include/QNUploadInfo.h new file mode 120000 index 00000000..b5e127d6 --- /dev/null +++ b/QiniuSDK/include/QNUploadInfo.h @@ -0,0 +1 @@ +../Storage/QNUploadInfo.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadInfoReporter.h b/QiniuSDK/include/QNUploadInfoReporter.h new file mode 120000 index 00000000..462f4663 --- /dev/null +++ b/QiniuSDK/include/QNUploadInfoReporter.h @@ -0,0 +1 @@ +../Collect/QNUploadInfoReporter.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadInfoV1.h b/QiniuSDK/include/QNUploadInfoV1.h new file mode 120000 index 00000000..e5c6333d --- /dev/null +++ b/QiniuSDK/include/QNUploadInfoV1.h @@ -0,0 +1 @@ +../Storage/QNUploadInfoV1.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadInfoV2.h b/QiniuSDK/include/QNUploadInfoV2.h new file mode 120000 index 00000000..4daee6c6 --- /dev/null +++ b/QiniuSDK/include/QNUploadInfoV2.h @@ -0,0 +1 @@ +../Storage/QNUploadInfoV2.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadManager.h b/QiniuSDK/include/QNUploadManager.h new file mode 120000 index 00000000..e9fab9af --- /dev/null +++ b/QiniuSDK/include/QNUploadManager.h @@ -0,0 +1 @@ +../Storage/QNUploadManager.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadOption.h b/QiniuSDK/include/QNUploadOption.h new file mode 120000 index 00000000..b3e02481 --- /dev/null +++ b/QiniuSDK/include/QNUploadOption.h @@ -0,0 +1 @@ +../Storage/QNUploadOption.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadRegionInfo.h b/QiniuSDK/include/QNUploadRegionInfo.h new file mode 120000 index 00000000..ac0cc5d4 --- /dev/null +++ b/QiniuSDK/include/QNUploadRegionInfo.h @@ -0,0 +1 @@ +../Http/Request/QNUploadRegionInfo.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadRequestInfo.h b/QiniuSDK/include/QNUploadRequestInfo.h new file mode 120000 index 00000000..da19c353 --- /dev/null +++ b/QiniuSDK/include/QNUploadRequestInfo.h @@ -0,0 +1 @@ +../Http/Request/QNUploadRequestInfo.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadRequestMetrics.h b/QiniuSDK/include/QNUploadRequestMetrics.h new file mode 120000 index 00000000..de0efed8 --- /dev/null +++ b/QiniuSDK/include/QNUploadRequestMetrics.h @@ -0,0 +1 @@ +../Http/QNUploadRequestMetrics.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadRequestState.h b/QiniuSDK/include/QNUploadRequestState.h new file mode 120000 index 00000000..aa5f3b3d --- /dev/null +++ b/QiniuSDK/include/QNUploadRequestState.h @@ -0,0 +1 @@ +../Http/QNUploadRequestState.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadServer.h b/QiniuSDK/include/QNUploadServer.h new file mode 120000 index 00000000..91b30d50 --- /dev/null +++ b/QiniuSDK/include/QNUploadServer.h @@ -0,0 +1 @@ +../Http/ServerRegion/QNUploadServer.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadServerFreezeManager.h b/QiniuSDK/include/QNUploadServerFreezeManager.h new file mode 120000 index 00000000..f8908d4e --- /dev/null +++ b/QiniuSDK/include/QNUploadServerFreezeManager.h @@ -0,0 +1 @@ +../Http/ServerRegion/QNUploadServerFreezeManager.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadServerFreezeUtil.h b/QiniuSDK/include/QNUploadServerFreezeUtil.h new file mode 120000 index 00000000..5e39065d --- /dev/null +++ b/QiniuSDK/include/QNUploadServerFreezeUtil.h @@ -0,0 +1 @@ +../Http/ServerRegion/QNUploadServerFreezeUtil.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadServerNetworkStatus.h b/QiniuSDK/include/QNUploadServerNetworkStatus.h new file mode 120000 index 00000000..113bcb7b --- /dev/null +++ b/QiniuSDK/include/QNUploadServerNetworkStatus.h @@ -0,0 +1 @@ +../Http/NetworkStatus/QNUploadServerNetworkStatus.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadSource.h b/QiniuSDK/include/QNUploadSource.h new file mode 120000 index 00000000..6e63bc65 --- /dev/null +++ b/QiniuSDK/include/QNUploadSource.h @@ -0,0 +1 @@ +../Storage/QNUploadSource.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadSourceFile.h b/QiniuSDK/include/QNUploadSourceFile.h new file mode 120000 index 00000000..b573703f --- /dev/null +++ b/QiniuSDK/include/QNUploadSourceFile.h @@ -0,0 +1 @@ +../Storage/QNUploadSourceFile.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadSourceStream.h b/QiniuSDK/include/QNUploadSourceStream.h new file mode 120000 index 00000000..769b05ae --- /dev/null +++ b/QiniuSDK/include/QNUploadSourceStream.h @@ -0,0 +1 @@ +../Storage/QNUploadSourceStream.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUploadSystemClient.h b/QiniuSDK/include/QNUploadSystemClient.h new file mode 120000 index 00000000..0fe1b36f --- /dev/null +++ b/QiniuSDK/include/QNUploadSystemClient.h @@ -0,0 +1 @@ +../Http/Request/HttpClient/QNUploadSystemClient.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUrlSafeBase64.h b/QiniuSDK/include/QNUrlSafeBase64.h new file mode 120000 index 00000000..795f684f --- /dev/null +++ b/QiniuSDK/include/QNUrlSafeBase64.h @@ -0,0 +1 @@ +../Utils/QNUrlSafeBase64.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUserAgent.h b/QiniuSDK/include/QNUserAgent.h new file mode 120000 index 00000000..7f367cd8 --- /dev/null +++ b/QiniuSDK/include/QNUserAgent.h @@ -0,0 +1 @@ +../Http/QNUserAgent.h \ No newline at end of file diff --git a/QiniuSDK/include/QNUtils.h b/QiniuSDK/include/QNUtils.h new file mode 120000 index 00000000..789b5081 --- /dev/null +++ b/QiniuSDK/include/QNUtils.h @@ -0,0 +1 @@ +../Utils/QNUtils.h \ No newline at end of file diff --git a/QiniuSDK/include/QNVersion.h b/QiniuSDK/include/QNVersion.h new file mode 120000 index 00000000..6d21c0f6 --- /dev/null +++ b/QiniuSDK/include/QNVersion.h @@ -0,0 +1 @@ +../Utils/QNVersion.h \ No newline at end of file diff --git a/QiniuSDK/include/QNZone.h b/QiniuSDK/include/QNZone.h new file mode 120000 index 00000000..01e7f3c6 --- /dev/null +++ b/QiniuSDK/include/QNZone.h @@ -0,0 +1 @@ +../Common/QNZone.h \ No newline at end of file diff --git a/QiniuSDK/include/QNZoneInfo.h b/QiniuSDK/include/QNZoneInfo.h new file mode 120000 index 00000000..98fbc1e1 --- /dev/null +++ b/QiniuSDK/include/QNZoneInfo.h @@ -0,0 +1 @@ +../Common/QNZoneInfo.h \ No newline at end of file diff --git a/QiniuSDK/include/QN_GTM_Base64.h b/QiniuSDK/include/QN_GTM_Base64.h new file mode 120000 index 00000000..16da2491 --- /dev/null +++ b/QiniuSDK/include/QN_GTM_Base64.h @@ -0,0 +1 @@ +../Utils/QN_GTM_Base64.h \ No newline at end of file diff --git a/QiniuSDK/include/QiniuSDK.h b/QiniuSDK/include/QiniuSDK.h new file mode 120000 index 00000000..7b1233e3 --- /dev/null +++ b/QiniuSDK/include/QiniuSDK.h @@ -0,0 +1 @@ +../QiniuSDK.h \ No newline at end of file diff --git a/QiniuSDKTests/QNTestConfig.h b/QiniuSDKTests/QNTestConfig.h index abda2f9b..1a79ad8c 100755 --- a/QiniuSDKTests/QNTestConfig.h +++ b/QiniuSDKTests/QNTestConfig.h @@ -6,17 +6,16 @@ // Copyright (c) 2014年 Qiniu. All rights reserved. // #import - // 华东上传凭证 -static NSString *const token_z0 = @"dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:cAxdjZQGfyzHc7zYltjEojF-l9I=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTAtc3BhY2UiLCJkZWFkbGluZSI6MTYzOTEyMzkxNiwgInJldHVybkJvZHkiOiJ7XCJjYWxsYmFja1VybFwiOlwiaHR0cDpcL1wvY2FsbGJhY2suZGV2LnFpbml1LmlvXCIsIFwiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKX0ifQ=="; +static NSString *const token_z0 = @"dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:0TQGkniBnXmNWm7-0XG4ASYbXh8=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTAtc3BhY2UiLCJkZWFkbGluZSI6MTY0NzU3NzAwNiwgInJldHVybkJvZHkiOiJ7XCJjYWxsYmFja1VybFwiOlwiaHR0cDpcL1wvY2FsbGJhY2suZGV2LnFpbml1LmlvXCIsIFwiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKX0ifQ=="; // 华北上传凭证 -static NSString *const token_z1 = @"dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:pUqFWvgri_YHgFmAcHyWOiOyil0=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTEtc3BhY2UiLCJkZWFkbGluZSI6MTYzOTEyMzkxNiwgInJldHVybkJvZHkiOiJ7XCJjYWxsYmFja1VybFwiOlwiaHR0cDpcL1wvY2FsbGJhY2suZGV2LnFpbml1LmlvXCIsIFwiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKX0ifQ=="; +static NSString *const token_z1 = @"dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:KzV6Z6KVZvXe-pSEMe5PyJhtM18=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTEtc3BhY2UiLCJkZWFkbGluZSI6MTY0NzU3NzAwNiwgInJldHVybkJvZHkiOiJ7XCJjYWxsYmFja1VybFwiOlwiaHR0cDpcL1wvY2FsbGJhY2suZGV2LnFpbml1LmlvXCIsIFwiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKX0ifQ=="; // 华南上传凭证 -static NSString *const token_z2 = @"dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:YN19jl0UTnHLJua2A0Sig3FKisI=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTItc3BhY2UiLCJkZWFkbGluZSI6MTYzOTEyMzkxNiwgInJldHVybkJvZHkiOiJ7XCJjYWxsYmFja1VybFwiOlwiaHR0cDpcL1wvY2FsbGJhY2suZGV2LnFpbml1LmlvXCIsIFwiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKX0ifQ=="; +static NSString *const token_z2 = @"dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:3tphhg9sNwgg4YPv9jlRBLwfjmk=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTItc3BhY2UiLCJkZWFkbGluZSI6MTY0NzU3NzAwNiwgInJldHVybkJvZHkiOiJ7XCJjYWxsYmFja1VybFwiOlwiaHR0cDpcL1wvY2FsbGJhY2suZGV2LnFpbml1LmlvXCIsIFwiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKX0ifQ=="; // 北美上传凭证 -static NSString *const token_na0 = @"dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:H5rUyPo3lQsKLNZ3PBlut2vuKqU=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1uYTAtc3BhY2UiLCJkZWFkbGluZSI6MTYzOTEyMzkxNiwgInJldHVybkJvZHkiOiJ7XCJjYWxsYmFja1VybFwiOlwiaHR0cDpcL1wvY2FsbGJhY2suZGV2LnFpbml1LmlvXCIsIFwiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKX0ifQ=="; +static NSString *const token_na0 = @"dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:7mWQTQ4EBSraGFFlrM7Cm7Jm7-w=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1uYTAtc3BhY2UiLCJkZWFkbGluZSI6MTY0NzU3NzAwNiwgInJldHVybkJvZHkiOiJ7XCJjYWxsYmFja1VybFwiOlwiaHR0cDpcL1wvY2FsbGJhY2suZGV2LnFpbml1LmlvXCIsIFwiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKX0ifQ=="; // 东南亚上传凭证 -static NSString *const token_as0 = @"dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:HmP7wSuEtpeEO7OOz4ZpoaAPr6E=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1hczAtc3BhY2UiLCJkZWFkbGluZSI6MTYzOTEyMzkxNiwgInJldHVybkJvZHkiOiJ7XCJjYWxsYmFja1VybFwiOlwiaHR0cDpcL1wvY2FsbGJhY2suZGV2LnFpbml1LmlvXCIsIFwiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKX0ifQ=="; +static NSString *const token_as0 = @"dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:-12OJTWVAnx-V6WwWqSZYCE1JIg=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1hczAtc3BhY2UiLCJkZWFkbGluZSI6MTY0NzU3NzAwNiwgInJldHVybkJvZHkiOiJ7XCJjYWxsYmFja1VybFwiOlwiaHR0cDpcL1wvY2FsbGJhY2suZGV2LnFpbml1LmlvXCIsIFwiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKX0ifQ=="; // 雾存储华东一区 -static NSString *const token_fog_cn_east1 = @"dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:-z_3mJl9XedaO0Tx72rhNFPLtrI=:eyJzY29wZSI6InRlc3QtZm9nLWNuLWVhc3QtMSIsImRlYWRsaW5lIjoxNjM5MTIzOTE2LCAicmV0dXJuQm9keSI6IntcImNhbGxiYWNrVXJsXCI6XCJodHRwOlwvXC9jYWxsYmFjay5kZXYucWluaXUuaW9cIiwgXCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpfSJ9"; -static NSString *const invalidBucketToken = @"dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:vYaIdJ3I2sbjF4RHH268T1WTErw=:eyJzY29wZSI6InpvbmVfaW52YWxpZCIsImRlYWRsaW5lIjoxNjM5MTIzOTE2LCAicmV0dXJuQm9keSI6IntcImNhbGxiYWNrVXJsXCI6XCJodHRwOlwvXC9jYWxsYmFjay5kZXYucWluaXUuaW9cIiwgXCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpfSJ9"; +static NSString *const token_fog_cn_east1 = @"dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:BZFf5g-_qWNSnBTXhm2dL6Ph9QY=:eyJzY29wZSI6InRlc3QtZm9nLWNuLWVhc3QtMSIsImRlYWRsaW5lIjoxNjQ3NTc3MDA2LCAicmV0dXJuQm9keSI6IntcImNhbGxiYWNrVXJsXCI6XCJodHRwOlwvXC9jYWxsYmFjay5kZXYucWluaXUuaW9cIiwgXCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpfSJ9"; +static NSString *const invalidBucketToken = @"dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:buhFen7Jw5SGg9dJCCJeOFtz_fc=:eyJzY29wZSI6InpvbmVfaW52YWxpZCIsImRlYWRsaW5lIjoxNjQ3NTc3MDA2LCAicmV0dXJuQm9keSI6IntcImNhbGxiYWNrVXJsXCI6XCJodHRwOlwvXC9jYWxsYmFjay5kZXYucWluaXUuaW9cIiwgXCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpfSJ9"; diff --git a/README.md b/README.md index 68712e90..a530aa30 100755 --- a/README.md +++ b/README.md @@ -14,7 +14,23 @@ 通过 CocoaPods ```ruby -pod "Qiniu", "~> 8.4.0" +pod "Qiniu", "~> 8.4.1" +``` + +通过 Swift Package Manager (Xcode 11+) +``` +App 对接: +File -> Swift Packages -> Add Package Dependency,输入 HappyDNS 库链接,选择相应版本即可 +库链接: https://github.com/qiniu/objc-sdk + +库对接: +let package = Package( + dependencies: [ + .package(url: "https://github.com/qiniu/objc-sdk", from: "8.4.1") + ], + // ... +) + ``` ## 运行环境