Pārlūkot izejas kodu

Upgrade Xcode version and fix warnings

onevcat 5 gadi atpakaļ
vecāks
revīzija
137c98dd2c

+ 3 - 1
Demo/Kingfisher-Demo.xcodeproj/project.pbxproj

@@ -580,7 +580,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1100;
-				LastUpgradeCheck = 1110;
+				LastUpgradeCheck = 1220;
 				ORGANIZATIONNAME = "Wei Wang";
 				TargetAttributes = {
 					4B2944541C3D03880088C3E7 = {
@@ -1008,6 +1008,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1068,6 +1069,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;

+ 1 - 1
Kingfisher.xcodeproj/project.pbxproj

@@ -755,7 +755,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 1200;
+				LastUpgradeCheck = 1220;
 				ORGANIZATIONNAME = "Wei Wang";
 				TargetAttributes = {
 					D1ED2D341AD2D09F00CFC3EB = {

+ 1 - 1
Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

+ 1 - 1
Kingfisher.xcodeproj/xcshareddata/xcschemes/KingfisherSwiftUI.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

+ 8 - 8
Tests/KingfisherTests/NSButtonExtensionTests.swift

@@ -113,11 +113,11 @@ class NSButtonExtensionTests: XCTestCase {
         let url = testURLs[0]
         let stub = delayedStub(url, data: testImageData)
         
-        button.kf.setImage(with: url) { result in
+        button.kf.setImage(with: url, completionHandler: { result in
             XCTAssertNotNil(result.error)
             XCTAssertTrue(result.error!.isTaskCancelled)
             delay(0.1) { exp.fulfill() }
-        }
+        })
         
         self.button.kf.cancelImageDownloadTask()
         _ = stub.go()
@@ -130,11 +130,11 @@ class NSButtonExtensionTests: XCTestCase {
         let url = testURLs[0]
         let stub = delayedStub(url, data: testImageData)
         
-        button.kf.setAlternateImage(with: url) { result in
+        button.kf.setAlternateImage(with: url, completionHandler: { result in
             XCTAssertNotNil(result.error)
             XCTAssertTrue(result.error!.isTaskCancelled)
             delay(0.1) { exp.fulfill() }
-        }
+        })
         
         self.button.kf.cancelAlternateImageDownloadTask()
         _ = stub.go()
@@ -165,10 +165,10 @@ class NSButtonExtensionTests: XCTestCase {
         let url = testURLs[0]
         stub(url, errorCode: 404)
         
-        button.kf.setImage(with: url, options: [.onFailureImage(testImage)]) { (result) -> Void in
+        button.kf.setImage(with: url, options: [.onFailureImage(testImage)], completionHandler: { result in
             XCTAssertNil(result.value)
             expectation.fulfill()
-        }
+        })
         
         XCTAssertNil(button.image)
         waitForExpectations(timeout: 5, handler: nil)
@@ -180,10 +180,10 @@ class NSButtonExtensionTests: XCTestCase {
         let url = testURLs[0]
         stub(url, errorCode: 404)
         
-        button.kf.setAlternateImage(with: url, options: [.onFailureImage(testImage)]) { (result) -> Void in
+        button.kf.setAlternateImage(with: url, options: [.onFailureImage(testImage)], completionHandler:  { result in
             XCTAssertNil(result.value)
             expectation.fulfill()
-        }
+        })
         
         XCTAssertNil(button.alternateImage)
         waitForExpectations(timeout: 5, handler: nil)