Skip to content

Commit c309424

Browse files
committed
Swift 2 support
1 parent ea01ef6 commit c309424

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

JSONHelper/JSONHelper.swift

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public func <-- <T>(inout property: T?, value: AnyObject?) -> T? {
6565
switch property {
6666
case is Int?:
6767
if unwrappedValue is String {
68-
if let intValue = "\(unwrappedValue)".toInt() {
68+
if let intValue = Int("\(unwrappedValue)") {
6969
newValue = intValue as? T
7070
}
7171
}
@@ -509,9 +509,13 @@ public func <-- <T: RawRepresentable>(inout property: T, value: AnyObject?) -> T
509509
// MARK: JSON String Deserialization
510510

511511
private func dataStringToObject(dataString: String) -> AnyObject? {
512-
var data: NSData = dataString.dataUsingEncoding(NSUTF8StringEncoding)!
513-
var error: NSError?
514-
return NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingOptions(0), error: &error)
512+
let data: NSData = dataString.dataUsingEncoding(NSUTF8StringEncoding)!
513+
do {
514+
let jsonObject = try NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingOptions(rawValue: 0))
515+
return jsonObject
516+
} catch {
517+
return nil
518+
}
515519
}
516520

517521
public func <-- <T: Deserializable>(inout instance: T?, dataString: String) -> T? {

0 commit comments

Comments
 (0)