Skip to content

Commit

Permalink
Merge pull request #21 from ibm-bluemix-mobile-services/development
Browse files Browse the repository at this point in the history
Update version of Swift and Kitura dependency
  • Loading branch information
Anthony Oliveri authored May 2, 2017
2 parents 37bfde0 + d4d437f commit 5b1dcae
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.2
3.1.1
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ language: generic

env:
global:
- SWIFT_VERSION=3.0.2
- SWIFT_VERSION=3.1.1

notifications:
email:
Expand All @@ -17,7 +17,7 @@ sudo: required

dist: trusty

osx_image: xcode8.2
osx_image: xcode8.3

before_install:
- rvm install 2.4.0
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ let package = Package(
name: "SimpleHttpClient",
dependencies:[
.Package(url: "https://github.com/ibm-bluemix-mobile-services/bluemix-simple-logger-swift.git", majorVersion: 0, minor: 5),
.Package(url: "https://github.com/IBM-Swift/Kitura-net.git", majorVersion: 1, minor: 6)
.Package(url: "https://github.com/IBM-Swift/Kitura-net.git", majorVersion: 1, minor: 7)
]
)
2 changes: 1 addition & 1 deletion Tests/SimpleHttpClientTests/HttpClientTest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class HttpClientTests: XCTestCase {
let resource = httpsResource.resourceByAddingPathComponent(pathComponent: "/get")

HttpClient.get(resource: resource) { error, status, headers, data in
print("Status \(status)")
print("Status \(status as Optional)")
XCTAssertNil(error, "error != nil")
XCTAssertTrue(status == 200, "status != 200")
XCTAssertNotNil(headers, "headers == nil")
Expand Down

0 comments on commit 5b1dcae

Please sign in to comment.