Merge pull request #38 from RxSwiftCommunity/develop

reloni · web-flow · commit 298c027a1c7f · 2018-09-18T11:59:41.000+03:00
XCode 10 and Swift 4.2
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode10
 xcode_project: RxHttpClient.xcodeproj
 
 env:
@@ -15,7 +15,7 @@ before_install:
 
 before_script:
 - carthage version
-- carthage checkout --no-use-binaries
+- carthage checkout
 
 - mkdir -p ./Carthage/Build/iOS
 
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
 github "AliSoftware/OHHTTPStubs" "6.0.0"
-github "ReactiveX/RxSwift" "4.0.0"
+github "ReactiveX/RxSwift" "4.2.0"
diff --git a/RxHttpClient.xcodeproj/project.pbxproj b/RxHttpClient.xcodeproj/project.pbxproj
@@ -244,7 +244,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = RxSwiftCommunity;
 				TargetAttributes = {
 					6EFB9EB71D2A4E2600E30A5D = {
@@ -382,12 +382,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -439,12 +441,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -499,7 +503,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "RxHttpClient/RxHttpClient-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -524,7 +528,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "RxHttpClient/RxHttpClient-Bridging-Header.h";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
diff --git a/RxHttpClient.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/RxHttpClient.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/RxHttpClient.xcodeproj/xcshareddata/xcschemes/RxHttpClient.xcscheme b/RxHttpClient.xcodeproj/xcshareddata/xcschemes/RxHttpClient.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
+      onlyGenerateCoverageForSpecifiedTargets = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6EFB9EB71D2A4E2600E30A5D"
+            BuildableName = "RxHttpClient.framework"
+            BlueprintName = "RxHttpClient"
+            ReferencedContainer = "container:RxHttpClient.xcodeproj">
+         </BuildableReference>
+      </CodeCoverageTargets>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -56,7 +65,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/RxHttpClientTests/Fake.swift b/RxHttpClientTests/Fake.swift
@@ -6,7 +6,7 @@ class FakeDataTask : NSObject, URLSessionDataTaskType {
 	var originalRequest: URLRequest?
 	var isCancelled = false
 	var resumeInvokeCount = 0
-	let resumeClosure: (FakeDataTask) -> ()!
+	let resumeClosure: (FakeDataTask) -> ()?
 	let cancelClosure: ((FakeDataTask) -> ())?
 	
 	var state: URLSessionTask.State = URLSessionTask.State.suspended
diff --git a/RxHttpClientTests/HttpClientBasicTests.swift b/RxHttpClientTests/HttpClientBasicTests.swift
@@ -255,9 +255,10 @@ class HttpClientBasicTests: XCTestCase {
 	
 	func testCreateHttpClientWithCorrectConfiguration() {
 		let config = URLSessionConfiguration.default
+        XCTAssertNotEqual(config.httpCookieAcceptPolicy, .always)
 		config.httpCookieAcceptPolicy = .always
 		let client = HttpClient(sessionConfiguration: config)
-		XCTAssertEqual(config, client.urlSession.configuration)
+        XCTAssertEqual(config.httpCookieAcceptPolicy, client.urlSession.configuration.httpCookieAcceptPolicy)
 	}
 	
 	func testCreateHttpClientWithCorrectUrlSession() {
diff --git a/RxHttpClientTests/HttpClientCachingTests.swift b/RxHttpClientTests/HttpClientCachingTests.swift
@@ -9,7 +9,7 @@ class HttpClientCachingTests: XCTestCase {
 	
 	override func setUp() {
 		cacheDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent(UUID().uuidString)
-		try! FileManager.default.createDirectory(atPath: cacheDirectory.path, withIntermediateDirectories: false, attributes: nil)
+		try! FileManager.default.createDirectory(atPath: cacheDirectory.path, withIntermediateDirectories: true, attributes: nil)
 		client = HttpClient(urlRequestCacheProvider: UrlRequestFileSystemCacheProvider(cacheDirectory: cacheDirectory))
 	}
 	
diff --git a/RxHttpClientTests/HttpRequestFileSystemCacheProviderTests.swift b/RxHttpClientTests/HttpRequestFileSystemCacheProviderTests.swift
@@ -20,7 +20,7 @@ class HttpRequestFileSystemCacheProviderTests: XCTestCase {
 	var cacheDirectory: URL!
 	override func setUp() {
 		cacheDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent(UUID().uuidString)
-		try! FileManager.default.createDirectory(atPath: cacheDirectory.path, withIntermediateDirectories: false, attributes: nil)
+		try! FileManager.default.createDirectory(atPath: cacheDirectory.path, withIntermediateDirectories: true, attributes: nil)
 	}
 	
 	override func tearDown() {
diff --git a/RxHttpClientTests/MemoryCacheProviderTests.swift b/RxHttpClientTests/MemoryCacheProviderTests.swift
@@ -206,7 +206,7 @@ class MemoryCacheProviderTests: XCTestCase {
 	
 	func testSaveDataToSpecificDir() {
 		let dir = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent(UUID().uuidString)
-		try! FileManager.default.createDirectory(at: dir, withIntermediateDirectories: false, attributes: nil)
+		try! FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true, attributes: nil)
 		let provider = MemoryDataCacheProvider(uid: "test")
 		let testData = "Some test data string".data(using: String.Encoding.utf8)!
 		provider.append(data: testData)
diff --git a/RxHttpClientTests/NSURLTests.swift b/RxHttpClientTests/NSURLTests.swift
@@ -14,8 +14,8 @@ class NSURLTests: XCTestCase {
 	}
 		
 	func testCreateNSURLWithParameters() {
-		let url = URL(baseUrl: "http://test.com", parameters: ["param1": "value1", "param2": "value2"])
-		XCTAssertEqual(url?.absoluteString, "http://test.com?param1=value1&param2=value2")
+		let url = URL(baseUrl: "http://test.com", parameters: ["param1": "value1"])
+		XCTAssertEqual(url?.absoluteString, "http://test.com?param1=value1")
 	}
 	
 	func testCreateNSURLWithEscapedParameters() {
diff --git a/cartfile b/cartfile
@@ -1 +1 @@
-github "ReactiveX/RxSwift" == 4.0.0
+github "ReactiveX/RxSwift" == 4.2.0

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`github "AliSoftware/OHHTTPStubs" "6.0.0"`
`2`		`-github "ReactiveX/RxSwift" "4.0.0"`
	`2`	`+github "ReactiveX/RxSwift" "4.2.0"`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class HttpClientCachingTests: XCTestCase {`
`9`	`9`
`10`	`10`	`override func setUp() {`
`11`	`11`	`cacheDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent(UUID().uuidString)`
`12`		`- try! FileManager.default.createDirectory(atPath: cacheDirectory.path, withIntermediateDirectories: false, attributes: nil)`
	`12`	`+ try! FileManager.default.createDirectory(atPath: cacheDirectory.path, withIntermediateDirectories: true, attributes: nil)`
`13`	`13`	`client = HttpClient(urlRequestCacheProvider: UrlRequestFileSystemCacheProvider(cacheDirectory: cacheDirectory))`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class HttpRequestFileSystemCacheProviderTests: XCTestCase {`
`20`	`20`	`var cacheDirectory: URL!`
`21`	`21`	`override func setUp() {`
`22`	`22`	`cacheDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent(UUID().uuidString)`
`23`		`- try! FileManager.default.createDirectory(atPath: cacheDirectory.path, withIntermediateDirectories: false, attributes: nil)`
	`23`	`+ try! FileManager.default.createDirectory(atPath: cacheDirectory.path, withIntermediateDirectories: true, attributes: nil)`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`override func tearDown() {`