Merge pull request #68 from alickbass/swift-3.1

Swift 3.1
wangshengjia · Apr 24, 2017 · ac64456 · ac64456
2 parents 213cad1 + 1be92c2
commit ac64456
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/LeeGo.xcodeproj/project.pbxproj b/LeeGo.xcodeproj/project.pbxproj
@@ -307,7 +307,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0810;
+				LastUpgradeCheck = 0830;
 				ORGANIZATIONNAME = "Victor Wang";
 				TargetAttributes = {
 					35F520001C7C73D40089FF41 = {

diff --git a/LeeGo.xcodeproj/xcshareddata/xcschemes/LeeGo.xcscheme b/LeeGo.xcodeproj/xcshareddata/xcschemes/LeeGo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Sources/Core/Appearance.swift b/Sources/Core/Appearance.swift
@@ -422,13 +422,7 @@ extension Appearance: JSONConvertible {
     }
 
     internal static func appearancesWithJSON(_ json: JSONDictionary) -> [Appearance] {
-        return json.map({
-            (key, value) -> JSONDictionary in
-            return [key: value]
-        }).map({
-            json -> Appearance in
-            return Appearance(rawValue: json)
-        })
+        return json.lazy.map({ [$0.key: $0.value] }).map({ Appearance(rawValue: $0) })
     }
 
     internal init(rawValue json: JSONDictionary?) {
@@ -646,7 +640,7 @@ extension Appearance: JSONConvertible {
             self = .keyboardDismissMode(UIScrollViewKeyboardDismissMode(rawValue: value))
 
         default:
-            assertionFailure("Can't decode json \(json) to Appearance")
+            assertionFailure("Can't decode json \(String(describing: json)) to Appearance")
         }
     }