Make project compile in swift 2

Author: hzalaz

.gitignore

@@ -18,6 +18,7 @@ profile
 DerivedData
 *.hmap
 *.ipa
+*.xcscmblueprint
 
 # Bundler
 .bundle

Cartfile.private

@@ -1,4 +1,4 @@
 #Quick & Nimble
 
-github "Quick/Quick" ~> 0.3
-github "Quick/Nimble" ~> 0.4
+github "Quick/Quick" ~> 0.6
+github "Quick/Nimble" "v2.0.0-rc.3"

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "Quick/Nimble" "v0.4.2"
-github "Quick/Quick" "v0.3.1"
+github "Quick/Nimble" "811003c1e556d6fedd12a6e8b81da235a7479aca"
+github "Quick/Quick" "v0.6.0"

Carthage/Checkouts/Nimble

@@ -0,0 +1,3 @@
+//: Playground - noun: a place where people can play
+
+import JWTDecode

Carthage/Checkouts/Quick

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<playground version='5.0' target-platform='ios' requires-full-environment='true'>
+    <timeline fileName='timeline.xctimeline'/>
+</playground>

JWTDecode.playground/Contents.swift

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Timeline
+   version = "3.0">
+   <TimelineItems>
+   </TimelineItems>
+</Timeline>

JWTDecode.playground/contents.xcplayground

@@ -53,6 +53,7 @@
 		5F0069401B3C828F0048928E /* A0JWTDecodeSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = A0JWTDecodeSpec.m; sourceTree = "<group>"; };
 		5F05AF7D1B62E9C200C4A9E6 /* Nimble.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Nimble.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		5F05AF7E1B62E9C200C4A9E6 /* Quick.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Quick.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		5F0A5E291B9A6D4A005289CF /* JWTDecode.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = JWTDecode.playground; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -116,6 +117,7 @@
 		5F0068E41B3B46240048928E /* JWTDecode */ = {
 			isa = PBXGroup;
 			children = (
+				5F0A5E291B9A6D4A005289CF /* JWTDecode.playground */,
 				5F0068E71B3B46240048928E /* JWTDecode.h */,
 				5F0068E51B3B46240048928E /* Supporting Files */,
 				5F0069021B3B511F0048928E /* JWTDecode.swift */,
@@ -252,6 +254,7 @@
 		5F0068D91B3B46240048928E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 0630;
 				ORGANIZATIONNAME = Auth0;
 				TargetAttributes = {

JWTDecode.playground/timeline.xctimeline

@@ -29,7 +29,7 @@ Decodes the JWT and return it's payload
 
 :returns: the JWT payload or nil when it can be decoded
 */
-public func payload(#jwt: String) -> [String: AnyObject]? {
+public func payload(jwt jwt: String) -> [String: AnyObject]? {
     return JWTDecoder(jwt: jwt).payloadWithError(nil)
 }
 
@@ -41,7 +41,7 @@ If the `exp` claim is missing or the jwt can't be decoded it will return true
 
 :returns: if the JWT is expired or not
 */
-public func expired(#jwt: String) -> Bool {
+public func expired(jwt jwt: String) -> Bool {
     return JWTDecoder(jwt: jwt).expired
 }
 
@@ -52,7 +52,7 @@ Returns the value of the `exp` claim
 
 :returns: date that the JWT will expire or nil
 */
-public func expireDate(#jwt: String) -> NSDate? {
+public func expireDate(jwt jwt: String) -> NSDate? {
     return JWTDecoder(jwt: jwt).expireDate
 }
 
@@ -105,7 +105,15 @@ public class JWTDecoder: NSObject {
             base64 = base64.stringByAppendingString(padding)
         }
         if let data = NSData(base64EncodedString: base64, options: .IgnoreUnknownCharacters) {
-            return NSJSONSerialization.JSONObjectWithData(data, options: .allZeros, error: error) as? [String: AnyObject]
+            do {
+                let json = try NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingOptions())
+                return json as? [String: AnyObject]
+            }
+            catch let jsonError as NSError {
+                if error != nil {
+                    error.memory = jsonError
+                }
+            }
         } else {
             if error != nil {
                 error.memory = errorWithDescription(NSLocalizedString("malformed jwt token \(jwt). failed to decode base64 payload", comment: "Invalid base64"))

JWTDecode.xcodeproj/project.pbxproj

@@ -23,20 +23,19 @@
 
 #define QUICK_DISABLE_SHORT_SYNTAX 1
 
-#import <Quick/Quick.h>
-#import <Nimble/Nimble.h>
-
+@import Quick;
+@import Nimble;
 @import JWTDecode;
 
 QuickSpecBegin(A0JWTDecodeSpec)
 
-__block JWTDecoder *decoder;
+__block A0JWTDecoder *decoder;
 __block NSError *error;
 
 describe(@"Objc support", ^{
 
     beforeEach(^{
-        decoder = [[JWTDecoder alloc] initWithJwt:@"INVALID"];
+        decoder = [[A0JWTDecoder alloc] initWithJwt:@"INVALID"];
         error = nil;
     });
 

JWTDecode/JWTDecode.swift

@@ -29,13 +29,14 @@ let inTwoHours = NSDate(timeIntervalSinceNow: 2 * 60 * 60)
 
 func jwtWithPayload(payload: [String: AnyObject]) -> String {
     var jwt: String = ""
-    if let data = NSJSONSerialization.dataWithJSONObject(payload, options: .allZeros, error: nil) {
-        let base64 = data.base64EncodedStringWithOptions(.allZeros)
+    do {
+        let data = try NSJSONSerialization.dataWithJSONObject(payload, options: NSJSONWritingOptions())
+        let base64 = data.base64EncodedStringWithOptions(NSDataBase64EncodingOptions())
             .stringByReplacingOccurrencesOfString("+", withString: "-")
             .stringByReplacingOccurrencesOfString("/", withString: "_")
             .stringByReplacingOccurrencesOfString("=", withString: "")
         jwt = "HEADER.\(base64).SIGNATURE"
-    } else {
+    } catch _ {
         NSException(name: NSInvalidArgumentException, reason: "Failed to build jwt", userInfo: nil).raise()
     }
     return jwt