Merge pull request #55 from rheinfabrik/feature/circle-ci

Circle CI
trivago · May 13, 2015 · e353fcc · e353fcc
2 parents 45f871e + de5a77a
commit e353fcc
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/Cartfile b/Cartfile
@@ -1,3 +1,3 @@
-github "LlamaKit/LlamaKit" ~> 0.5
-github "thoughtbot/Argo" ~> 0.3
-github "kishikawakatsumi/KeychainAccess" ~> 1.1
+github "LlamaKit/LlamaKit" ~> 0.6
+github "thoughtbot/Argo" ~> 0.4
+github "kishikawakatsumi/KeychainAccess" ~> 1.2
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
-github "Quick/Quick" ~> 0.2
-github "Quick/Nimble" ~> 0.3
+github "Quick/Quick" ~> 0.3
+github "Quick/Nimble" ~> 0.4
 github "AliSoftware/OHHTTPStubs" "8f0f04866a2ffa1309527dd228151bba68b7fbae"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,7 +1,7 @@
-github "kishikawakatsumi/KeychainAccess" "v1.1.3"
-github "LlamaKit/LlamaKit" "v0.5.0"
-github "Quick/Nimble" "v0.3.1"
+github "kishikawakatsumi/KeychainAccess" "v1.2.0"
+github "LlamaKit/LlamaKit" "v0.6.0"
+github "Quick/Nimble" "v0.4.2"
 github "AliSoftware/OHHTTPStubs" "8f0f04866a2ffa1309527dd228151bba68b7fbae"
-github "Quick/Quick" "v0.2.2"
-github "thoughtbot/runes" "v1.1.1"
-github "thoughtbot/Argo" "v0.3.4"
+github "Quick/Quick" "v0.3.1"
+github "thoughtbot/runes" "v1.2.2"
+github "thoughtbot/Argo" "v0.4.3"
diff --git a/Heimdall/Heimdall.swift b/Heimdall/Heimdall.swift
@@ -123,7 +123,7 @@ public class Heimdall {
         httpClient.sendRequest(request) { data, response, error in
             if let error = error {
                 completion(failure(error))
-            } else if (response as NSHTTPURLResponse).statusCode == 200 {
+            } else if (response as! NSHTTPURLResponse).statusCode == 200 {
                 if let accessToken = OAuthAccessToken.decode(data) {
                     self.accessToken = accessToken
                     completion(success(accessToken))

diff --git a/Heimdall/HeimdallResourceRequestAuthenticatorHTTPAuthorizationHeader.swift b/Heimdall/HeimdallResourceRequestAuthenticatorHTTPAuthorizationHeader.swift
@@ -17,7 +17,7 @@ public class HeimdallResourceRequestAuthenticatorHTTPAuthorizationHeader: Heimda
     ///
     /// :returns: The authenticated request.
     public func authenticateResourceRequest(request: NSURLRequest, accessToken: OAuthAccessToken) -> NSURLRequest {
-        var mutableRequest = request.mutableCopy() as NSMutableURLRequest
+        var mutableRequest = request.mutableCopy() as! NSMutableURLRequest
         mutableRequest.setHTTPAuthorization(.AccessTokenAuthentication(accessToken))
         return mutableRequest
     }

diff --git a/HeimdallTests/HeimdallSpec.swift b/HeimdallTests/HeimdallSpec.swift
@@ -23,7 +23,7 @@ class OAuthAccessTokenMockStore: OAuthAccessTokenStore {
 
 class HeimdallResourceRequestMockAuthenticator: HeimdallResourceRequestAuthenticator {
     func authenticateResourceRequest(request: NSURLRequest, accessToken: OAuthAccessToken) -> NSURLRequest {
-        var mutableRequest = request.mutableCopy() as NSMutableURLRequest
+        var mutableRequest = request.mutableCopy() as! NSMutableURLRequest
         mutableRequest.addValue("totally", forHTTPHeaderField: "MockAuthorized")
         return mutableRequest
     }
@@ -94,7 +94,7 @@ class HeimdallSpec: QuickSpec {
 
                 beforeEach {
                     OHHTTPStubs.stubRequestsPassingTest({ request in
-                        return (request.URL.absoluteString! == "http://rheinfabrik.de")
+                        return (request.URL!.absoluteString! == "http://rheinfabrik.de")
                     }, withStubResponse: { request in
                         return OHHTTPStubsResponse(data: NSData(contentsOfFile: self.bundle.pathForResource("authorize-valid", ofType: "json")!), statusCode: 200, headers: [ "Content-Type": "application/json" ])
                     })
@@ -126,7 +126,7 @@ class HeimdallSpec: QuickSpec {
 
                 beforeEach {
                     OHHTTPStubs.stubRequestsPassingTest({ request in
-                        return (request.URL.absoluteString! == "http://rheinfabrik.de")
+                        return (request.URL!.absoluteString! == "http://rheinfabrik.de")
                         }, withStubResponse: { request in
                             return OHHTTPStubsResponse(data: NSData(contentsOfFile: self.bundle.pathForResource("authorize-error", ofType: "json")!), statusCode: 400, headers: nil)
                     })
@@ -162,7 +162,7 @@ class HeimdallSpec: QuickSpec {
 
                 beforeEach {
                     OHHTTPStubs.stubRequestsPassingTest({ request in
-                        return (request.URL.absoluteString! == "http://rheinfabrik.de")
+                        return (request.URL!.absoluteString! == "http://rheinfabrik.de")
                         }, withStubResponse: { request in
                             return OHHTTPStubsResponse(data: NSData(contentsOfFile: self.bundle.pathForResource("authorize-invalid", ofType: "json")!), statusCode: 200, headers: [ "Content-Type": "application/json" ])
                     })
@@ -197,7 +197,7 @@ class HeimdallSpec: QuickSpec {
 
                 beforeEach {
                     OHHTTPStubs.stubRequestsPassingTest({ request in
-                        return (request.URL.absoluteString! == "http://rheinfabrik.de")
+                        return (request.URL!.absoluteString! == "http://rheinfabrik.de")
                         }, withStubResponse: { request in
                             return OHHTTPStubsResponse(data: NSData(contentsOfFile: self.bundle.pathForResource("authorize-invalid-token", ofType: "json")!), statusCode: 200, headers: [ "Content-Type": "application/json" ])
                     })
@@ -233,7 +233,7 @@ class HeimdallSpec: QuickSpec {
 
                 beforeEach {
                     OHHTTPStubs.stubRequestsPassingTest({ request in
-                        return (request.URL.absoluteString! == "http://rheinfabrik.de")
+                        return (request.URL!.absoluteString! == "http://rheinfabrik.de")
                         }, withStubResponse: { request in
                             return OHHTTPStubsResponse(data: NSData(contentsOfFile: self.bundle.pathForResource("authorize-invalid-type", ofType: "json")!), statusCode: 200, headers: [ "Content-Type": "application/json" ])
                     })
@@ -302,7 +302,7 @@ class HeimdallSpec: QuickSpec {
 
                 beforeEach {
                     OHHTTPStubs.stubRequestsPassingTest({ request in
-                        return (request.URL.absoluteString! == "http://rheinfabrik.de")
+                        return (request.URL!.absoluteString! == "http://rheinfabrik.de")
                         }, withStubResponse: { request in
                             return OHHTTPStubsResponse(data: NSData(contentsOfFile: self.bundle.pathForResource("request-valid", ofType: "json")!), statusCode: 200, headers: [ "Content-Type": "application/json" ])
                     })
@@ -334,7 +334,7 @@ class HeimdallSpec: QuickSpec {
 
                 beforeEach {
                     OHHTTPStubs.stubRequestsPassingTest({ request in
-                        return (request.URL.absoluteString! == "http://rheinfabrik.de")
+                        return (request.URL!.absoluteString! == "http://rheinfabrik.de")
                         }, withStubResponse: { request in
                             return OHHTTPStubsResponse(data: NSData(contentsOfFile: self.bundle.pathForResource("request-invalid-norefresh", ofType: "json")!), statusCode: 200, headers: [ "Content-Type": "application/json" ])
                     })
@@ -371,7 +371,7 @@ class HeimdallSpec: QuickSpec {
                 beforeEach {
                     OHHTTPStubs.stubRequestsPassingTest({ request in
                         return (
-                            request.URL.absoluteString! == "http://rheinfabrik.de"
+                            request.URL!.absoluteString! == "http://rheinfabrik.de"
                             && heimdall.hasAccessToken == false
                             )
                     }, withStubResponse: { request in
@@ -391,7 +391,7 @@ class HeimdallSpec: QuickSpec {
 
                     beforeEach {
                         OHHTTPStubs.stubRequestsPassingTest({ request in
-                            return (request.URL.absoluteString! == "http://rheinfabrik.de")
+                            return (request.URL!.absoluteString! == "http://rheinfabrik.de")
                         }, withStubResponse: { request in
                             return OHHTTPStubsResponse(data: NSData(contentsOfFile: self.bundle.pathForResource("request-valid", ofType: "json")!), statusCode: 200, headers: [ "Content-Type": "application/json" ])
                         })
@@ -415,7 +415,7 @@ class HeimdallSpec: QuickSpec {
 
                     beforeEach {
                         OHHTTPStubs.stubRequestsPassingTest({ request in
-                            return (request.URL.absoluteString! == "http://rheinfabrik.de")
+                            return (request.URL!.absoluteString! == "http://rheinfabrik.de")
                         }, withStubResponse: { request in
                             return OHHTTPStubsResponse(data: NSData(contentsOfFile: self.bundle.pathForResource("authorize-error", ofType: "json")!), statusCode: 400, headers: [ "Content-Type": "application/json" ])
                         })

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Heimdall is an [OAuth 2.0](https://tools.ietf.org/html/rfc6749) client specifica
 
 If you are familiar with [ReactiveCocoa](https://github.com/ReactiveCocoa/ReactiveCocoa), also check out [ReactiveHeimdall](https://github.com/rheinfabrik/ReactiveHeimdall)!
 
-[![Build Status](https://travis-ci.org/rheinfabrik/Heimdall.swift.svg)](https://travis-ci.org/rheinfabrik/Heimdall.swift)
+[![Build Status](https://circleci.com/gh/rheinfabrik/Heimdall.swift.svg?style=shield&circle-token=06d0c39133fae3dd9b649c116776c7f882885f1f)](https://circleci.com/gh/rheinfabrik/Heimdall.swift)
 
 ## Example
 

diff --git a/circle.yml b/circle.yml
@@ -0,0 +1,10 @@
+machine:
+  xcode:
+    version: "6.3.1"
+dependencies:
+  pre:
+    - sudo chown :wheel /Library/Developer/CoreSimulator/Profiles/Runtimes/iOS\ *.simruntime/Contents/Resources/RuntimeRoot/usr/lib/dyld_sim
+    - brew install carthage
+test:
+  override:
+    - scripts/cibuild