Support Swift 1.2

Author: kylef

JSONWebToken.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |spec|
   spec.ios.deployment_target = '8.0'
   spec.osx.deployment_target = '10.9'
   spec.requires_arc = true
-  spec.dependency 'CryptoSwift', '~> 0.0.8'
+  spec.dependency 'CryptoSwift', '0.0.10'
   spec.module_name = 'JWT'
 end
 

JWT/Base64.swift

@@ -4,7 +4,7 @@ import Foundation
 /// URI Safe base64 encode
 func base64encode(input:NSData) -> String {
   let data = input.base64EncodedDataWithOptions(NSDataBase64EncodingOptions(0))
-  let string = NSString(data: data, encoding: NSUTF8StringEncoding) as String
+  let string = NSString(data: data, encoding: NSUTF8StringEncoding) as! String
   return string
     .stringByReplacingOccurrencesOfString("+", withString: "-", options: NSStringCompareOptions(0), range: nil)
     .stringByReplacingOccurrencesOfString("/", withString: "_", options: NSStringCompareOptions(0), range: nil)
@@ -13,7 +13,7 @@ func base64encode(input:NSData) -> String {
 
 /// URI Safe base64 decode
 func base64decode(input:String) -> NSData? {
-  let rem = countElements(input) % 4
+  let rem = count(input) % 4
 
   var ending = ""
   if rem > 0 {

JWT/JWT.swift

@@ -42,9 +42,11 @@ public enum Algorithm : Printable {
       return ""
 
     case .HS256(let key):
-      let mac = Authenticator.HMAC(key: key.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!, variant:.sha256)
-      let result = mac.authenticate(message.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!)!
-      return base64encode(result)
+      let keyData = key.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!
+      let messageData = message.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!
+      let mac = Authenticator.HMAC(key: keyData.arrayOfBytes(), variant:.sha256)
+      let result = mac.authenticate(messageData.arrayOfBytes())!
+      return base64encode(NSData.withBytes(result))
     }
   }
 

JWTTests/JWTTests.swift

@@ -26,15 +26,15 @@ class JWTPayloadBuilder : XCTestCase {
     JWT.encode(.None) { builder in
        builder.issuer = "fuller.li"
       XCTAssertEqual(builder.issuer!, "fuller.li")
-      XCTAssertEqual(builder["iss"] as String, "fuller.li")
+      XCTAssertEqual(builder["iss"] as! String, "fuller.li")
     }
   }
 
   func testAudience() {
     JWT.encode(.None) { builder in
       builder.audience = "cocoapods"
       XCTAssertEqual(builder.audience!, "cocoapods")
-      XCTAssertEqual(builder["aud"] as String, "cocoapods")
+      XCTAssertEqual(builder["aud"] as! String, "cocoapods")
     }
   }
 
@@ -43,7 +43,7 @@ class JWTPayloadBuilder : XCTestCase {
       let date = NSDate(timeIntervalSince1970: NSDate().timeIntervalSince1970)
       builder.expiration = date
       XCTAssertEqual(builder.expiration!, date)
-      XCTAssertEqual(builder["exp"] as NSTimeInterval, date.timeIntervalSince1970)
+      XCTAssertEqual(builder["exp"] as! NSTimeInterval, date.timeIntervalSince1970)
     }
   }
 
@@ -52,7 +52,7 @@ class JWTPayloadBuilder : XCTestCase {
       let date = NSDate(timeIntervalSince1970: NSDate().timeIntervalSince1970)
       builder.notBefore = date
       XCTAssertEqual(builder.notBefore!, date)
-      XCTAssertEqual(builder["nbf"] as NSTimeInterval, date.timeIntervalSince1970)
+      XCTAssertEqual(builder["nbf"] as! NSTimeInterval, date.timeIntervalSince1970)
     }
   }
 
@@ -61,14 +61,14 @@ class JWTPayloadBuilder : XCTestCase {
       let date = NSDate(timeIntervalSince1970: NSDate().timeIntervalSince1970)
       builder.issuedAt = date
       XCTAssertEqual(builder.issuedAt!, date)
-      XCTAssertEqual(builder["iat"] as NSTimeInterval, date.timeIntervalSince1970)
+      XCTAssertEqual(builder["iat"] as! NSTimeInterval, date.timeIntervalSince1970)
     }
   }
 
   func testCustomAttributes() {
     JWT.encode(.None) { builder in
       builder["user"] = "kyle"
-      XCTAssertEqual(builder["user"] as String, "kyle")
+      XCTAssertEqual(builder["user"] as! String, "kyle")
     }
   }
 }

Podfile.lock

@@ -1,10 +1,10 @@
 PODS:
-  - CryptoSwift (0.0.8)
+  - CryptoSwift (0.0.10)
 
 DEPENDENCIES:
-  - CryptoSwift (~> 0.0.8)
+  - CryptoSwift (= 0.0.10)
 
 SPEC CHECKSUMS:
-  CryptoSwift: 6d1b93af5b48e02e57366bfad28b00170af405ee
+  CryptoSwift: 3b886d001f50deb65623a8967d68f6b8bf8d9ba1
 
-COCOAPODS: 0.36.3
+COCOAPODS: 0.36.4