From 43ef1382de3fce807b4e80135ce5bd2e8e8bef90 Mon Sep 17 00:00:00 2001
From: Kasign <393890129@qq.com>
Date: Fri, 19 Jan 2018 18:15:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TicketTaskManagerWindowController.swift                     | 2 +-
 Cartfile.resolved                                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/12306ForMac/TicketViewControllers/TicketTaskManagerWindowController.swift b/12306ForMac/TicketViewControllers/TicketTaskManagerWindowController.swift
index aa1e53f..a498021 100644
--- a/12306ForMac/TicketViewControllers/TicketTaskManagerWindowController.swift
+++ b/12306ForMac/TicketViewControllers/TicketTaskManagerWindowController.swift
@@ -76,7 +76,7 @@ class TicketTasksManager: NSObject {
     func decodeJsonFrom(_ jsonString:String) {
         ticketTasks = [TicketTask]()
         if let dataFromString = jsonString.data(using: .utf8, allowLossyConversion: false) {
-            let json = JSON(data: dataFromString)
+            let json = try! JSON(data: dataFromString)
             if json.array == nil {
                 return
             }
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 385c47b..0068965 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,6 +1,6 @@
 github "Alamofire/Alamofire" "4.0.0"
 github "DaveWoodCom/XCGLogger" "5.0.5"
-github "SwiftyJSON/SwiftyJSON" "3.1.4"
+github "SwiftyJSON/SwiftyJSON" "4.0.0"
 github "ccgus/fmdb" "2.6.2"
 github "mxcl/OMGHTTPURLRQ" "3.2.2"
 github "mxcl/PromiseKit" "4.1.0"