Skip to content

Commit

Permalink
Merge branch 'master' of YangSen-qn:qiniu/objc-sdk into fixzone-creator
Browse files Browse the repository at this point in the history 
# Conflicts:
#	QiniuSDK.xcodeproj/project.pbxproj
  • Loading branch information
YangSen-qn committed Oct 20, 2023
2 parents 712ccce + 65caed5 commit 488e0f1
Show file tree
Hide file tree
Showing 21 changed files with 669 additions and 380 deletions.
25 changes: 16 additions & 9 deletions .github/workflows/ci-test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,27 @@ jobs:
uses: actions/checkout@v3
with:
ref: ${{ github.ref }}
- name: Setup Ruby 3.0
uses: ruby/setup-ruby@v1
# - name: Setup Ruby 3.2
# uses: ruby/setup-ruby@v1
# with:
# ruby-version: '3.2'
# - name: Setup Environment
# run: |
# gem install cocoapods --pre --no-document
# rm -rf $HOME/.cocoapods
# pod setup --silent
# pod install --silent --no-repo-update
- name: setup-cocoapods
uses: maxim-lobanov/setup-cocoapods@v1
with:
ruby-version: '3.0'
- name: Setup Environment
run: |
gem install cocoapods --pre --no-document
rm -rf $HOME/.cocoapods
pod setup --silent
pod install --silent --no-repo-update
version: 1.12.1
- name: Run Cases
env:
QINIU_TEST_ENV: travis
run: |
rm -rf $HOME/.cocoapods
pod setup --silent
pod install --silent --no-repo-update
xcodebuild test -workspace QiniuSDK.xcworkspace -scheme QiniuSDK_iOS -configuration Debug -destination 'platform=iOS Simulator,name=iPhone 14 Pro' -enableCodeCoverage YES
xcodebuild test -workspace QiniuSDK.xcworkspace -scheme QiniuSDK_Mac -configuration Debug -destination 'platform=macOS,arch=x86_64'
bash <(curl -s https://codecov.io/bash)
37 changes: 21 additions & 16 deletions QiniuSDK.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
/* End PBXAggregateTarget section */

/* Begin PBXBuildFile section */
0CD9B2165D33CBCFF01AAE0B /* libPods-QiniuSDK_MacTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 24BA93FDA4B776A502783C4A /* libPods-QiniuSDK_MacTests.a */; };
12E9CD5CF6B4132A6ED0D7D4 /* libPods-QiniuSDK_Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E98517EE5689BE11EA6791A5 /* libPods-QiniuSDK_Mac.a */; };
3115471D243476CF00D77B8B /* QNTransactionTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 3115471C243476CF00D77B8B /* QNTransactionTest.m */; };
3115471E243476D600D77B8B /* QNTransactionTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 3115471C243476CF00D77B8B /* QNTransactionTest.m */; };
311ADD1F2577482C00A6E15E /* QNUploadBaseTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 311ADD1A2577482200A6E15E /* QNUploadBaseTest.m */; };
Expand Down Expand Up @@ -360,10 +358,14 @@
4551E56924D0065100447285 /* NSData+QNMD5.m in Sources */ = {isa = PBXBuildFile; fileRef = 4551E56624D0065100447285 /* NSData+QNMD5.m */; };
45CBC6C32AA9B05A00962B47 /* QNFixZoneTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 45CBC6C22AA9B05A00962B47 /* QNFixZoneTest.m */; };
45CBC6C42AA9B05A00962B47 /* QNFixZoneTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 45CBC6C22AA9B05A00962B47 /* QNFixZoneTest.m */; };
45CBC6D22ABA9FFF00962B47 /* QNCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 45CBC6D02ABA9FFF00962B47 /* QNCache.h */; };
45CBC6D32ABA9FFF00962B47 /* QNCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 45CBC6D02ABA9FFF00962B47 /* QNCache.h */; };
45CBC6D42ABA9FFF00962B47 /* QNCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 45CBC6D12ABA9FFF00962B47 /* QNCache.m */; };
45CBC6D52ABA9FFF00962B47 /* QNCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 45CBC6D12ABA9FFF00962B47 /* QNCache.m */; };
45CBC6D72ABAE24900962B47 /* QNCacheTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 45CBC6D62ABAE24900962B47 /* QNCacheTest.m */; };
45CBC6D82ABAE24900962B47 /* QNCacheTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 45CBC6D62ABAE24900962B47 /* QNCacheTest.m */; };
45E0B28A2A1F0596009B1BC7 /* QNConfigurationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 45E0B2892A1F0596009B1BC7 /* QNConfigurationTest.m */; };
45E0B28B2A1F0596009B1BC7 /* QNConfigurationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 45E0B2892A1F0596009B1BC7 /* QNConfigurationTest.m */; };
8D0FB78D364BAEE65E20A604 /* libPods-QiniuSDK_iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F881668982449FAF2384327E /* libPods-QiniuSDK_iOS.a */; };
C275A64FFBE81B9CE7DDC79E /* libPods-QiniuSDK_iOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5F32D114A1227199BEC6DF5C /* libPods-QiniuSDK_iOSTests.a */; };
CC25135C244C7EB3003F4C65 /* QNBaseUpload.h in Headers */ = {isa = PBXBuildFile; fileRef = CC25135A244C7EB3003F4C65 /* QNBaseUpload.h */; };
CC25135D244C7EB3003F4C65 /* QNBaseUpload.m in Sources */ = {isa = PBXBuildFile; fileRef = CC25135B244C7EB3003F4C65 /* QNBaseUpload.m */; };
CC25135E244C7EB3003F4C65 /* QNBaseUpload.m in Sources */ = {isa = PBXBuildFile; fileRef = CC25135B244C7EB3003F4C65 /* QNBaseUpload.m */; };
Expand Down Expand Up @@ -433,7 +435,6 @@

/* Begin PBXFileReference section */
135958056D8FF4295F3D9AB0 /* Pods-QiniuSDK_iOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuSDK_iOSTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuSDK_iOSTests/Pods-QiniuSDK_iOSTests.release.xcconfig"; sourceTree = "<group>"; };
24BA93FDA4B776A502783C4A /* libPods-QiniuSDK_MacTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-QiniuSDK_MacTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
3115471C243476CF00D77B8B /* QNTransactionTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QNTransactionTest.m; sourceTree = "<group>"; };
311ADD192577482200A6E15E /* QNUploadBaseTest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QNUploadBaseTest.h; sourceTree = "<group>"; };
311ADD1A2577482200A6E15E /* QNUploadBaseTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QNUploadBaseTest.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -599,9 +600,11 @@
4551E56524D0065100447285 /* NSData+QNMD5.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSData+QNMD5.h"; sourceTree = "<group>"; };
4551E56624D0065100447285 /* NSData+QNMD5.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSData+QNMD5.m"; sourceTree = "<group>"; };
45CBC6C22AA9B05A00962B47 /* QNFixZoneTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QNFixZoneTest.m; sourceTree = "<group>"; };
45CBC6D02ABA9FFF00962B47 /* QNCache.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QNCache.h; sourceTree = "<group>"; };
45CBC6D12ABA9FFF00962B47 /* QNCache.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QNCache.m; sourceTree = "<group>"; };
45CBC6D62ABAE24900962B47 /* QNCacheTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QNCacheTest.m; sourceTree = "<group>"; };
45E0B2892A1F0596009B1BC7 /* QNConfigurationTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QNConfigurationTest.m; sourceTree = "<group>"; };
466E7AACB5F77BA0D4DE4070 /* Pods-QiniuSDK_MacTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuSDK_MacTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuSDK_MacTests/Pods-QiniuSDK_MacTests.debug.xcconfig"; sourceTree = "<group>"; };
5F32D114A1227199BEC6DF5C /* libPods-QiniuSDK_iOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-QiniuSDK_iOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
6663602DA8CC701EA3B11F04 /* Pods-QiniuSDK_iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuSDK_iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuSDK_iOS/Pods-QiniuSDK_iOS.debug.xcconfig"; sourceTree = "<group>"; };
69B20FB4731F84969BC5AEBE /* Pods-QiniuSDK_Mac.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuSDK_Mac.debug.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuSDK_Mac/Pods-QiniuSDK_Mac.debug.xcconfig"; sourceTree = "<group>"; };
6DD894AA2A19370381AD4201 /* Pods-QiniuSDK_iOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuSDK_iOSTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuSDK_iOSTests/Pods-QiniuSDK_iOSTests.debug.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -654,8 +657,6 @@
DFF525301A6235D100D02BA1 /* QNSessionManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNSessionManager.m; sourceTree = "<group>"; };
DFF525381A64079B00D02BA1 /* QNSessionTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNSessionTest.m; sourceTree = "<group>"; };
DFFE0E5F19E6575600D7A0FC /* QNFileRecorderTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNFileRecorderTest.m; sourceTree = "<group>"; };
E98517EE5689BE11EA6791A5 /* libPods-QiniuSDK_Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-QiniuSDK_Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; };
F881668982449FAF2384327E /* libPods-QiniuSDK_iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-QiniuSDK_iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
FDEA88651DAC10D000D037E5 /* QNAutoZoneTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNAutoZoneTest.m; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand All @@ -664,7 +665,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
8D0FB78D364BAEE65E20A604 /* libPods-QiniuSDK_iOS.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -673,7 +673,6 @@
buildActionMask = 2147483647;
files = (
DF293C9119DB85CB00799011 /* libz.dylib in Frameworks */,
12E9CD5CF6B4132A6ED0D7D4 /* libPods-QiniuSDK_Mac.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -683,7 +682,6 @@
files = (
DF0A03231B3BABEC00E3778C /* QiniuSDK_Mac.dylib in Frameworks */,
DF293C9219DB85EB00799011 /* libz.dylib in Frameworks */,
0CD9B2165D33CBCFF01AAE0B /* libPods-QiniuSDK_MacTests.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -692,7 +690,6 @@
buildActionMask = 2147483647;
files = (
DF0A03251B3BAC5700E3778C /* libQiniuSDK_iOS.a in Frameworks */,
C275A64FFBE81B9CE7DDC79E /* libPods-QiniuSDK_iOSTests.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -728,6 +725,8 @@
3149446424484DE200386F16 /* Utils */ = {
isa = PBXGroup;
children = (
45CBC6D02ABA9FFF00962B47 /* QNCache.h */,
45CBC6D12ABA9FFF00962B47 /* QNCache.m */,
31259E3224E3D02C00CF7531 /* NSData+QNGZip.h */,
31259E3124E3D02C00CF7531 /* NSData+QNGZip.m */,
31F5538E2456F2F3000B66AD /* QN_GTM_Base64.h */,
Expand Down Expand Up @@ -908,10 +907,6 @@
A955AABD20BF51BFE5032419 /* Frameworks */ = {
isa = PBXGroup;
children = (
E98517EE5689BE11EA6791A5 /* libPods-QiniuSDK_Mac.a */,
24BA93FDA4B776A502783C4A /* libPods-QiniuSDK_MacTests.a */,
F881668982449FAF2384327E /* libPods-QiniuSDK_iOS.a */,
5F32D114A1227199BEC6DF5C /* libPods-QiniuSDK_iOSTests.a */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -1056,6 +1051,7 @@
DF1E81A91CC893D600E32E44 /* Info.plist */,
FDEA88651DAC10D000D037E5 /* QNAutoZoneTest.m */,
DF2CDE7019DAE90300CE01FB /* QNBase64Test.m */,
45CBC6D62ABAE24900962B47 /* QNCacheTest.m */,
3142419B2449547B00BD9A21 /* QNCFHttpClientTest.m */,
31A1840D246942E0001D6EEE /* QNComplexUploadSceneTest.m */,
CCF661052355C2C00018A41E /* QNConcurrentResumeUploadTest.m */,
Expand Down Expand Up @@ -1171,6 +1167,7 @@
3188D4D326490A0C00183CAE /* QNUploadInfo.h in Headers */,
318E2F122552AE2B004EDE8C /* QNUploadSystemClient.h in Headers */,
318E2F042552AE05004EDE8C /* QNUrlSafeBase64.h in Headers */,
45CBC6D32ABA9FFF00962B47 /* QNCache.h in Headers */,
31304CB42563B898001034D2 /* QNUploadServerNetworkStatus.h in Headers */,
3188D4F32649137D00183CAE /* QNUploadSourceFile.h in Headers */,
31A697F226D6197D00D84ABC /* QNServerConfigMonitor.h in Headers */,
Expand Down Expand Up @@ -1287,6 +1284,7 @@
DFA9B65C19E0B58900A15FD1 /* QNRecorderDelegate.h in Headers */,
451A36B624BD893D00754A15 /* QNReportConfig.h in Headers */,
31F5539B2456F2F3000B66AD /* QNCrc32.h in Headers */,
45CBC6D22ABA9FFF00962B47 /* QNCache.h in Headers */,
DFF525311A6235D100D02BA1 /* QNSessionManager.h in Headers */,
DF2CDE6919DAC6A400CE01FB /* QNUploadManager.h in Headers */,
313B37EE2574F00200FBB57B /* QNPartsUploadPerformerV1.h in Headers */,
Expand Down Expand Up @@ -1619,6 +1617,7 @@
31FE6A0C25A8320200C02B27 /* QNConnectChecker.m in Sources */,
31CBB0FB2595F2720089C795 /* QNLogUtil.m in Sources */,
31A6983C26DCD1E800D84ABC /* QNServerConfig.m in Sources */,
45CBC6D42ABA9FFF00962B47 /* QNCache.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1654,6 +1653,7 @@
FDEA88661DAC10D000D037E5 /* QNAutoZoneTest.m in Sources */,
DFA9B63F19DFD8C900A15FD1 /* QNEtagTest.m in Sources */,
DF2CDE7119DAE90300CE01FB /* QNBase64Test.m in Sources */,
45CBC6D72ABAE24900962B47 /* QNCacheTest.m in Sources */,
311ADD1F2577482C00A6E15E /* QNUploadBaseTest.m in Sources */,
3115471D243476CF00D77B8B /* QNTransactionTest.m in Sources */,
3149446224470C0500386F16 /* XCTestCase+QNTest.m in Sources */,
Expand Down Expand Up @@ -1745,6 +1745,7 @@
31CFBA9225AFE71700B8EC24 /* QNConnectChecker.m in Sources */,
31FD0921248662F900217848 /* QNUploadServerFreezeManager.m in Sources */,
31A6983D26DCD1E800D84ABC /* QNServerConfig.m in Sources */,
45CBC6D52ABA9FFF00962B47 /* QNCache.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1780,6 +1781,7 @@
FDEA88671DAC10D000D037E5 /* QNAutoZoneTest.m in Sources */,
DF0A032F1B3BAC6E00E3778C /* QNSessionTest.m in Sources */,
DF0A03301B3BAC6E00E3778C /* QNUpTokenTest.m in Sources */,
45CBC6D82ABAE24900962B47 /* QNCacheTest.m in Sources */,
311ADD202577482C00A6E15E /* QNUploadBaseTest.m in Sources */,
3115471E243476D600D77B8B /* QNTransactionTest.m in Sources */,
3149446324470C0600386F16 /* XCTestCase+QNTest.m in Sources */,
Expand Down Expand Up @@ -1936,6 +1938,7 @@
GENERATE_PKGINFO_FILE = YES;
INFOPLIST_FILE = "";
MACOSX_DEPLOYMENT_TARGET = 10.14;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = QiniuSDK_Mac;
};
name = Release;
Expand Down Expand Up @@ -1972,6 +1975,7 @@
DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES;
GENERATE_PKGINFO_FILE = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = QiniuSDK_MacTests;
PROVISIONING_PROFILE_SPECIFIER = "";
};
Expand All @@ -1997,6 +2001,7 @@
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GENERATE_PKGINFO_FILE = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = QiniuSDK_iOS;
SDKROOT = iphoneos;
};
Expand Down
Loading

0 comments on commit 488e0f1

Please sign in to comment.