Update to Swift 2.0

Base32.xcodeproj/project.pbxproj

@@ -422,6 +422,7 @@
 		6CA0A78F1A74E80600AC539F /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 0610;
 				ORGANIZATIONNAME = "Norio Nomura";
 				TargetAttributes = {

Base32.xcodeproj/project.xcworkspace/xcshareddata/Base32.xcscmblueprint

@@ -0,0 +1,30 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "7C922E6AF074E8F10ED7485A9EEA80ACEF122127",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "E084C86B03F81D63323C9E7510697EA528A758C7" : 0,
+    "7C922E6AF074E8F10ED7485A9EEA80ACEF122127" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "C8D6FFE0-EE4F-46EF-90D6-E69AD6692B80",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "E084C86B03F81D63323C9E7510697EA528A758C7" : "Base32\/Carthage\/Checkouts\/xcconfigs\/",
+    "7C922E6AF074E8F10ED7485A9EEA80ACEF122127" : "Base32\/"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "Base32",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 203,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Base32.xcodeproj",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/yageek\/Base32.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "7C922E6AF074E8F10ED7485A9EEA80ACEF122127"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/jspahrsummers\/xcconfigs.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "E084C86B03F81D63323C9E7510697EA528A758C7"
+    }
+  ]
+}

Base32/Base16.swift

@@ -11,7 +11,7 @@ import Foundation
 // MARK: - Base16 NSData <-> String
 
 public func base16Encode(data: NSData, uppercase: Bool = true) -> String {
-    return base16encode(data.bytes, data.length, uppercase: uppercase)
+    return base16encode(data.bytes, length: data.length, uppercase: uppercase)
 }
 
 public func base16DecodeToData(string: String) -> NSData? {
@@ -25,7 +25,7 @@ public func base16DecodeToData(string: String) -> NSData? {
 // MARK: - Base16 [UInt8] <-> String
 
 public func base16Encode(array: [UInt8], uppercase: Bool = true) -> String {
-    return base16encode(array, array.count, uppercase: uppercase)
+    return base16encode(array, length: array.count, uppercase: uppercase)
 }
 
 public func base16Decode(string: String) -> [UInt8]? {
@@ -42,7 +42,7 @@ extension String {
     
     public var base16EncodedString: String {
         return nulTerminatedUTF8.withUnsafeBufferPointer {
-            return base16encode($0.baseAddress, $0.count - 1)
+            return base16encode($0.baseAddress, length: $0.count - 1)
         }
     }
     
@@ -77,7 +77,7 @@ extension NSData {
 // MARK: encode
 private func base16encode(data: UnsafePointer<Void>, length: Int, uppercase: Bool = true) -> String {
     let array = UnsafeBufferPointer<UInt8>(start: UnsafePointer<UInt8>(data), count: length)
-    return map(array) { String(format: uppercase ? "%02X" : "%02x", $0) }.reduce("", combine: +)
+    return array.map { String(format: uppercase ? "%02X" : "%02x", $0) }.reduce("", combine: +)
 }
 
 // MARK: decode
@@ -88,7 +88,7 @@ extension UnicodeScalar {
         case "a"..."f": return UInt8(value - UnicodeScalar("a").value + 0xa)
         case "A"..."F": return UInt8(value - UnicodeScalar("A").value + 0xa)
         default:
-            println("base16decode: Invalid hex character \(self)")
+            print("base16decode: Invalid hex character \(self)")
             return nil
         }
     }
@@ -98,7 +98,7 @@ private func base16decode(string: String) -> [UInt8]? {
     // validate length
     let lenght = string.nulTerminatedUTF8.count - 1
     if lenght % 2 != 0 {
-        println("base16decode: String must contain even number of characters")
+        print("base16decode: String must contain even number of characters")
         return nil
     }
     var g = string.unicodeScalars.generate()

Base32/Base32.swift

@@ -13,15 +13,15 @@ import Foundation
 // MARK: - Base32 NSData <-> String
 
 public func base32Encode(data: NSData) -> String {
-    return base32encode(data.bytes, data.length, alphabetEncodeTable)
+    return base32encode(data.bytes, length: data.length, table: alphabetEncodeTable)
 }
 
 public func base32HexEncode(data: NSData) -> String {
-    return base32encode(data.bytes, data.length, extendedHexAlphabetEncodeTable)
+    return base32encode(data.bytes, length: data.length, table: extendedHexAlphabetEncodeTable)
 }
 
 public func base32DecodeToData(string: String) -> NSData? {
-    if let array = base32decode(string, alphabetDecodeTable) {
+    if let array = base32decode(string, table: alphabetDecodeTable) {
         return NSData(bytes: array, length: array.count)
     } else {
         return nil
@@ -29,7 +29,7 @@ public func base32DecodeToData(string: String) -> NSData? {
 }
 
 public func base32HexDecodeToData(string: String) -> NSData? {
-    if let array = base32decode(string, extendedHexAlphabetDecodeTable) {
+    if let array = base32decode(string, table: extendedHexAlphabetDecodeTable) {
         return NSData(bytes: array, length: array.count)
     } else {
         return nil
@@ -39,19 +39,19 @@ public func base32HexDecodeToData(string: String) -> NSData? {
 // MARK: - Base32 [UInt8] <-> String
 
 public func base32Encode(array: [UInt8]) -> String {
-    return base32encode(array, array.count, alphabetEncodeTable)
+    return base32encode(array, length: array.count, table: alphabetEncodeTable)
 }
 
 public func base32HexEncode(array: [UInt8]) -> String {
-    return base32encode(array, array.count, extendedHexAlphabetEncodeTable)
+    return base32encode(array, length: array.count, table: extendedHexAlphabetEncodeTable)
 }
 
 public func base32Decode(string: String) -> [UInt8]? {
-    return base32decode(string, alphabetDecodeTable)
+    return base32decode(string, table: alphabetDecodeTable)
 }
 
 public func base32HexDecode(string: String) -> [UInt8]? {
-    return base32decode(string, extendedHexAlphabetDecodeTable)
+    return base32decode(string, table: extendedHexAlphabetDecodeTable)
 }
 
 // MARK: extensions
@@ -64,7 +64,7 @@ extension String {
     
     public var base32EncodedString: String {
         return nulTerminatedUTF8.withUnsafeBufferPointer {
-            return base32encode($0.baseAddress, $0.count - 1, alphabetEncodeTable)
+            return base32encode($0.baseAddress, length: $0.count - 1, table: alphabetEncodeTable)
         }
     }
     
@@ -83,7 +83,7 @@ extension String {
     
     public var base32HexEncodedString: String {
         return nulTerminatedUTF8.withUnsafeBufferPointer {
-            return base32encode($0.baseAddress, $0.count - 1, extendedHexAlphabetEncodeTable)
+            return base32encode($0.baseAddress, length: $0.count - 1, table: extendedHexAlphabetEncodeTable)
         }
     }
     
@@ -273,14 +273,14 @@ let extendedHexAlphabetDecodeTable: [UInt8] = [
 
 
 private func base32decode(string: String, table: [UInt8]) -> [UInt8]? {
-    let length = count(string.unicodeScalars)
+    let length = string.unicodeScalars.count
     if length == 0 {
         return []
     }
     
     // search element index that condition is true.
     func index_of<C : CollectionType where C.Generator.Element : Equatable>(domain: C, condition: C.Generator.Element -> Bool) -> C.Index? {
-        return find(lazy(domain).map(condition), true)
+        return lazy(domain).map(condition).indexOf(true)
     }
     
     // calc padding length
@@ -300,12 +300,12 @@ private func base32decode(string: String, table: [UInt8]) -> [UInt8]? {
     
     // validate string
     let leastPaddingLength = getLeastPaddingLength(string)
-    if let index = index_of(string.unicodeScalars, {$0.value > 0xff || table[Int($0.value)] > 31}) {
+    if let index = index_of(string.unicodeScalars, condition: {$0.value > 0xff || table[Int($0.value)] > 31}) {
         // index points padding "=" or invalid character that table does not contain.
         let pos = distance(string.unicodeScalars.startIndex, index)
         // if pos points padding "=", it's valid.
         if pos != length - leastPaddingLength {
-            println("string contains some invalid characters.")
+            print("string contains some invalid characters.")
             return nil
         }
     }
@@ -320,7 +320,7 @@ private func base32decode(string: String, table: [UInt8]) -> [UInt8]? {
     case 5: additionalBytes = 3
     case 7: additionalBytes = 4
     default:
-        println("string length is invalid.")
+        print("string length is invalid.")
         return nil
     }
     

Base32Tests/Base32Tests.swift

@@ -38,7 +38,7 @@ class Base32Tests: XCTestCase {
         let convertedVectors = self.vectors.map {($0.dataUsingUTF8StringEncoding, $1, $2)}
         self.measureBlock{
             for _ in 0...100 {
-                for (test, expect, expectHex) in convertedVectors {
+                for (test, expect, _) in convertedVectors {
                     let result = base32Encode(test)
                     XCTAssertEqual(result, expect, "base32Encode for \(test)")
                 }
@@ -50,7 +50,7 @@ class Base32Tests: XCTestCase {
         let convertedVectors = self.vectors.map {($0.dataUsingUTF8StringEncoding, $1, $2)}
         self.measureBlock{
             for _ in 0...100 {
-                for (expect, test, testHex) in convertedVectors {
+                for (expect, test, _) in convertedVectors {
                     let result = base32DecodeToData(test)
                     XCTAssertEqual(result!, expect, "base32Decode for \(test)")
                 }
@@ -62,7 +62,7 @@ class Base32Tests: XCTestCase {
         let convertedVectors = self.vectors.map {($0.dataUsingUTF8StringEncoding, $1, $2)}
         self.measureBlock{
             for _ in 0...100 {
-                for (test, expect, expectHex) in convertedVectors {
+                for (test, _, expectHex) in convertedVectors {
                     let resultHex = base32HexEncode(test)
                     XCTAssertEqual(resultHex, expectHex, "base32HexEncode for \(test)")
                 }
@@ -74,7 +74,7 @@ class Base32Tests: XCTestCase {
         let convertedVectors = self.vectors.map {($0.dataUsingUTF8StringEncoding, $1, $2)}
         self.measureBlock{
             for _ in 0...100 {
-                for (expect, test, testHex) in convertedVectors {
+                for (expect, _, testHex) in convertedVectors {
                     let resultHex = base32HexDecodeToData(testHex)
                     XCTAssertEqual(resultHex!, expect, "base32HexDecode for \(testHex)")
                 }
@@ -176,7 +176,7 @@ class Base32Tests: XCTestCase {
         }
         
         // invalid length string without padding
-        let invalidVectorWithoutPaddings = invalidVectorWithPaddings.map {
+        _ = invalidVectorWithPaddings.map {
             (
                 $0.stringByReplacingOccurrencesOfString("=", withString:""),
                 $1.stringByReplacingOccurrencesOfString("=", withString:"")