Merge pull request #273 from hkellaway/release/1.2.1

Release/1.2.1
hkellaway · Feb 12, 2017 · ed37a05 · ed37a05
2 parents 27242cb + 310a9e1
commit ed37a05
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 All notable changes to this project will be documented in this file.
 `Gloss` adheres to [Semantic Versioning](http://semver.org/).
 
-- `1.2.x` Releases - [1.2.0](#120)
+- `1.2.x` Releases - [1.2.0](#120) | [1.2.1](#121)
 - `1.1.x` Releases - [1.1.0](#110) | [1.1.1](#111)
 - `1.0.x` Releases - [1.0.0](#100)
 - `0.8.x` Releases - [0.8.0](#080)
@@ -16,6 +16,12 @@ All notable changes to this project will be documented in this file.
 
 ---
 
+## [1.2.1](https://github.com/hkellaway/Gloss/releases/tag/1.2.1)
+Released on 2017-02-11. All issues associated with this milestone can be found using this [filter](https://github.com/hkellaway/Gloss/issues?utf8=%E2%9C$
+
+#### Fixed
+- Decodable extension not being available on all platforms [Issue [#270](https://github.com/hkellaway/Gloss/issues/270)]
+
 ## [1.2.0](https://github.com/hkellaway/Gloss/releases/tag/1.2.0)
 Released on 2017-01-15. All issues associated with this milestone can be found using this [filter](https://github.com/hkellaway/Gloss/issues?utf8=%E2%9C%93&q=milestone%3A1.2.0)
 

diff --git a/Gloss.podspec b/Gloss.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Gloss"
-  s.version          = "1.2.0"
+  s.version          = "1.2.1"
   s.summary          = "A shiny JSON parsing library in Swift"
   s.description      = "A shiny JSON parsing library in Swift. Features include mapping JSON to objects, mapping objects to JSON, handling of nested objects and custom transformations."
   s.homepage         = "https://github.com/hkellaway/Gloss"

diff --git a/Gloss.xcodeproj/project.pbxproj b/Gloss.xcodeproj/project.pbxproj
@@ -32,9 +32,8 @@
 		9F055DC91DCBC24000EB78C1 /* DecoderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F055DC01DCBC24000EB78C1 /* DecoderTests.swift */; };
 		9F055DCA1DCBC24000EB78C1 /* EncoderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F055DC11DCBC24000EB78C1 /* EncoderTests.swift */; };
 		9F055DCB1DCBC24000EB78C1 /* FlowObjectCreationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F055DC21DCBC24000EB78C1 /* FlowObjectCreationTests.swift */; };
-		9F055DCC1DCBC24000EB78C1 /* FlowObjectToJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F055DC31DCBC24000EB78C1 /* FlowObjectToJSON.swift */; };
+		9F055DCC1DCBC24000EB78C1 /* ObjectToJSONFlowTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F055DC31DCBC24000EB78C1 /* ObjectToJSONFlowTests.swift */; };
 		9F055DCD1DCBC24000EB78C1 /* GlossTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F055DC41DCBC24000EB78C1 /* GlossTests.swift */; };
-		9F055DCE1DCBC24000EB78C1 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9F055DC51DCBC24000EB78C1 /* Info.plist */; };
 		9F055DCF1DCBC24000EB78C1 /* KeyPathTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F055DC61DCBC24000EB78C1 /* KeyPathTests.swift */; };
 		9F055DD01DCBC24000EB78C1 /* OperatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F055DC71DCBC24000EB78C1 /* OperatorTests.swift */; };
 		9F055DDA1DCBC25000EB78C1 /* TestFailableModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F055DD11DCBC25000EB78C1 /* TestFailableModel.swift */; };
@@ -46,6 +45,9 @@
 		9F055DE01DCBC25000EB78C1 /* TestModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F055DD71DCBC25000EB78C1 /* TestModel.swift */; };
 		9F055DE11DCBC25000EB78C1 /* TestNestedKeyPathModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F055DD81DCBC25000EB78C1 /* TestNestedKeyPathModel.swift */; };
 		9F055DE21DCBC25000EB78C1 /* TestNestedModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F055DD91DCBC25000EB78C1 /* TestNestedModel.swift */; };
+		DC00BCBD1E501361005F5FE9 /* ExtensionDecodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC90AA8A1E2C490600B66BF0 /* ExtensionDecodable.swift */; };
+		DC00BCBE1E501366005F5FE9 /* ExtensionDecodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC90AA8A1E2C490600B66BF0 /* ExtensionDecodable.swift */; };
+		DC00BCBF1E50136A005F5FE9 /* ExtensionDecodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC90AA8A1E2C490600B66BF0 /* ExtensionDecodable.swift */; };
 		DC90AA8B1E2C490600B66BF0 /* ExtensionDecodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC90AA8A1E2C490600B66BF0 /* ExtensionDecodable.swift */; };
 		DCD40A601C7A7B11007EE251 /* ExtensionArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCD40A5E1C7A7B11007EE251 /* ExtensionArray.swift */; };
 		DCD40A611C7A7B11007EE251 /* ExtensionDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCD40A5F1C7A7B11007EE251 /* ExtensionDictionary.swift */; };
@@ -79,7 +81,7 @@
 		9F055DC01DCBC24000EB78C1 /* DecoderTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DecoderTests.swift; path = Tests/GlossTests/DecoderTests.swift; sourceTree = SOURCE_ROOT; };
 		9F055DC11DCBC24000EB78C1 /* EncoderTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EncoderTests.swift; path = Tests/GlossTests/EncoderTests.swift; sourceTree = SOURCE_ROOT; };
 		9F055DC21DCBC24000EB78C1 /* FlowObjectCreationTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FlowObjectCreationTests.swift; path = Tests/GlossTests/FlowObjectCreationTests.swift; sourceTree = SOURCE_ROOT; };
-		9F055DC31DCBC24000EB78C1 /* FlowObjectToJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FlowObjectToJSON.swift; path = Tests/GlossTests/FlowObjectToJSON.swift; sourceTree = SOURCE_ROOT; };
+		9F055DC31DCBC24000EB78C1 /* ObjectToJSONFlowTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ObjectToJSONFlowTests.swift; path = Tests/GlossTests/ObjectToJSONFlowTests.swift; sourceTree = SOURCE_ROOT; };
 		9F055DC41DCBC24000EB78C1 /* GlossTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GlossTests.swift; path = Tests/GlossTests/GlossTests.swift; sourceTree = SOURCE_ROOT; };
 		9F055DC51DCBC24000EB78C1 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Tests/GlossTests/Info.plist; sourceTree = SOURCE_ROOT; };
 		9F055DC61DCBC24000EB78C1 /* KeyPathTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = KeyPathTests.swift; path = Tests/GlossTests/KeyPathTests.swift; sourceTree = SOURCE_ROOT; };
@@ -149,7 +151,7 @@
 				9F055DC01DCBC24000EB78C1 /* DecoderTests.swift */,
 				9F055DC11DCBC24000EB78C1 /* EncoderTests.swift */,
 				9F055DC21DCBC24000EB78C1 /* FlowObjectCreationTests.swift */,
-				9F055DC31DCBC24000EB78C1 /* FlowObjectToJSON.swift */,
+				9F055DC31DCBC24000EB78C1 /* ObjectToJSONFlowTests.swift */,
 				9F055DC41DCBC24000EB78C1 /* GlossTests.swift */,
 				9F055DC51DCBC24000EB78C1 /* Info.plist */,
 				9F055DC61DCBC24000EB78C1 /* KeyPathTests.swift */,
@@ -399,7 +401,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				9F055DDC1DCBC25000EB78C1 /* TestFailableModelValid.json in Resources */,
-				9F055DCE1DCBC24000EB78C1 /* Info.plist in Resources */,
 				9F055DDB1DCBC25000EB78C1 /* TestFailableModelInvalid.json in Resources */,
 				9F055DDF1DCBC25000EB78C1 /* TestModel.json in Resources */,
 			);
@@ -453,14 +454,15 @@
 				9F055DCD1DCBC24000EB78C1 /* GlossTests.swift in Sources */,
 				9F055DCB1DCBC24000EB78C1 /* FlowObjectCreationTests.swift in Sources */,
 				9F055DDE1DCBC25000EB78C1 /* TestKeyPathModelCustomDelimiter.swift in Sources */,
-				9F055DCC1DCBC24000EB78C1 /* FlowObjectToJSON.swift in Sources */,
+				9F055DCC1DCBC24000EB78C1 /* ObjectToJSONFlowTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		A04168E21C0DF69900269A6A /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DC00BCBE1E501366005F5FE9 /* ExtensionDecodable.swift in Sources */,
 				DCD40A641C7A7C5D007EE251 /* ExtensionArray.swift in Sources */,
 				DCD40A651C7A7C5D007EE251 /* ExtensionDictionary.swift in Sources */,
 				2F3A833C1C66D0FF00ECC4B8 /* Decoder.swift in Sources */,
@@ -488,6 +490,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DC00BCBD1E501361005F5FE9 /* ExtensionDecodable.swift in Sources */,
 				DCD40A621C7A7C58007EE251 /* ExtensionArray.swift in Sources */,
 				DCD40A631C7A7C58007EE251 /* ExtensionDictionary.swift in Sources */,
 				2F3A83421C66D11200ECC4B8 /* Decoder.swift in Sources */,
@@ -501,6 +504,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DC00BCBF1E50136A005F5FE9 /* ExtensionDecodable.swift in Sources */,
 				DCD40A661C7A7C64007EE251 /* ExtensionArray.swift in Sources */,
 				DCD40A671C7A7C64007EE251 /* ExtensionDictionary.swift in Sources */,
 				2F3A83361C66D0ED00ECC4B8 /* Decoder.swift in Sources */,

diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ import PackageDescription
 let package = Package(
     name: "HelloWorld",
     dependencies: [
-        .Package(url: "https://github.com/hkellaway/Gloss.git", majorVersion: 1, minorVersion: 2)
+        .Package(url: "https://github.com/hkellaway/Gloss.git", majorVersion: 1, minor: 2)
     ]
 )
 ```

diff --git a/Sources/Decoder.swift b/Sources/Decoder.swift
@@ -569,3 +569,4 @@ public struct Decoder {
     }
 
 }
+
diff --git a/Tests/GlossTests/GlossTests.swift b/Tests/GlossTests/GlossTests.swift
@@ -103,13 +103,13 @@ class GlossTests: XCTestCase {
     }
 
     func testDateFormatterISO8601HasCorrectLocale() {
-        let dateFormatterISO8601 = GlossDateFormatterISO8601 as! DateFormatter
+        let dateFormatterISO8601 = GlossDateFormatterISO8601 
 
         XCTAssertTrue(dateFormatterISO8601.locale.identifier == "en_US_POSIX", "Date formatter ISO8601 should have correct locale.")
     }
 
     func testDateFormatterISO8601HasCorrectDateFormat() {
-        let dateFormatterISO8601 = GlossDateFormatterISO8601 as! DateFormatter
+        let dateFormatterISO8601 = GlossDateFormatterISO8601 
 
         XCTAssertTrue(dateFormatterISO8601.dateFormat == "yyyy-MM-dd'T'HH:mm:ssZZZZZ", "Date formatter ISO8601 should have correct date format.")
     }
@@ -120,7 +120,7 @@ class GlossTests: XCTestCase {
             return
         }
 
-        let dateFormatterISO8601 = GlossDateFormatterISO8601 as! DateFormatter
+        let dateFormatterISO8601 = GlossDateFormatterISO8601 
 
         XCTAssertTrue(dateFormatterISO8601.calendar.identifier == Calendar.Identifier.gregorian, "Date formatter ISO8601 should force use of Gregorian calendar.")
          XCTAssertTrue(dateFormatterISO8601.calendar.timeZone.abbreviation() == "GMT", "Date formatter ISO8601 Gregorian calendar should use GMT timezone.")

diff --git a/Tests/GlossTests/FlowObjectToJSON.swift → Tests/GlossTests/ObjectToJSONFlowTests.swift b/Tests/GlossTests/FlowObjectToJSON.swift → Tests/GlossTests/ObjectToJSONFlowTests.swift
@@ -1,5 +1,5 @@
 //
-//  FlowObjectToJSON.swift
+//  ObjectToJSONFlowTests.swift
 //  GlossExample
 //
 // Copyright (c) 2015 Harlan Kellaway
@@ -28,7 +28,7 @@ import Gloss
 import XCTest
 
 class ObjectToJSONFlowTests: XCTestCase {
-    
+
     var testModel: TestModel?
 
     override func setUp() {