Migrate to Swift 3

Author: kylef

.gitignore

@@ -0,0 +1,2 @@
+.build
+Packages

.travis.yml

@@ -1,5 +1,4 @@
 language: objective-c
-osx_image: xcode7
-install: brew install --HEAD kylef/formulae/conche
+osx_image: xcode8
 script:
-- conche test
+- swift test

CardKit.podspec.json

@@ -12,11 +12,5 @@
     "watchos": "2.0",
     "tvos": "9.0"
   },
-  "source_files": "CardKit/*.swift",
-  "test_specification": {
-    "dependencies": {
-      "Spectre": [ "~> 0.2.0" ]
-    },
-    "source_files": "CardKitSpecs/*.swift"
-  }
+  "source_files": "Sources/*.swift"
 }

CardKit/Value.swift

@@ -0,0 +1,9 @@
+import PackageDescription
+
+
+let package = Package(
+  name: "CardKit",
+  dependencies: [
+    .Package(url: "https://github.com/kylef/Spectre.git", majorVersion: 0, minor: 7),
+  ]
+)

CardKitSpecs/CardSpec.swift

@@ -28,15 +28,6 @@ New shuffled array of cards
 let shuffledDeck = deck.shuffled()
 ```
 
-## Installation
-
-[CocoaPods](http://cocoapods.org/) or [Conche](https://github.com/kylef/Conche)
-are the recommended and supported installation methods.
-
-```ruby
-pod 'CardKit'
-```
-
 ## License
 
 CardKit is licensed under the BSD license. See [LICENSE](LICENSE) for more

CardKitSpecs/DeckSpec.swift

@@ -1,6 +1,6 @@
 import Darwin
 
-extension CollectionType {
+extension Collection {
   /// Returns a shuffled array
   public func shuffled() -> [Generator.Element] {
     var array = Array(self)
@@ -9,11 +9,11 @@ extension CollectionType {
   }
 }
 
-extension MutableCollectionType where Index == Int {
+extension MutableCollection where Index == Int {
   /// Shuffle elements in-place
   mutating public func shuffle() {
-    for index in 0 ..< (count - 1) {
-      let newIndex = Int(arc4random_uniform(UInt32(count - index))) + index
+    for index in startIndex ..< (endIndex - 1) {
+      let newIndex = Int(arc4random_uniform(UInt32(endIndex - index))) + index
 
       if newIndex != index {
         swap(&self[index], &self[newIndex])

CardKitSpecs/SuitSpec.swift

@@ -1,25 +1,25 @@
 public enum Suit {
-  case Spade
-  case Heart
-  case Diamond
-  case Club
+  case spade
+  case heart
+  case diamond
+  case club
 
   /// Returns all possible suits
   static var all: [Suit] {
-    return [.Spade, .Heart, .Diamond, .Club]
+    return [.spade, .heart, .diamond, .club]
   }
 }
 
 extension Suit : CustomStringConvertible {
   public var description: String {
     switch self {
-    case Spade:
+    case .spade:
       return "Spade"
-    case Heart:
+    case .heart:
       return "Heart"
-    case Diamond:
+    case .diamond:
       return "Diamond"
-    case Club:
+    case .club:
       return "Club"
     }
   }

CardKitSpecs/ValueSpec.swift

@@ -0,0 +1,56 @@
+public enum Value {
+  case ace
+  case two
+  case three
+  case four
+  case five
+  case six
+  case seven
+  case eight
+  case nine
+  case ten
+  case jack
+  case queen
+  case king
+
+  /// Returns all possible values
+  static var all: [Value] {
+    return [
+      .ace, .two, .three, .four, .five, .six, .seven, .eight, .nine, .ten,
+      .jack, .queen, .king
+    ]
+  }
+}
+
+extension Value : CustomStringConvertible {
+  public var description: String {
+    switch self {
+    case .ace:
+      return "A"
+    case .two:
+      return "2"
+    case .three:
+      return "3"
+    case .four:
+      return "4"
+    case .five:
+      return "5"
+    case .six:
+      return "6"
+    case .seven:
+      return "7"
+    case .eight:
+      return "8"
+    case .nine:
+      return "9"
+    case .ten:
+      return "10"
+    case .jack:
+      return "J"
+    case .queen:
+      return "Q"
+    case .king:
+      return "K"
+    }
+  }
+}