chore: update deps

2019-09-14 18:05:48 +08:00 · 2019-09-14 18:05:48 +08:00 · 90e6882330
parent bf10ed494b
commit 90e6882330
11 changed files with 117 additions and 98 deletions
--- a/Podfile.lock
+++ b/Podfile.lock
@ -1,9 +1,9 @@
 PODS:
-  - Alamofire (4.8.2)
+  - Alamofire (4.9.0)
  - CocoaLumberjack/Core (3.5.3)
  - CocoaLumberjack/Swift (3.5.3):
    - CocoaLumberjack/Core
-  - Crashlytics (3.13.4):
+  - Crashlytics (3.14.0):
    - Fabric (~> 1.10.2)
  - Fabric (1.10.2)
  - LetsMove (1.24)
@ -44,9 +44,9 @@ SPEC REPOS:
    - Yams

 SPEC CHECKSUMS:
-  Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
+  Alamofire: afc3e7c6db61476cb45cdd23fed06bad03bbc321
  CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
-  Crashlytics: 2dfd686bcb918dc10ee0e76f7f853fe42c7bd552
+  Crashlytics: 540b7e5f5da5a042647227a5e3ac51d85eed06df
  Fabric: 706c8b8098fff96c33c0db69cbf81f9c551d0d74
  LetsMove: fefe56bc7bc7fb7d37049e28a14f297961229fc5
  RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8
--- a/Pods/Alamofire/README.md
+++ b/Pods/Alamofire/README.md
@ -85,7 +85,7 @@ In order to keep Alamofire focused specifically on core networking implementatio
 $ gem install cocoapods
 ```

-> CocoaPods 1.1+ is required to build Alamofire 4.0+.
+> CocoaPods 1.7+ is required to build Alamofire 4.9+.

 To integrate Alamofire into your Xcode project using CocoaPods, specify it in your `Podfile`:

@ -95,7 +95,7 @@ platform :ios, '10.0'
 use_frameworks!

 target '<Your Target Name>' do
-    pod 'Alamofire', '~> 4.7'
+  pod 'Alamofire', '~> 4.9'
 end
 ```

@ -112,14 +112,13 @@ $ pod install
 You can install Carthage with [Homebrew](https://brew.sh/) using the following command:

 ```bash
-$ brew update
 $ brew install carthage
 ```

 To integrate Alamofire into your Xcode project using Carthage, specify it in your `Cartfile`:

 ```ogdl
-github "Alamofire/Alamofire" ~> 4.7
+github "Alamofire/Alamofire" ~> 4.9
 ```

 Run `carthage update` to build the framework and drag the built `Alamofire.framework` into your Xcode project.
@ -142,7 +141,7 @@ dependencies: [

 ```swift
 dependencies: [
-    .package(url: "https://github.com/Alamofire/Alamofire.git", from: "4.0.0")
+    .package(url: "https://github.com/Alamofire/Alamofire.git", from: "4.9.0")
 ]
 ```

--- a/Pods/Alamofire/Source/NetworkReachabilityManager.swift
+++ b/Pods/Alamofire/Source/NetworkReachabilityManager.swift
@ -159,7 +159,10 @@ open class NetworkReachabilityManager {
        let queueEnabled = SCNetworkReachabilitySetDispatchQueue(reachability, listenerQueue)

        listenerQueue.async {
+            self.previousFlags = SCNetworkReachabilityFlags(rawValue: 1 << 30)
+
            guard let flags = self.flags else { return }
+
            self.notifyListener(flags)
        }

--- a/Pods/Alamofire/Source/Request.swift
+++ b/Pods/Alamofire/Source/Request.swift
@ -497,8 +497,19 @@ open class DownloadRequest: Request {
    // MARK: State

    /// Cancels the request.
-    open override func cancel() {
-        downloadDelegate.downloadTask.cancel { self.downloadDelegate.resumeData = $0 }
+    override open func cancel() {
+        cancel(createResumeData: true)
+    }
+
+    /// Cancels the request.
+    ///
+    /// - parameter createResumeData: Determines whether resume data is created via the underlying download task or not.
+    open func cancel(createResumeData: Bool) {
+        if createResumeData {
+            downloadDelegate.downloadTask.cancel { self.downloadDelegate.resumeData = $0 }
+        } else {
+            downloadDelegate.downloadTask.cancel()
+        }

        NotificationCenter.default.post(
            name: Notification.Name.Task.DidCancel,
--- a/Pods/Alamofire/Source/Validation.swift
+++ b/Pods/Alamofire/Source/Validation.swift
@ -219,7 +219,10 @@ extension DataRequest {
    /// - returns: The request.
    @discardableResult
    public func validate() -> Self {
-        return validate(statusCode: self.acceptableStatusCodes).validate(contentType: self.acceptableContentTypes)
+        let contentTypes = { [unowned self] in
+            self.acceptableContentTypes
+        }
+        return validate(statusCode: acceptableStatusCodes).validate(contentType: contentTypes())
    }
 }

@ -310,6 +313,9 @@ extension DownloadRequest {
    /// - returns: The request.
    @discardableResult
    public func validate() -> Self {
-        return validate(statusCode: self.acceptableStatusCodes).validate(contentType: self.acceptableContentTypes)
+        let contentTypes = { [unowned self] in
+            self.acceptableContentTypes
+        }
+        return validate(statusCode: acceptableStatusCodes).validate(contentType: contentTypes())
    }
 }
--- a/Pods/Crashlytics/OSX/Crashlytics.framework/Versions/A/Crashlytics
+++ b/Pods/Crashlytics/OSX/Crashlytics.framework/Versions/A/Crashlytics
--- a/Pods/Crashlytics/OSX/Crashlytics.framework/Versions/A/Resources/Info.plist
+++ b/Pods/Crashlytics/OSX/Crashlytics.framework/Versions/A/Resources/Info.plist
@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.13.4</string>
+	<string>3.14.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@ -25,7 +25,7 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>143</string>
+	<string>144</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
--- a/Pods/Crashlytics/OSX/Crashlytics.framework/upload-symbols
+++ b/Pods/Crashlytics/OSX/Crashlytics.framework/upload-symbols
--- a/Pods/Manifest.lock
+++ b/Pods/Manifest.lock
@ -1,9 +1,9 @@
 PODS:
-  - Alamofire (4.8.2)
+  - Alamofire (4.9.0)
  - CocoaLumberjack/Core (3.5.3)
  - CocoaLumberjack/Swift (3.5.3):
    - CocoaLumberjack/Core
-  - Crashlytics (3.13.4):
+  - Crashlytics (3.14.0):
    - Fabric (~> 1.10.2)
  - Fabric (1.10.2)
  - LetsMove (1.24)
@ -44,9 +44,9 @@ SPEC REPOS:
    - Yams

 SPEC CHECKSUMS:
-  Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
+  Alamofire: afc3e7c6db61476cb45cdd23fed06bad03bbc321
  CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
-  Crashlytics: 2dfd686bcb918dc10ee0e76f7f853fe42c7bd552
+  Crashlytics: 540b7e5f5da5a042647227a5e3ac51d85eed06df
  Fabric: 706c8b8098fff96c33c0db69cbf81f9c551d0d74
  LetsMove: fefe56bc7bc7fb7d37049e28a14f297961229fc5
  RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8
--- a/Pods/Pods.xcodeproj/project.pbxproj
+++ b/Pods/Pods.xcodeproj/project.pbxproj
@ -2988,44 +2988,6 @@
 			};
 			name = Debug;
 		};
-		1E5AF1DA7C913F02BA374E93FF133463 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7D791BA4EFDA3B7135849F8080308C01 /* Alamofire.xcconfig */;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				CLANG_ENABLE_OBJC_WEAK = NO;
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				FRAMEWORK_VERSION = A;
-				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/Alamofire/Alamofire-Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/../Frameworks",
-					"@loader_path/Frameworks",
-				);
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
-				PRODUCT_MODULE_NAME = Alamofire;
-				PRODUCT_NAME = Alamofire;
-				SDKROOT = macosx;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
 		3562ACB3B6DA42BE8D9DDB1E8A250472 /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F09BCF10D39AC3B9D08E79CD1D309DC3 /* RxCocoa.xcconfig */;
@ -3100,6 +3062,44 @@
 			};
 			name = Debug;
 		};
+		4D7AD0A67D8B433901A66D2C58A84C6B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7D791BA4EFDA3B7135849F8080308C01 /* Alamofire.xcconfig */;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				CLANG_ENABLE_OBJC_WEAK = NO;
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_VERSION = A;
+				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/Alamofire/Alamofire-Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/Frameworks",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
+				PRODUCT_MODULE_NAME = Alamofire;
+				PRODUCT_NAME = Alamofire;
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_VERSION = 5.1;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
 		5610145CA8616F5D357807595646329E /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F80534A54E3179228E264A9A76907F63 /* RxSwift.xcconfig */;
@ -3443,6 +3443,44 @@
 			};
 			name = Debug;
 		};
+		977F103490F488B72976F53C911B4E82 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7D791BA4EFDA3B7135849F8080308C01 /* Alamofire.xcconfig */;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				CLANG_ENABLE_OBJC_WEAK = NO;
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_VERSION = A;
+				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/Alamofire/Alamofire-Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/Frameworks",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
+				PRODUCT_MODULE_NAME = Alamofire;
+				PRODUCT_NAME = Alamofire;
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_VERSION = 5.1;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
 		A54EC82C46BFB2C87D81EBCAA6FA2C67 /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F7864582729C0D6E84185C9B8C368117 /* Pods-ClashX.release.xcconfig */;
@ -3708,44 +3746,6 @@
 			};
 			name = Release;
 		};
-		ED6DE5184042CDBAFB7B0D013DDCB951 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7D791BA4EFDA3B7135849F8080308C01 /* Alamofire.xcconfig */;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				CLANG_ENABLE_OBJC_WEAK = NO;
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				FRAMEWORK_VERSION = A;
-				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/Alamofire/Alamofire-Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/../Frameworks",
-					"@loader_path/Frameworks",
-				);
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
-				PRODUCT_MODULE_NAME = Alamofire;
-				PRODUCT_NAME = Alamofire;
-				SDKROOT = macosx;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
 		ED82C140C4855C20D418C0F3F5C650AA /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 592ECC09EF9B4A37AD6192FA6A6F24E6 /* Yams.xcconfig */;
@ -3916,8 +3916,8 @@
 		E4A5194ABAF7A4780609E0E581DA6B54 /* Build configuration list for PBXNativeTarget "Alamofire" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				1E5AF1DA7C913F02BA374E93FF133463 /* Debug */,
-				ED6DE5184042CDBAFB7B0D013DDCB951 /* Release */,
+				4D7AD0A67D8B433901A66D2C58A84C6B /* Debug */,
+				977F103490F488B72976F53C911B4E82 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
--- a/Files/Alamofire/Alamofire-Info.plist
+++ b/Files/Alamofire/Alamofire-Info.plist
@ -15,7 +15,7 @@
  <key>CFBundlePackageType</key>
  <string>FMWK</string>
  <key>CFBundleShortVersionString</key>
-  <string>4.8.2</string>
+  <string>4.9.0</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>