Skip to content

Commit

Permalink
Adds Xcode 8.2.1 / Swift 3.0 check.
Browse files Browse the repository at this point in the history
  • Loading branch information
kzaher committed Apr 30, 2017
1 parent 17b58f9 commit cdb7608
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ matrix:

- os: linux
env: TEST=iOS-Example
include:
- os: osx
osx_image: xcode8.2
env: TEST=iOS

notifications:
slack: rxswift:3ykt2Z61f8GkdvhCZTYPduOL
Expand Down
6 changes: 5 additions & 1 deletion RxCocoa/Foundation/URLSession+Rx.swift
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,11 @@ extension Reactive where Base: URLSession {
if Logging.URLRequests(request) {
let interval = Date().timeIntervalSince(d ?? Date())
print(convertURLRequestToCurlCommand(request))
print(convertResponseToString(response, error.map { $0 as NSError }, interval))
#if os(Linux)
print(convertResponseToString(response, error.flatMap { $0 as NSError }, interval))
#else
print(convertResponseToString(response, error.map { $0 as NSError }, interval))
#endif
}

guard let response = response, let data = data else {
Expand Down
1 change: 1 addition & 0 deletions scripts/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ function action() {
fi

set -x
mkdir -p build
killall Simulator || true
xcodebuild -workspace "${WORKSPACE}" \
-scheme "${SCHEME}" \
Expand Down

0 comments on commit cdb7608

Please sign in to comment.