From dd467a13f96da57190dfd58bc7afecd5ea05a9cd Mon Sep 17 00:00:00 2001 From: Harlan Kellaway Date: Sat, 15 Aug 2020 23:34:18 -0400 Subject: [PATCH 1/3] Use JSONSerialization options from client --- Sources/Gloss/ExtensionArray.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Gloss/ExtensionArray.swift b/Sources/Gloss/ExtensionArray.swift index 9a68c22..eeee7b0 100644 --- a/Sources/Gloss/ExtensionArray.swift +++ b/Sources/Gloss/ExtensionArray.swift @@ -75,7 +75,7 @@ public extension Array where Element: JSONDecodable { */ static func from(data: Data, serializer: JSONSerializer = GlossJSONSerializer(), options: JSONSerialization.ReadingOptions = .mutableContainers) -> [Element]? { guard - let jsonArray = (try? JSONSerialization.jsonObject(with: data, options: .mutableContainers)) as? [JSON], + let jsonArray = (try? JSONSerialization.jsonObject(with: data, options: options)) as? [JSON], let models = [Element].from(jsonArray: jsonArray) else { return nil } From 95e179be86f1cb42cd200181a20e34d69f7d7787 Mon Sep 17 00:00:00 2001 From: Harlan Kellaway Date: Sat, 29 Aug 2020 09:05:14 -0400 Subject: [PATCH 2/3] Update LICENSE year --- .../GlossExample/Base.lproj/LaunchScreen.xib | 12 +++++------- LICENSE | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/GlossExample/GlossExample/Base.lproj/LaunchScreen.xib b/GlossExample/GlossExample/Base.lproj/LaunchScreen.xib index d1a7c9b..3928543 100644 --- a/GlossExample/GlossExample/Base.lproj/LaunchScreen.xib +++ b/GlossExample/GlossExample/Base.lproj/LaunchScreen.xib @@ -1,11 +1,9 @@ - - - - + + - + @@ -16,9 +14,9 @@ - + -