Merge pull request #28 from reloni/develop

Caching

Author: reloni

.travis.yml

@@ -1,17 +1,17 @@
 language: objective-c
-osx_image: xcode8
+osx_image: xcode8.1
 xcode_project: RxHttpClient.xcodeproj
 
 env:
   global:
   #- WORKSPACE=
   - PROJECT=RxHttpClient.xcodeproj
   - FRAMEWORK_SCHEME=RxHttpClient
-  - SDK=iphonesimulator10.0
-  - DESTINATION_PLATFORM='platform=iOS Simulator,name=iPhone 6s,OS=10.0'
+  - SDK=iphonesimulator10.1
+  - DESTINATION_PLATFORM='platform=iOS Simulator,name=iPhone 6s,OS=10.1'
 
 before_install:
-  - SIMULATOR_ID=$(xcrun instruments -s | grep -o "iPhone 6s (10.0) \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/")
+#  - SIMULATOR_ID=$(xcrun instruments -s | grep -o "iPhone 6s (10.1) \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/")
 
 before_script:
 - carthage version
@@ -28,7 +28,7 @@ before_script:
 - cp -R -f ./Build/Release-iphonesimulator/ ./Carthage/Build/iOS
 
 script:
-- open -a "simulator" --args -CurrentDeviceUDID $SIMULATOR_ID
+#- open -a "simulator" --args -CurrentDeviceUDID $SIMULATOR_ID
 #- set -o pipefail && xcodebuild -scheme "$FRAMEWORK_SCHEME" -project "$PROJECT" -sdk "$SDK" -configuration Debug ONLY_ACTIVE_ARCH=YES -destination "$DESTINATION_PLATFORM" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES clean build  | xcpretty -c
 - set -o pipefail && xcodebuild -scheme "$FRAMEWORK_SCHEME" -project "$PROJECT" -sdk "$SDK" -configuration Debug ONLY_ACTIVE_ARCH=YES -destination "$DESTINATION_PLATFORM" -enableCodeCoverage YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES clean test  | xcpretty -c
 

Cartfile.resolved

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

Readme.md

@@ -8,8 +8,8 @@ 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.
 
 ##Requirements
-- Xcode 8.0
-- Swift 3.0
+- Xcode 8.1
+- Swift 3.0.1
 
 ##Installation
 Now only [Carthage](https://github.com/Carthage/Carthage) supported:
@@ -48,12 +48,12 @@ If dealing with every chunk of data is not necessary it's possible to pass an in
 let client = HttpClient()
 let bag = DisposeBag()
 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 }
+client.request(url: url, dataCacheProvider: MemoryCacheProvider()).subscribe(onNext: { event in
+  guard case StreamTaskEvents.success(let dataCacheProvider) = event else { return }
 
-  if let cacheProvider = cacheProvider {
+  if let dataCacheProvider = dataCacheProvider {
     // getting cached data from provider
-    let downloadedData = cacheProvider.getData()
+    let downloadedData = dataCacheProvider.getData()
   }
 }).addDisposableTo(bag)
 ```
@@ -88,6 +88,28 @@ client.requestJson(url: url).subscribe(onNext: { json in /* do something with re
 }).addDisposableTo(bag)
 ```
 
+####Response caching
+HttpClient can cache latest response for GET request. To use caching, HttpClient should be initialized with instance of UrlRequestCacheProviderType:
+
+```
+// directory where cache data will be saved
+let cacheDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent("Cache")
+// instance of UrlRequestFileSystemCacheProvider that will store cached data in specified directory
+let urlCacheProvider = UrlRequestFileSystemCacheProvider(cacheDirectory: cacheDirectory)
+let client = HttpClient(urlRequestCacheProvider: urlCacheProvider)
+
+// Use specific cache mode for request
+// If data for URL already cached, this data will be returned immediately and after that request to the server will be invoked
+client.requestJson(url: url, requestCacheMode: CacheMode(cacheResponse: true, returnCachedResponse: true, invokeRequest: true)).subscribe( /* */).addDisposableTo(bag)
+
+// If returnCachedResponse is false, cached data will not be returned even if exists
+client.requestJson(url: url, requestCacheMode: CacheMode(cacheResponse: true, returnCachedResponse: false, invokeRequest: true)).subscribe( /* */).addDisposableTo(bag)
+
+// use predefined mode
+// "offline mode", use only cache and don't invoke request to server
+client.requestJson(url: url, requestCacheMode: .cacheOnly).subscribe( /* */).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:
 ```
@@ -112,6 +134,16 @@ task.taskProgress.subscribe(onNext: { event in
 task.resume()
 ```
 
+####MIME type conversion
+This framework also contains useful methods to convert, for example, MIME type to file extension, or UTI type to MIME type:
+```
+let extension = MimeTypeConverter.utiToFileExtension("public.mp3") // returns "mp3"
+let uti = MimeTypeConverter.mimeToUti("audio/mpeg") // returns "public.mp3"
+
+// it also works with strings
+let mime = "public.mp3".asUtiType.mimeType // returns "audio/mpeg"
+```
+
 ##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(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.

RxHttpClient.xcodeproj/project.pbxproj

@@ -10,13 +10,24 @@
 		6E1329B51D47769500BE6270 /* HttpClientBasicTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E5B3CE71D2D1F7400775D9F /* HttpClientBasicTests.swift */; };
 		6E1329B71D478B7600BE6270 /* MemoryCacheProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EFB9EEA1D2A57B600E30A5D /* MemoryCacheProviderTests.swift */; };
 		6E1329B81D47903E00BE6270 /* NSURLSessionTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E5B3CEB1D2D32F900775D9F /* NSURLSessionTypeTests.swift */; };
+		6E190F881DECC316002BA10F /* Data+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E190F851DECC316002BA10F /* Data+Extensions.swift */; };
+		6E190F891DECC316002BA10F /* HttpRequestCacheProviderType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E190F861DECC316002BA10F /* HttpRequestCacheProviderType.swift */; };
+		6E190F8A1DECC316002BA10F /* RxHttpClient-Bridging-Header.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E190F871DECC316002BA10F /* RxHttpClient-Bridging-Header.h */; };
+		6E190F8D1DECC320002BA10F /* HttpClientCachingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E190F8B1DECC320002BA10F /* HttpClientCachingTests.swift */; };
+		6E190F8E1DECC320002BA10F /* HttpRequestFileSystemCacheProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E190F8C1DECC320002BA10F /* HttpRequestFileSystemCacheProviderTests.swift */; };
 		6E1C07C21D48FF92009513FD /* HttpClientType+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E1C07C11D48FF92009513FD /* HttpClientType+Extensions.swift */; };
+		6E2690311DEB49BC00EA5CCE /* (null) in Sources */ = {isa = PBXBuildFile; };
+		6E42A8C01DEA26FE003687E3 /* (null) in Sources */ = {isa = PBXBuildFile; };
+		6E42A8C41DEA2EA8003687E3 /* (null) in Sources */ = {isa = PBXBuildFile; };
+		6E4823B11DECAF1900F1A8DC /* (null) in Sources */ = {isa = PBXBuildFile; };
+		6E4823B41DECBD1B00F1A8DC /* MimeType+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E4823B31DECBD1B00F1A8DC /* MimeType+Extensions.swift */; };
 		6E556B591D57447A00E43388 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E556B581D57447A00E43388 /* RxSwift.framework */; };
 		6E5B3CEE1D2D3C8400775D9F /* NSURLTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E5B3CED1D2D3C8400775D9F /* NSURLTests.swift */; };
 		6E5B3CF01D2D43C000775D9F /* MimeTypeConverterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E5B3CEF1D2D43C000775D9F /* MimeTypeConverterTests.swift */; };
 		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 */; };
+		6EADD70B1DEB4528006DE223 /* Data+ExtensionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EADD70A1DEB4528006DE223 /* Data+ExtensionsTests.swift */; };
 		6ED185511DC7AE1C0071BD4D /* URLRequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6ED185501DC7AE1C0071BD4D /* URLRequestTests.swift */; };
 		6EF8CA431D5664520095A634 /* StreamDataTaskTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EFB9EEB1D2A57B600E30A5D /* StreamDataTaskTests.swift */; };
 		6EFB9EE61D2A563000E30A5D /* MimeTypeConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EFB9EE51D2A563000E30A5D /* MimeTypeConverter.swift */; };
@@ -40,14 +51,21 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		6E190F851DECC316002BA10F /* Data+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Data+Extensions.swift"; sourceTree = "<group>"; };
+		6E190F861DECC316002BA10F /* HttpRequestCacheProviderType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpRequestCacheProviderType.swift; sourceTree = "<group>"; };
+		6E190F871DECC316002BA10F /* RxHttpClient-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RxHttpClient-Bridging-Header.h"; sourceTree = "<group>"; };
+		6E190F8B1DECC320002BA10F /* HttpClientCachingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpClientCachingTests.swift; sourceTree = "<group>"; };
+		6E190F8C1DECC320002BA10F /* HttpRequestFileSystemCacheProviderTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpRequestFileSystemCacheProviderTests.swift; sourceTree = "<group>"; };
 		6E1C07C11D48FF92009513FD /* HttpClientType+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "HttpClientType+Extensions.swift"; sourceTree = "<group>"; };
+		6E4823B31DECBD1B00F1A8DC /* MimeType+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "MimeType+Extensions.swift"; sourceTree = "<group>"; };
 		6E556B581D57447A00E43388 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = "<group>"; };
 		6E5B3CE71D2D1F7400775D9F /* HttpClientBasicTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = HttpClientBasicTests.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		6E5B3CEB1D2D32F900775D9F /* NSURLSessionTypeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = NSURLSessionTypeTests.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		6E5B3CED1D2D3C8400775D9F /* NSURLTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSURLTests.swift; sourceTree = "<group>"; };
 		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>"; };
+		6EADD70A1DEB4528006DE223 /* Data+ExtensionsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Data+ExtensionsTests.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; };
 		6EFB9EBD1D2A4E2600E30A5D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -107,6 +125,9 @@
 		6EFB9EBA1D2A4E2600E30A5D /* RxHttpClient */ = {
 			isa = PBXGroup;
 			children = (
+				6E190F851DECC316002BA10F /* Data+Extensions.swift */,
+				6E190F861DECC316002BA10F /* HttpRequestCacheProviderType.swift */,
+				6E190F871DECC316002BA10F /* RxHttpClient-Bridging-Header.h */,
 				6EFE01CD1D5A5E1E007CE72A /* HttpClientError.swift */,
 				6EFB9ED31D2A53FD00E30A5D /* HttpClientType.swift */,
 				6E1C07C11D48FF92009513FD /* HttpClientType+Extensions.swift */,
@@ -117,6 +138,7 @@
 				6EFB9ED41D2A53FD00E30A5D /* HttpExtensions.swift */,
 				6EFB9ED71D2A53FD00E30A5D /* NSURLSessionDataEventsObserver.swift */,
 				6EFB9EE51D2A563000E30A5D /* MimeTypeConverter.swift */,
+				6E4823B31DECBD1B00F1A8DC /* MimeType+Extensions.swift */,
 				6EFB9EBD1D2A4E2600E30A5D /* Info.plist */,
 			);
 			path = RxHttpClient;
@@ -125,15 +147,18 @@
 		6EFB9EC61D2A4E2600E30A5D /* RxHttpClientTests */ = {
 			isa = PBXGroup;
 			children = (
-				6EFB9EC91D2A4E2600E30A5D /* Info.plist */,
 				6EFB9EF01D2A587100E30A5D /* Fake.swift */,
+				6E5B3CE71D2D1F7400775D9F /* HttpClientBasicTests.swift */,
+				6E190F8B1DECC320002BA10F /* HttpClientCachingTests.swift */,
+				6E190F8C1DECC320002BA10F /* HttpRequestFileSystemCacheProviderTests.swift */,
 				6EFB9EEA1D2A57B600E30A5D /* MemoryCacheProviderTests.swift */,
 				6EFB9EEB1D2A57B600E30A5D /* StreamDataTaskTests.swift */,
-				6E5B3CE71D2D1F7400775D9F /* HttpClientBasicTests.swift */,
 				6E5B3CEB1D2D32F900775D9F /* NSURLSessionTypeTests.swift */,
 				6E5B3CED1D2D3C8400775D9F /* NSURLTests.swift */,
 				6E5B3CEF1D2D43C000775D9F /* MimeTypeConverterTests.swift */,
 				6ED185501DC7AE1C0071BD4D /* URLRequestTests.swift */,
+				6EADD70A1DEB4528006DE223 /* Data+ExtensionsTests.swift */,
+				6EFB9EC91D2A4E2600E30A5D /* Info.plist */,
 			);
 			path = RxHttpClientTests;
 			sourceTree = "<group>";
@@ -145,6 +170,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6E190F8A1DECC316002BA10F /* RxHttpClient-Bridging-Header.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -266,13 +292,18 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6E42A8C01DEA26FE003687E3 /* (null) in Sources */,
+				6E190F881DECC316002BA10F /* Data+Extensions.swift in Sources */,
 				6EFB9EF91D2A5BC300E30A5D /* StreamDataTask.swift in Sources */,
 				6EFB9EE61D2A563000E30A5D /* MimeTypeConverter.swift in Sources */,
 				6E81B0381D4A850100D099F1 /* HttpClient.swift in Sources */,
+				6E190F891DECC316002BA10F /* HttpRequestCacheProviderType.swift in Sources */,
 				6EFE01CE1D5A5E1E007CE72A /* HttpClientError.swift in Sources */,
 				6EFB9EF41D2A5BBF00E30A5D /* CacheProviderType.swift in Sources */,
+				6E42A8C41DEA2EA8003687E3 /* (null) in Sources */,
 				6EFB9EF51D2A5BC300E30A5D /* HttpClientType.swift in Sources */,
 				6E81B03A1D4A85CF00D099F1 /* MemoryCacheProvider.swift in Sources */,
+				6E4823B41DECBD1B00F1A8DC /* MimeType+Extensions.swift in Sources */,
 				6E1C07C21D48FF92009513FD /* HttpClientType+Extensions.swift in Sources */,
 				6EFB9EF61D2A5BC300E30A5D /* HttpExtensions.swift in Sources */,
 				6EFB9EF81D2A5BC300E30A5D /* NSURLSessionDataEventsObserver.swift in Sources */,
@@ -284,11 +315,16 @@
 			buildActionMask = 2147483647;
 			files = (
 				6EF8CA431D5664520095A634 /* StreamDataTaskTests.swift in Sources */,
+				6EADD70B1DEB4528006DE223 /* Data+ExtensionsTests.swift in Sources */,
+				6E4823B11DECAF1900F1A8DC /* (null) in Sources */,
 				6E5B3CEE1D2D3C8400775D9F /* NSURLTests.swift in Sources */,
 				6E1329B51D47769500BE6270 /* HttpClientBasicTests.swift in Sources */,
+				6E2690311DEB49BC00EA5CCE /* (null) in Sources */,
+				6E190F8D1DECC320002BA10F /* HttpClientCachingTests.swift in Sources */,
 				6E1329B71D478B7600BE6270 /* MemoryCacheProviderTests.swift in Sources */,
 				6E1329B81D47903E00BE6270 /* NSURLSessionTypeTests.swift in Sources */,
 				6E5B3CF01D2D43C000775D9F /* MimeTypeConverterTests.swift in Sources */,
+				6E190F8E1DECC320002BA10F /* HttpRequestFileSystemCacheProviderTests.swift in Sources */,
 				6EFB9EFE1D2A5C8E00E30A5D /* Fake.swift in Sources */,
 				6ED185511DC7AE1C0071BD4D /* URLRequestTests.swift in Sources */,
 			);
@@ -420,6 +456,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.AntonEfimenko.RxHttpClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "RxHttpClient/RxHttpClient-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0;
 			};
@@ -444,6 +481,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.AntonEfimenko.RxHttpClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "RxHttpClient/RxHttpClient-Bridging-Header.h";
 				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
@@ -460,9 +498,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 = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 3.0.1;
 			};
 			name = Debug;
 		};
@@ -478,8 +515,7 @@
 				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 = "";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 3.0.1;
 			};
 			name = Release;
 		};