Merge pull request #66 from meitu/feature/travis

Feature/travis
meitu · Sep 7, 2020 · 727eb56 · 727eb56
2 parents ac9444b + 763160f
commit 727eb56
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 23 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,9 +15,7 @@ env:
     - DEMO_SCHEME="MTHawkeyeDemo"
 matrix:
   include:
-    - osx_image: xcode9.3
-      env: RUN_TEST="YES" BUILD_DEMO="NO" POD_LINT="NO"
-    - osx_image: xcode10.2
+    - osx_image: xcode11.6
       env: RUN_TEST="YES" BUILD_DEMO="NO" POD_LINT="NO"
 
 before_install:

diff --git a/MTHawkeyeDemo/MTHawkeyeDemo.xcodeproj/project.pbxproj b/MTHawkeyeDemo/MTHawkeyeDemo.xcodeproj/project.pbxproj
@@ -1126,7 +1126,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.meitu.hawkeyedemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = "match Development *";
+				PROVISIONING_PROFILE_SPECIFIER = "match2 Development *";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1171,7 +1171,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.meitu.hawkeyedemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = "match Development *";
+				PROVISIONING_PROFILE_SPECIFIER = "match2 Development *";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/MTHawkeyeDemo/MTHawkeyeDemoTests/AFURLSessionManagerTests.m b/MTHawkeyeDemo/MTHawkeyeDemoTests/AFURLSessionManagerTests.m
@@ -137,21 +137,6 @@ - (void)testDownloadTaskDoesReportProgress {
     [self waitForExpectationsWithCommonTimeout];
 }
 
-// iOS 7 has a bug that may return nil for a session. To simulate that, nil out the
-// session and it will return nil itself.
-- (void)testFileUploadTaskReturnsNilWithBug {
-    [self.localManager setValue:nil forKey:@"session"];
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnonnull"
-    XCTAssertNil([self.localManager uploadTaskWithRequest:[NSURLRequest requestWithURL:self.baseURL]
-                                                 fromFile:nil
-                                                 progress:NULL
-                                        completionHandler:NULL],
-        @"Upload task should be nil.");
-#pragma GCC diagnostic pop
-}
-
 - (void)testUploadTaskDoesReportProgress {
     NSMutableString *payload = [NSMutableString stringWithString:@"AFNetworking"];
     while ([payload lengthOfBytesUsingEncoding:NSUTF8StringEncoding] < 20000) {

diff --git a/MTHawkeyeDemo/Podfile.lock b/MTHawkeyeDemo/Podfile.lock
@@ -271,6 +271,6 @@ SPEC CHECKSUMS:
   MTGLDebug: 4883ba4da36f45a88e2c2d805d2b5a5b54ba5ad1
   MTHawkeye: ef13a3db0ac145faf4890ee3f4337629ff0e7934
 
-PODFILE CHECKSUM: a9adc548dc1ae489b61c388a592b01c11b3cb358
+PODFILE CHECKSUM: a042331aa2214707a236779026b6734d92da8829
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.9.3
diff --git a/MTHawkeyeDemo/podfile b/MTHawkeyeDemo/podfile
@@ -1,4 +1,4 @@
-source 'https://github.com/CocoaPods/Specs.git'
+source 'https://cdn.cocoapods.org/'
 
 platform :ios, "9.0"