Merge pull request #25 from reloni/develop

Updated to Swift 3

Author: reloni

.codeclimate.yml

@@ -0,0 +1,9 @@
+---
+engines:
+  fixme:
+    enabled: true
+  tailor:
+    enabled: true
+ratings:
+  paths: []
+exclude_paths: []

.travis.yml

@@ -1,30 +1,31 @@
 language: objective-c
-osx_image: xcode7.3
+osx_image: xcode8
 xcode_project: RxHttpClient.xcodeproj
 
 env:
   global:
   #- WORKSPACE=
   - PROJECT=RxHttpClient.xcodeproj
   - FRAMEWORK_SCHEME=RxHttpClient
-  - SDK=iphonesimulator9.3
-  - DESTINATION_PLATFORM='platform=iOS Simulator,name=iPhone 6,OS=9.3'
+  - SDK=iphonesimulator10.0
+  - DESTINATION_PLATFORM='platform=iOS Simulator,name=iPhone 6s,OS=10.0'
 
 before_install:
-  - SIMULATOR_ID=$(xcrun instruments -s | grep -o "iPhone 6s (9.3) \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/")
+  - SIMULATOR_ID=$(xcrun instruments -s | grep -o "iPhone 6s (10.0) \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/")
 
 before_script:
-# inslall punic
-- brew install python
-- brew install libyaml
-- pip install --upgrade git+https://github.com/schwa/punic.git
-
 - carthage version
+- carthage checkout
+
+- mkdir -p ./Carthage/Build/iOS
+
+#build OHHTTPStubs
+- (cd ./Carthage/Checkouts/OHHTTPStubs/OHHTTPStubs && set -o pipefail && xcodebuild -scheme "OHHTTPStubs iOS Framework" -workspace "OHHTTPStubs.xcworkspace" -sdk "$SDK" -configuration Release SYMROOT=../../../../Build  | xcpretty -c)
+#build RxSwift
+- (cd ./Carthage/Checkouts/RxSwift && set -o pipefail && xcodebuild -scheme "RxSwift-iOS" -workspace "Rx.xcworkspace" -sdk "$SDK" -configuration Release SYMROOT=../../../Build  | xcpretty -c)
 
-# update OHHTTPStubs using carthage
-- carthage update OHHTTPStubs --platform iOS
-# using punic to build RxSwift framework
-- punic build RxSwift --platform iOS --configuration Release
+#copy frameworks to Carthage/Build folder
+- cp -R -f ./Build/Release-iphonesimulator/ ./Carthage/Build/iOS
 
 script:
 - open -a "simulator" --args -CurrentDeviceUDID $SIMULATOR_ID

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "AliSoftware/OHHTTPStubs" "5.1.0"
-github "ReactiveX/RxSwift" "2.6.0"
+github "AliSoftware/OHHTTPStubs" "45a2ceaebaef5ae434ffd3e2a5aef4c5ce3fa91b"
+github "ReactiveX/RxSwift" "3.0.1"

Readme.md

@@ -7,12 +7,14 @@ RxHttpClient
 
 RxHttpClient is a "reactive wrapper" around NSURLSession. Under the hood it implements session delegates (like NSURLSessionDelegate or NSURLSessionTaskDelegate) and translates session events into Observables using [RxSwift](https://github.com/ReactiveX/RxSwift). Main purpose of this framework is to make "streaming" data as simple as possible and provide convenient features for caching data.
 
-Now it is more than a preliminary version and it lacking functionality and may be unstable in some cases.
+##Requirements
+- Xcode 8.0
+- Swift 3.0
 
 ##Installation
 Now only [Carthage](https://github.com/Carthage/Carthage) supported:
 ```
-github "ReactiveX/RxSwift" ~> 2.6
+github "ReactiveX/RxSwift" ~> 3.0
 github "Reloni/RxHttpClient"
 ```
 RxHttpClient uses RxSwift so it should be included into cartfile.
@@ -29,86 +31,89 @@ For create request and streaming data:
 ```
 let client = HttpClient()
 let bag = DisposeBag()
-let url = NSURL(string: "url_to_resource")!
-client.loadStreamData(url).bindNext { event in
+let url = URL(string: "url_to_resource")!
+client.request(url: url).subscribe (onNext: { event in
   switch event {
-  case StreamTaskEvents.ReceiveResponse(let response): /* Occurs after receiving response from remote server */
-  case StreamTaskEvents.ReceiveData(let data): /* Occurs after receiving chunk of data from server (generally occurred many times) */
-  case StreamTaskEvents.Error(let error): /* Occurs in case of client-side error */
-  case StreamTaskEvents.Success: /* Occurs after successful completion of request */
+  case StreamTaskEvents.receiveResponse(let response): break /* Occurs after receiving response from remote server */
+  case StreamTaskEvents.receiveData(let data): break /* Occurs after receiving chunk of data from server (generally occurred many times) */
+  case StreamTaskEvents.error(let error): break /* Occurs in case of client-side error */
+  case StreamTaskEvents.success: break /* Occurs after successful completion of request */
   default: break
   }
-}.addDisposableTo(bag)
+}).addDisposableTo(bag)
 ```
 
 If dealing with every chunk of data is not necessary it's possible to pass an instance of cache provider and in success event grab all data from that provider (for now there is only MemoryCacheProvider object):
 ```
 let client = HttpClient()
 let bag = DisposeBag()
-let url = NSURL(string: "url_to_resource")!
-client.loadStreamData(url, cacheProvider: MemoryCacheProvider()).bindNext { event in
-  if case StreamTaskEvents.Success(let cacheProvider) = event {
-    if let cacheProvider = cacheProvider {
-      // getting cached data from provider
-      let downloadedData = cacheProvider.getCurrentData()
-    }
+let url = URL(string: "url_to_resource")!
+client.request(url: url, cacheProvider: MemoryCacheProvider()).subscribe(onNext: { event in
+  guard case StreamTaskEvents.success(let cacheProvider) = event else { return }
+
+  if let cacheProvider = cacheProvider {
+    // getting cached data from provider
+    let downloadedData = cacheProvider.getData()
   }
-}.addDisposableTo(bag)
+}).addDisposableTo(bag)
 ```
 
 ####Convenience methods
 It's also possible to simply invoke request and receive data using loadData method (in this case errors are forwarded with RxSwift error mechanism):
 ```
 let client = HttpClient()
 let bag = DisposeBag()
-let url = NSURL(string: "url_to_resource")!
-client.loadData(url)
-  .doOnError { error in
-    switch error {
-    case HttpClientError.ClientSideError(let error): /* Client-side error /*
-    case let HttpClientError.InvalidResponse(response, data): /* Occurs when server did't return success HTTP code (not in 2xx) */
-    default: break
-    }
+let url = URL(string: "url_to_resource")!
+client.requestData(url: url).subscribe(onNext: { data in /* do something with returned data */ }, onError: { error in
+  switch error {
+  case HttpClientError.clientSideError(let error): break /* Client-side error */
+  case let HttpClientError.invalidResponse(response, data): break /* Occurs when server did't return success HTTP code (not in 2xx) */
+  default: break
   }
-  .bindNext { data in
-  // do something with returned data
-}.addDisposableTo(bag)
+}).addDisposableTo(bag)
 ```
 
-Creating url request with additional HTTP headers:
+JSON deserialized object may be requested in same way:
+
 ```
 let client = HttpClient()
 let bag = DisposeBag()
-let url = NSURL(string: "url_to_resource")!
-let request = client.createUrlRequest(url, headers: ["Header": "Value"])
-client.loadData(request).bindNext { data in /* */ }.addDisposableTo(bag)
+let url = URL(string: "url_to_resource")!
+client.requestJson(url: url).subscribe(onNext: { json in /* do something with returned data */ }, onError: { error in
+  switch error {
+  case HttpClientError.clientSideError(let error): break /* Client-side error */
+  case let HttpClientError.invalidResponse(response, data): break /* Occurs when server did't return success HTTP code (not in 2xx) */
+  default: break
+  }
+}).addDisposableTo(bag)
 ```
 
 ####StreamDataTask
 StreamDataTask is a more "low level" object that wraps NSURLSessionDataTask. In most situations is't more convenient to use loadStreamData method (it actually simply forwards events from StreamDataTask), but if necessary StreamDataTask may be used in this way:
 ```
 let client = HttpClient()
 let bag = DisposeBag()
-let url = NSURL(string: "url_to_resource")!
-let request = client.createUrlRequest(url, headers: ["Header": "Value"])
-let task = client.createStreamDataTask(request, cacheProvider: nil)
+let url = URL(string: "url_to_resource")!
+//let request = client.createUrlRequest(url, headers: ["Header": "Value"])
+let request = URLRequest(url: url, headers: ["Header": "Value"])
+let task = client.createStreamDataTask(request: request, cacheProvider: nil)
 // represents same events as loadStreamData method
-task.taskProgress.bindNext { event in
+task.taskProgress.subscribe(onNext: { event in
   switch event {
-  case StreamTaskEvents.ReceiveResponse(let response): /* Occurs after receiving response from remote server */
-  case StreamTaskEvents.ReceiveData(let data): /* Occurs after receiving chunk of data from server (generally occurred many times) */
-  case StreamTaskEvents.Error(let error): /* Occurs in case of client-side error */
-  case StreamTaskEvents.Success: /* Occurs after successful completion of request */
+  case StreamTaskEvents.receiveResponse(let response): break /* Occurs after receiving response from remote server */
+  case StreamTaskEvents.receiveData(let data): break /* Occurs after receiving chunk of data from server (generally occurred many times) */
+  case StreamTaskEvents.error(let error): break /* Occurs in case of client-side error */
+  case StreamTaskEvents.success: break /* Occurs after successful completion of request */
   default: break
   }
-}.addDisposableTo(bag)
+  }).addDisposableTo(bag)
 
 // resume task
 task.resume()
 ```
 
 ##How it works
-HttpClient object holds it's own NSURLSession. It creates session by providing a session delegate object for handling session-related events. So StreamTaskEvents enum actually represents this session events, for example `case ReceiveResponse(NSURLResponse)` means that `URLSession(_:dataTask:didReceiveResponse:completionHandler:)` delegate method was invoked.
+HttpClient object holds it's own NSURLSession. It creates session by providing a session delegate object for handling session-related events. So StreamTaskEvents enum actually represents this session events, for example `case receiveResponse(URLResponse)` means that `URLSession(_:dataTask:didReceiveResponse:completionHandler:)` delegate method was invoked.
 Because NSURLSession holds strong reference to delegate it should be invalidated, HttpClient do that in deinitializer by invoking finishTasksAndInvalidate() method, so session will allow running tasks to finish work.
 
 ## Contributing

RxHttpClient.xcodeproj/project.pbxproj

@@ -17,8 +17,8 @@
 		6E81B0381D4A850100D099F1 /* HttpClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E81B0371D4A850100D099F1 /* HttpClient.swift */; };
 		6E81B03A1D4A85CF00D099F1 /* MemoryCacheProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E81B0391D4A85CF00D099F1 /* MemoryCacheProvider.swift */; };
 		6E9360EF1D2AABE100F80F76 /* RxHttpClient.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EFB9EB81D2A4E2600E30A5D /* RxHttpClient.framework */; };
+		6ED185511DC7AE1C0071BD4D /* URLRequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6ED185501DC7AE1C0071BD4D /* URLRequestTests.swift */; };
 		6EF8CA431D5664520095A634 /* StreamDataTaskTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EFB9EEB1D2A57B600E30A5D /* StreamDataTaskTests.swift */; };
-		6EFB9EBC1D2A4E2600E30A5D /* RxHttpClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EFB9EBB1D2A4E2600E30A5D /* RxHttpClient.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6EFB9EE61D2A563000E30A5D /* MimeTypeConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EFB9EE51D2A563000E30A5D /* MimeTypeConverter.swift */; };
 		6EFB9EF41D2A5BBF00E30A5D /* CacheProviderType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EFB9ED21D2A53FD00E30A5D /* CacheProviderType.swift */; };
 		6EFB9EF51D2A5BC300E30A5D /* HttpClientType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EFB9ED31D2A53FD00E30A5D /* HttpClientType.swift */; };
@@ -48,8 +48,8 @@
 		6E5B3CEF1D2D43C000775D9F /* MimeTypeConverterTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MimeTypeConverterTests.swift; sourceTree = "<group>"; };
 		6E81B0371D4A850100D099F1 /* HttpClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpClient.swift; sourceTree = "<group>"; };
 		6E81B0391D4A85CF00D099F1 /* MemoryCacheProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MemoryCacheProvider.swift; sourceTree = "<group>"; };
+		6ED185501DC7AE1C0071BD4D /* URLRequestTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLRequestTests.swift; sourceTree = "<group>"; };
 		6EFB9EB81D2A4E2600E30A5D /* RxHttpClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxHttpClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		6EFB9EBB1D2A4E2600E30A5D /* RxHttpClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RxHttpClient.h; sourceTree = "<group>"; };
 		6EFB9EBD1D2A4E2600E30A5D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6EFB9EC21D2A4E2600E30A5D /* RxHttpClientTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RxHttpClientTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		6EFB9EC91D2A4E2600E30A5D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -59,7 +59,6 @@
 		6EFB9ED71D2A53FD00E30A5D /* NSURLSessionDataEventsObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSURLSessionDataEventsObserver.swift; sourceTree = "<group>"; };
 		6EFB9ED81D2A53FD00E30A5D /* StreamDataTask.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StreamDataTask.swift; sourceTree = "<group>"; };
 		6EFB9EE51D2A563000E30A5D /* MimeTypeConverter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MimeTypeConverter.swift; sourceTree = "<group>"; };
-		6EFB9EE91D2A57B600E30A5D /* RxHttpClientTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RxHttpClientTests-Bridging-Header.h"; sourceTree = "<group>"; };
 		6EFB9EEA1D2A57B600E30A5D /* MemoryCacheProviderTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = MemoryCacheProviderTests.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		6EFB9EEB1D2A57B600E30A5D /* StreamDataTaskTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = StreamDataTaskTests.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		6EFB9EF01D2A587100E30A5D /* Fake.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = Fake.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
@@ -119,7 +118,6 @@
 				6EFB9ED71D2A53FD00E30A5D /* NSURLSessionDataEventsObserver.swift */,
 				6EFB9EE51D2A563000E30A5D /* MimeTypeConverter.swift */,
 				6EFB9EBD1D2A4E2600E30A5D /* Info.plist */,
-				6EFB9EBB1D2A4E2600E30A5D /* RxHttpClient.h */,
 			);
 			path = RxHttpClient;
 			sourceTree = "<group>";
@@ -128,14 +126,14 @@
 			isa = PBXGroup;
 			children = (
 				6EFB9EC91D2A4E2600E30A5D /* Info.plist */,
-				6EFB9EE91D2A57B600E30A5D /* RxHttpClientTests-Bridging-Header.h */,
 				6EFB9EF01D2A587100E30A5D /* Fake.swift */,
 				6EFB9EEA1D2A57B600E30A5D /* MemoryCacheProviderTests.swift */,
 				6EFB9EEB1D2A57B600E30A5D /* StreamDataTaskTests.swift */,
 				6E5B3CE71D2D1F7400775D9F /* HttpClientBasicTests.swift */,
 				6E5B3CEB1D2D32F900775D9F /* NSURLSessionTypeTests.swift */,
 				6E5B3CED1D2D3C8400775D9F /* NSURLTests.swift */,
 				6E5B3CEF1D2D43C000775D9F /* MimeTypeConverterTests.swift */,
+				6ED185501DC7AE1C0071BD4D /* URLRequestTests.swift */,
 			);
 			path = RxHttpClientTests;
 			sourceTree = "<group>";
@@ -147,7 +145,6 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6EFB9EBC1D2A4E2600E30A5D /* RxHttpClient.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -198,14 +195,16 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0730;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Anton Efimenko";
 				TargetAttributes = {
 					6EFB9EB71D2A4E2600E30A5D = {
 						CreatedOnToolsVersion = 7.3;
+						LastSwiftMigration = 0800;
 					};
 					6EFB9EC11D2A4E2600E30A5D = {
 						CreatedOnToolsVersion = 7.3;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -252,9 +251,7 @@
 			);
 			inputPaths = (
 				"$(SRCROOT)/Carthage/Build/iOS/RxSwift.framework",
-				"$(SRCROOT)/Carthage/Build/iOS/RxCocoa.framework",
 				"$(SRCROOT)/Carthage/Build/iOS/OHHTTPStubs.framework",
-				"$(SRCROOT)/Carthage/Build/iOS/RxTests.framework",
 			);
 			outputPaths = (
 			);
@@ -293,6 +290,7 @@
 				6E1329B81D47903E00BE6270 /* NSURLSessionTypeTests.swift in Sources */,
 				6E5B3CF01D2D43C000775D9F /* MimeTypeConverterTests.swift in Sources */,
 				6EFB9EFE1D2A5C8E00E30A5D /* Fake.swift in Sources */,
+				6ED185511DC7AE1C0071BD4D /* URLRequestTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -321,8 +319,10 @@
 				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_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -370,8 +370,10 @@
 				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_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -391,6 +393,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -402,6 +405,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -417,13 +421,15 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
 		6EFB9ECE1D2A4E2600E30A5D /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -438,6 +444,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.AntonEfimenko.RxHttpClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -453,8 +460,9 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.AntonEfimenko.RxHttpClientTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "RxHttpClientTests/RxHttpClientTests-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -470,7 +478,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.AntonEfimenko.RxHttpClientTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "RxHttpClientTests/RxHttpClientTests-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

RxHttpClient.xcodeproj/xcshareddata/xcschemes/RxHttpClient.xcscheme

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