Merge pull request #359 from hkellaway/release/3.1.0

Release/3.1.0
hkellaway · Oct 15, 2019 · d2249d2 · d2249d2
2 parents a0f1ab5 + 6b6952a
commit d2249d2
Show file tree

Hide file tree

Showing 49 changed files with 818 additions and 115 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 All notable changes to this project will be documented in this file.
 `Gloss` adheres to [Semantic Versioning](http://semver.org/).
 
+- `3.0.X` Releases - [3.0.0](#300) | [3.1.0](#310)
 - `2.1.x` Releases - [2.1.0](#210) | [2.1.1](#211)
 - `2.0.x` Releases - [2.0.0-beta.1](#200-beta1) | [2.0.0-beta.2](#200-beta2) | [2.0.0](#200) | [2.0.1](#201)
 - `1.2.x` Releases - [1.2.0](#120) | [1.2.1](#121) | [1.2.2](#122) | [1.2.3](#123) | [1.2.4](#124)
@@ -16,6 +17,21 @@ All notable changes to this project will be documented in this file.
 - `0.2.x` Releases - [0.2.0](#020)
 - `0.1.x` Releases - [0.1.0](#010)
 
+---
+## [3.1.0](https://github.com/hkellaway/Gloss/releases/tag/3.1.0)
+Released on 2019-10-15.
+
+#### Added
+- Official support for Swift Package Manager [[PR #358](https://github.com/hkellaway/Gloss/pull/358)]
+
+---
+
+## [3.0.0](https://github.com/hkellaway/Gloss/releases/tag/3.0.0)
+Released on 2019-07-22.
+
+#### Updated
+- Swift 5.0 compatibility [[Issue #350](https://github.com/hkellaway/Gloss/pull/350)]
+
 ---
 
 ## [2.1.1](https://github.com/hkellaway/Gloss/releases/tag/2.1.1)

diff --git a/Sources/Gloss.h → Gloss.h b/Sources/Gloss.h → Gloss.h
diff --git a/Gloss.podspec b/Gloss.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name             = "Gloss"
-  s.version          = "3.0.0"
+  s.version          = "3.1.0"
   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"
@@ -13,6 +13,6 @@ Pod::Spec.new do |s|
   s.platforms     = { :ios => "8.0", :osx => "10.9", :tvos => "9.0", :watchos => "2.0" }
   s.requires_arc = true
 
-  s.source_files     = 'Sources/*.{swift}'
+  s.source_files     = 'Sources/Gloss/*.{swift}'
 
 end
diff --git a/Gloss.xcodeproj/project.pbxproj b/Gloss.xcodeproj/project.pbxproj
@@ -150,11 +150,44 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		07400D1B2354B248008D701C /* Gloss */ = {
+			isa = PBXGroup;
+			children = (
+				DC47CAA61FAE56D0006E6F9A /* Decoder.swift */,
+				DC47CAA71FAE56D0006E6F9A /* Encoder.swift */,
+				DC47CAA81FAE56D0006E6F9A /* ExtensionArray.swift */,
+				DC47CAA91FAE56D0006E6F9A /* ExtensionDecodable.swift */,
+				DC47CAAA1FAE56D0006E6F9A /* ExtensionDictionary.swift */,
+				DC47CAAC1FAE56D0006E6F9A /* Gloss.swift */,
+				DC47CAAD1FAE56D0006E6F9A /* Info.plist */,
+				DC47CAAE1FAE56D0006E6F9A /* Operators.swift */,
+			);
+			path = Gloss;
+			sourceTree = "<group>";
+		};
+		07400D1C2354B261008D701C /* GlossTests */ = {
+			isa = PBXGroup;
+			children = (
+				DC47CACC1FAE572D006E6F9A /* Fakes */,
+				DC47CAD41FAE572D006E6F9A /* Test Models */,
+				DC47CAD01FAE572D006E6F9A /* Info.plist */,
+				DC47CAC91FAE572D006E6F9A /* Comparators.swift */,
+				DC47CACF1FAE572D006E6F9A /* GlossTests.swift */,
+				DC47CAD11FAE572D006E6F9A /* KeyPathTests.swift */,
+				DC47CAD21FAE572D006E6F9A /* ObjectToJSONFlowTests.swift */,
+				DC47CAD31FAE572D006E6F9A /* OperatorTests.swift */,
+				DC47CACA1FAE572D006E6F9A /* DecoderTests.swift */,
+				DC47CACB1FAE572D006E6F9A /* EncoderTests.swift */,
+				DC47CACE1FAE572D006E6F9A /* FlowObjectCreationTests.swift */,
+			);
+			path = GlossTests;
+			sourceTree = "<group>";
+		};
 		DC39BF571B8A7AD200088CE0 = {
 			isa = PBXGroup;
 			children = (
+				DC47CAAB1FAE56D0006E6F9A /* Gloss.h */,
 				DC47CAA51FAE56D0006E6F9A /* Sources */,
-				DC47CAC81FAE572D006E6F9A /* Tests */,
 				DC39BF621B8A7AD200088CE0 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -174,37 +207,12 @@
 		DC47CAA51FAE56D0006E6F9A /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				DC47CAA61FAE56D0006E6F9A /* Decoder.swift */,
-				DC47CAA71FAE56D0006E6F9A /* Encoder.swift */,
-				DC47CAA81FAE56D0006E6F9A /* ExtensionArray.swift */,
-				DC47CAA91FAE56D0006E6F9A /* ExtensionDecodable.swift */,
-				DC47CAAA1FAE56D0006E6F9A /* ExtensionDictionary.swift */,
-				DC47CAAB1FAE56D0006E6F9A /* Gloss.h */,
-				DC47CAAC1FAE56D0006E6F9A /* Gloss.swift */,
-				DC47CAAD1FAE56D0006E6F9A /* Info.plist */,
-				DC47CAAE1FAE56D0006E6F9A /* Operators.swift */,
+				07400D1C2354B261008D701C /* GlossTests */,
+				07400D1B2354B248008D701C /* Gloss */,
 			);
 			path = Sources;
 			sourceTree = "<group>";
 		};
-		DC47CAC81FAE572D006E6F9A /* Tests */ = {
-			isa = PBXGroup;
-			children = (
-				DC47CAC91FAE572D006E6F9A /* Comparators.swift */,
-				DC47CACA1FAE572D006E6F9A /* DecoderTests.swift */,
-				DC47CACB1FAE572D006E6F9A /* EncoderTests.swift */,
-				DC47CACC1FAE572D006E6F9A /* Fakes */,
-				DC47CACE1FAE572D006E6F9A /* FlowObjectCreationTests.swift */,
-				DC47CACF1FAE572D006E6F9A /* GlossTests.swift */,
-				DC47CAD01FAE572D006E6F9A /* Info.plist */,
-				DC47CAD11FAE572D006E6F9A /* KeyPathTests.swift */,
-				DC47CAD21FAE572D006E6F9A /* ObjectToJSONFlowTests.swift */,
-				DC47CAD31FAE572D006E6F9A /* OperatorTests.swift */,
-				DC47CAD41FAE572D006E6F9A /* Test Models */,
-			);
-			path = Tests;
-			sourceTree = "<group>";
-		};
 		DC47CACC1FAE572D006E6F9A /* Fakes */ = {
 			isa = PBXGroup;
 			children = (
@@ -550,7 +558,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				INFOPLIST_FILE = Tests/Info.plist;
+				INFOPLIST_FILE = Sources/GlossTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.harlankellaway.GlossTests;
@@ -563,7 +571,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				INFOPLIST_FILE = Tests/Info.plist;
+				INFOPLIST_FILE = Sources/GlossTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.harlankellaway.GlossTests;
@@ -583,7 +591,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = Sources/Info.plist;
+				INFOPLIST_FILE = Sources/Gloss/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.harlankellaway.Gloss;
@@ -607,7 +615,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = Sources/Info.plist;
+				INFOPLIST_FILE = Sources/Gloss/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.harlankellaway.Gloss;
@@ -742,7 +750,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = Sources/Info.plist;
+				INFOPLIST_FILE = Sources/Gloss/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.harlankellaway.Gloss;
@@ -763,7 +771,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = Sources/Info.plist;
+				INFOPLIST_FILE = Sources/Gloss/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.harlankellaway.Gloss;
@@ -783,7 +791,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = Sources/Info.plist;
+				INFOPLIST_FILE = Sources/Gloss/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.harlankellaway.Gloss;
@@ -805,7 +813,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = Sources/Info.plist;
+				INFOPLIST_FILE = Sources/Gloss/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.harlankellaway.Gloss;
@@ -830,7 +838,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = Sources/Info.plist;
+				INFOPLIST_FILE = Sources/Gloss/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
@@ -854,7 +862,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = Sources/Info.plist;
+				INFOPLIST_FILE = Sources/Gloss/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;

diff --git a/Gloss.xcodeproj/xcshareddata/xcschemes/Gloss.xcscheme b/Gloss.xcodeproj/xcshareddata/xcschemes/Gloss.xcscheme
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "DC39BF601B8A7AD200088CE0"
+            BuildableName = "Gloss.framework"
+            BlueprintName = "Gloss"
+            ReferencedContainer = "container:Gloss.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DC39BF601B8A7AD200088CE0"
-            BuildableName = "Gloss.framework"
-            BlueprintName = "Gloss"
-            ReferencedContainer = "container:Gloss.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
             ReferencedContainer = "container:Gloss.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/GlossExample/GlossExample.xcodeproj/project.pbxproj b/GlossExample/GlossExample.xcodeproj/project.pbxproj
@@ -118,8 +118,7 @@
 				DC08B5A81B76B3ED0098D6C8 /* Sources */,
 				DC08B5A91B76B3ED0098D6C8 /* Frameworks */,
 				DC08B5AA1B76B3ED0098D6C8 /* Resources */,
-				D19E0ACE63372003AA0ABBD4 /* [CP] Embed Pods Frameworks */,
-				032A14E7D2097DBB65326666 /* Embed Pods Frameworks */,
+				0DB65576E93D125B88EC2AD3 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -180,19 +179,22 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		032A14E7D2097DBB65326666 /* Embed Pods Frameworks */ = {
+		0DB65576E93D125B88EC2AD3 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-GlossExample/Pods-GlossExample-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/Gloss/Gloss.framework",
 			);
-			name = "Embed Pods Frameworks";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gloss.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GlossExample/Pods-GlossExample-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GlossExample/Pods-GlossExample-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		C037FA1074C68EBAE2B6D9B9 /* [CP] Check Pods Manifest.lock */ = {
@@ -213,24 +215,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D19E0ACE63372003AA0ABBD4 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-GlossExample/Pods-GlossExample-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/Gloss/Gloss.framework",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gloss.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GlossExample/Pods-GlossExample-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

diff --git a/GlossExample/GlossExample/Repo.swift b/GlossExample/GlossExample/Repo.swift
@@ -23,6 +23,7 @@
 // THE SOFTWARE.
 //
 
+import Foundation
 import Gloss
 
 struct Repo: Glossy {

diff --git a/GlossExample/GlossExample/RepoOwner.swift b/GlossExample/GlossExample/RepoOwner.swift
@@ -23,6 +23,7 @@
 // THE SOFTWARE.
 //
 
+import Foundation
 import Gloss
 
 struct RepoOwner: Glossy {