Update to Swift 5

Author: reloni

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "AliSoftware/OHHTTPStubs" "6.0.0"
+github "AliSoftware/OHHTTPStubs" "8.0.0"
 github "ReactiveX/RxSwift" "4.2.0"

RxHttpClient.xcodeproj/project.pbxproj

@@ -247,25 +247,26 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = RxSwiftCommunity;
 				TargetAttributes = {
 					6EFB9EB71D2A4E2600E30A5D = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 					};
 					6EFB9EC11D2A4E2600E30A5D = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
 			buildConfigurationList = 6EFB9EB21D2A4E2600E30A5D /* Build configuration list for PBXProject "RxHttpClient" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 6EFB9EAE1D2A4E2600E30A5D;
 			productRefGroup = 6EFB9EB91D2A4E2600E30A5D /* Products */;
@@ -377,6 +378,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -436,6 +438,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -506,8 +509,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "RxHttpClient/RxHttpClient-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -531,8 +533,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "RxHttpClient/RxHttpClient-Bridging-Header.h";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -549,8 +550,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.AntonEfimenko.RxHttpClientTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -566,8 +566,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.AntonEfimenko.RxHttpClientTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

RxHttpClient.xcodeproj/xcshareddata/xcschemes/RxHttpClient.xcscheme

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

RxHttpClient/Data+Extensions.swift

@@ -3,7 +3,7 @@ import Foundation
 extension Data {
 	func sha1() -> String {
 		var digest = [UInt8](repeating: 0, count:Int(CC_SHA1_DIGEST_LENGTH))
-		withUnsafeBytes { _ = CC_SHA1($0, CC_LONG(count), &digest) }
+        withUnsafeBytes { _ = CC_SHA1($0.baseAddress, CC_LONG(count), &digest) }
 		let hexBytes = digest.map { String(format: "%02hhx", $0) }
 		return hexBytes.joined()
 	}

RxHttpClient/DataCacheProviderType.swift

@@ -51,7 +51,7 @@ public extension DataCacheProviderType {
      If nil, extension will be inferred by MIME type, if inferring fails, extension will be "dat"
      - returns: NSURL for saved file or nil, if file not saved
      */
-	public func saveData(fileExtension: String?) -> URL? {
+	func saveData(fileExtension: String?) -> URL? {
 		return saveData(destinationDirectory: URL(fileURLWithPath: NSTemporaryDirectory()), fileExtension: fileExtension)
 	}
 
@@ -60,7 +60,7 @@ public extension DataCacheProviderType {
      Extension will be inferred by MIME type, if inferring fails, extension will be "dat"
      - returns: NSURL for saved file or nil, if file not saved
      */
-	public func saveData() -> URL? {
+	func saveData() -> URL? {
 		return saveData(fileExtension: nil)
 	}
 
@@ -70,7 +70,7 @@ public extension DataCacheProviderType {
      - parameter destinationDirectory: NSURL of directory, where data will be saved
      - returns: NSURL for saved file or nil, if file not saved
      */
-	public func saveData(destinationDirectory: URL) -> URL? {
+	func saveData(destinationDirectory: URL) -> URL? {
 		return saveData(destinationDirectory: destinationDirectory, fileExtension: nil)
 	}
 

cartfile.private

@@ -1 +1 @@
-github "AliSoftware/OHHTTPStubs" == 6.0.0
+github "AliSoftware/OHHTTPStubs" == 8.0.0