Master

.travis.yml

@@ -1,2 +1,7 @@
 language: objective-c
-script: "xcodebuild test -workspace SwiftyJSON.xcworkspace -scheme \"SwiftyJSON iOS\" -destination \"platform=iOS Simulator,name=iPhone 5\""
+
+osx_image: xcode7.1
+xcode_sdk: iphonesimulator9.0
+
+script: 'sh scripts/ci.sh'
+

Example/Example.xcodeproj/project.pbxproj

@@ -16,6 +16,27 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		04294C581BE5A9DE00D0397E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A82A1C4719D94E86009A653D /* SwiftyJSON.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = E4D7CCE81B9465A700EE7221;
+			remoteInfo = "SwiftyJSON watchOS";
+		};
+		04294C5A1BE5A9DE00D0397E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A82A1C4719D94E86009A653D /* SwiftyJSON.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 7236B4F61BAC14150020529B;
+			remoteInfo = "SwiftyJSON tvOS";
+		};
+		04294C5C1BE5A9DE00D0397E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A82A1C4719D94E86009A653D /* SwiftyJSON.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = A8580F741BCF5C5B00DA927B;
+			remoteInfo = "SwiftyJSON tvOS Tests";
+		};
 		A8BF45AA1B871E100066C032 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = A82A1C4719D94E86009A653D /* SwiftyJSON.xcodeproj */;
@@ -60,6 +81,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		04294C501BE5A9DE00D0397E /* Playground.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = Playground.playground; sourceTree = "<group>"; };
 		A82A1C1919D926B8009A653D /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		A82A1C1D19D926B8009A653D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A82A1C1E19D926B8009A653D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -85,6 +107,7 @@
 		A82A1C1019D926B8009A653D = {
 			isa = PBXGroup;
 			children = (
+				04294C501BE5A9DE00D0397E /* Playground.playground */,
 				A82A1C4719D94E86009A653D /* SwiftyJSON.xcodeproj */,
 				A82A1C1B19D926B8009A653D /* Example */,
 				A82A1C1A19D926B8009A653D /* Products */,
@@ -128,6 +151,9 @@
 				A8BF45AD1B871E100066C032 /* SwiftyJSON iOS Tests.xctest */,
 				A8BF45AF1B871E100066C032 /* SwiftyJSON.framework */,
 				A8BF45B11B871E100066C032 /* SwiftyJSON OSX Tests.xctest */,
+				04294C591BE5A9DE00D0397E /* SwiftyJSON.framework */,
+				04294C5B1BE5A9DE00D0397E /* SwiftyJSON.framework */,
+				04294C5D1BE5A9DE00D0397E /* SwiftyJSON tvOS Tests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -193,6 +219,27 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
+		04294C591BE5A9DE00D0397E /* SwiftyJSON.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = SwiftyJSON.framework;
+			remoteRef = 04294C581BE5A9DE00D0397E /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		04294C5B1BE5A9DE00D0397E /* SwiftyJSON.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = SwiftyJSON.framework;
+			remoteRef = 04294C5A1BE5A9DE00D0397E /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		04294C5D1BE5A9DE00D0397E /* SwiftyJSON tvOS Tests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "SwiftyJSON tvOS Tests.xctest";
+			remoteRef = 04294C5C1BE5A9DE00D0397E /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		A8BF45AB1B871E100066C032 /* SwiftyJSON.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;

Example/Example/ViewController.swift

@@ -52,7 +52,7 @@ class ViewController: UITableViewController {
             cell.textLabel?.text = "\(row)"
             cell.detailTextLabel?.text = self.json.arrayValue.description
         case .Dictionary:
-            let key: AnyObject = self.json.dictionaryValue.keys.array[row]
+            let key: AnyObject = Array(self.json.dictionaryValue.keys)[row]
             let value = self.json[key as! String]
             cell.textLabel?.text = "\(key)"
             cell.detailTextLabel?.text = value.description
@@ -83,7 +83,7 @@ class ViewController: UITableViewController {
             case .Array:
                 nextJson = self.json[row]
             case .Dictionary where row < self.json.dictionaryValue.count:
-                let key = self.json.dictionaryValue.keys.array[row]
+                let key = Array(self.json.dictionaryValue.keys)[row]
                 if let value = self.json.dictionary?[key] {
                     nextJson = value
                 }

Example/Playground.playground/Contents.swift

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

Example/Playground.playground/contents.xcplayground

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

Example/Playground.playground/timeline.xctimeline

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

README.md

@@ -1,5 +1,7 @@
 #SwiftyJSON [中文介绍](http://tangplin.github.io/swiftyjson/)
 
+[![Travis CI](https://travis-ci.org/SwiftyJSON/SwiftyJSON.svg?branch=master)](https://travis-ci.org/SwiftyJSON/SwiftyJSON)
+
 SwiftyJSON makes it easy to deal with JSON data in Swift.
 
 1. [Why is the typical JSON handling in Swift NOT good](#why-is-the-typical-json-handling-in-swift-not-good)
@@ -26,7 +28,7 @@ The code would look like this:
 
 ```swift
 
-if let statusesArray = try NSJSONSerialization.JSONObjectWithData(data, options: .AllowFragments) as? [[String: AnyObject]],
+if let statusesArray = try? NSJSONSerialization.JSONObjectWithData(data, options: .AllowFragments) as? [[String: AnyObject]],
     let user = statusesArray[0]["user"] as? [String: AnyObject],
     let username = user["name"] as? String {
     // Finally we got the username
@@ -75,7 +77,7 @@ if let userName = json[999999]["wrong_key"]["wrong_name"].string {
 
 ## Requirements
 
-- iOS 7.0+ / Mac OS X 10.9+
+- iOS 7.0+ / OS X 10.9+
 - Xcode 7
 
 ##Integration
@@ -98,6 +100,22 @@ You can use [Carthage](https://github.com/Carthage/Carthage) to install `SwiftyJ
 github "SwiftyJSON/SwiftyJSON"
 ```
 
+####Swift Package Manager
+You can use [The Swift Package Manager](https://swift.org/package-manager) to install `SwiftyJSON` by adding the proper description to your `Package.swift` file:
+```swift
+import PackageDescription
+
+let package = Package(
+    name: "YOUR_PROJECT_NAME",
+    targets: [],
+    dependencies: [
+        .Package(url: "https://github.com/SwiftyJSON/SwiftyJSON.git", versions: "2.3.3" ..< Version.max)
+    ]
+)
+```
+
+Note that the [Swift Package Manager](https://swift.org/package-manager) is still in early design and development, for more infomation checkout its [GitHub Page](https://github.com/apple/swift-package-manager)
+
 ####Manually (iOS 7+, OS X 10.9+)
 
 To use this library in your project manually you may:  
@@ -161,7 +179,7 @@ for (key,subJson):(String, JSON) in json {
 ```swift
 //If json is .Array
 //The `index` is 0..<json.count's string value
-for (key,subJson):(String, JSON) in json {
+for (index,subJson):(String, JSON) in json {
     //Do something you want
 }
 ```
@@ -296,13 +314,13 @@ if let data = json.rawData() {
 if let string = json.rawString() {
     //Do something you want
 }
-
+```
 ####Existance
 ```swift
 //shows you whether value specified in JSON or not
 if json["name"].isExists()
 ```
-```
+
 ####Literal convertibles
 For more info about literal convertibles: [Swift Literal Convertibles](http://nshipster.com/swift-literal-convertible/)
 ```swift
@@ -360,16 +378,15 @@ json[path] = "that"
 
 SwiftyJSON nicely wraps the result of the Alamofire JSON response handler:
 ```swift
-Alamofire.request(.GET, url, parameters: parameters)
-  .responseJSON { (req, res, json, error) in
-    if(error != nil) {
-      NSLog("Error: \(error)")
-      print(req)
-      print(res)
-    }
-    else {
-      NSLog("Success: \(url)")
-      var json = JSON(json!)
+Alamofire.request(.GET, url).validate().responseJSON { response in
+    switch response.result {
+    case .Success:
+        if let value = response.result.value {
+          let json = JSON(value)
+          print("JSON: \(json)")
+        }
+    case .Failure(let error):
+        print(error)
     }
-  }
+}
 ```

Source/Info-tvOS.plist

@@ -22,5 +22,9 @@
 	<string>${CURRENT_PROJECT_VERSION}</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>arm64</string>
+	</array>
 </dict>
 </plist>