From 7a62e70dc657e9e98cba1ced5f458b1232142e12 Mon Sep 17 00:00:00 2001 From: Baris Sencan Date: Mon, 6 Apr 2015 18:17:46 -0700 Subject: [PATCH 1/5] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7de59d0..5e392a1 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ internal struct Movie: Deserializable { init(data: [String: AnyObject]) { name <-- data["name"] - releaseDate <-- (value: data["release_date"], format: "yyyy-MM-dd") // Refer to the next section for more info. + releaseDate <-- (data["release_date"], "yyyy-MM-dd") // Refer to the next section for more info. } } ``` @@ -144,8 +144,8 @@ NSDate deserialization however, requires a format to be provided most of the tim let meetingDate: NSDate? let partyDates: [NSDate]? -meetingDate <-- (value: "2014-09-18", format: "yyyy-MM-dd") -partyDates <-- (value: ["2014-09-19", "2014-09-20"], format: "yyyy-MM-dd") +meetingDate <-- ("2014-09-18", "yyyy-MM-dd") +partyDates <-- (["2014-09-19", "2014-09-20"], "yyyy-MM-dd") let myDayOff: NSDate? myDayOff <-- 1414172803 // You can also use unix timestamps. From c9f16f1530c35e95b9ac403b1294730f5ce4ccb1 Mon Sep 17 00:00:00 2001 From: Baris Sencan Date: Mon, 6 Apr 2015 18:18:55 -0700 Subject: [PATCH 2/5] Update scheme names in travis configuration file --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa17d3c..309da0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c osx_image: xcode61 script: - - xctool -project JSONHelper.xcodeproj -scheme JSONHelperiOS build - - xctool -project JSONHelper.xcodeproj -scheme JSONHelperMac build + - xctool -project JSONHelper.xcodeproj -scheme JSONHelper-iOS build + - xctool -project JSONHelper.xcodeproj -scheme JSONHelper-Mac build From 53ecee0cf106b3aed1de40e5b48f4a11b0d42333 Mon Sep 17 00:00:00 2001 From: Baris Sencan Date: Thu, 9 Apr 2015 12:16:19 -0700 Subject: [PATCH 3/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5e392a1..1a2f97c 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Gratipay](https://img.shields.io/gratipay/bsencan91.svg)](https://gratipay.com/bsencan91/) [![Gitter](https://badges.gitter.im/JOIN CHAT.svg)](https://gitter.im/isair/JSONHelper?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -Lightning fast JSON deserialization for iOS & OS X written in Swift. Expanded upon the ideas found in [this blog post](http://robots.thoughtbot.com/efficient-json-in-swift-with-functional-concepts-and-generics). +Lightning fast JSON deserialization for iOS & OS X written in Swift. ##Table of Contents From b8e2f2e8e8fd12526b475d9f804c6c271303508e Mon Sep 17 00:00:00 2001 From: Mariana Lenetis and Tim Kersey Date: Mon, 13 Apr 2015 10:00:35 -0700 Subject: [PATCH 4/5] Change sheme to run tests on Release build --- .../xcshareddata/xcschemes/JSONHelper-iOS.xcscheme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelper-iOS.xcscheme b/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelper-iOS.xcscheme index 0bb8f67..a070507 100644 --- a/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelper-iOS.xcscheme +++ b/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelper-iOS.xcscheme @@ -40,7 +40,7 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES" - buildConfiguration = "Debug"> + buildConfiguration = "Release"> From 6ccce3850c4d09405f39ff56d23a3c2a3562a969 Mon Sep 17 00:00:00 2001 From: Mariana Lenetis and Tim Kersey Date: Mon, 13 Apr 2015 10:00:49 -0700 Subject: [PATCH 5/5] Empty string is needed to allow tests to run successfully on release build - Using a println statement also works --- JSONHelper/JSONHelper.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/JSONHelper/JSONHelper.swift b/JSONHelper/JSONHelper.swift index 165d38b..548e364 100644 --- a/JSONHelper/JSONHelper.swift +++ b/JSONHelper/JSONHelper.swift @@ -42,6 +42,7 @@ infix operator <-- { associativity right precedence 150 } // For optionals. public func <-- (inout property: T?, value: AnyObject?) -> T? { var newValue: T? + "" if let unwrappedValue: AnyObject = value { // We unwrapped the given value successfully, try to convert. if let convertedValue = unwrappedValue as? T {