Merge pull request #3 from metova/release/2.0.0

Release/2.0.0

.travis.yml

@@ -1,16 +1,16 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode10
 env:
   global:
   - LC_CTYPE=en_US.UTF-8
   - LANG=en_US.UTF-8
   - WORKSPACE=MetovaJSONCodable.xcworkspace
   - IOS_FRAMEWORK_SCHEME="MetovaJSONCodable"
-  - IOS_SDK=iphonesimulator11.0
+  - IOS_SDK=iphonesimulator12.0
   matrix:
-    - DESTINATION="OS=11.0,name=iPhone X" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" POD_LINT="YES"
+    - DESTINATION="OS=12.0,name=iPhone X" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" POD_LINT="YES"
 before_install:
-  - bundle install --without=documentation  
+  - bundle install --without=documentation
   - bundle exec pod repo update
   - bundle exec pod install
 script:

CHANGELOG.md

@@ -1,5 +1,9 @@
 # MetovaJSONCodable CHANGELOG
 
+## 2.0.0
+
+- Updated to support Swift 4.2
+
 ## 1.0.0
 
 - Initial release.

Gemfile

@@ -1,6 +1,4 @@
 source 'https://rubygems.org'
-
-gem 'cocoapods', '>=1.2.1'
+gem 'cocoapods'
 gem 'slather'
 gem 'xcpretty'
-gem 'jazzy'

Gemfile.lock

@@ -7,13 +7,13 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    atomos (0.1.2)
+    atomos (0.1.3)
     claide (1.0.2)
     clamp (0.6.5)
-    cocoapods (1.5.0)
+    cocoapods (1.5.3)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.5.0)
+      cocoapods-core (= 1.5.3)
       cocoapods-deintegrate (>= 1.0.2, < 2.0)
       cocoapods-downloader (>= 1.2.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -29,87 +29,61 @@ GEM
       nap (~> 1.0)
       ruby-macho (~> 1.1)
       xcodeproj (>= 1.5.7, < 2.0)
-    cocoapods-core (1.5.0)
+    cocoapods-core (1.5.3)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.2)
-    cocoapods-downloader (1.2.0)
+    cocoapods-downloader (1.2.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.3.0)
+    cocoapods-trunk (1.3.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored2 (3.1.2)
     concurrent-ruby (1.0.5)
     escape (0.0.4)
-    ffi (1.9.23)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jazzy (0.9.1)
-      cocoapods (~> 1.0)
-      mustache (~> 0.99)
-      open4
-      redcarpet (~> 3.2)
-      rouge (>= 2.0.6, < 4.0)
-      sass (~> 3.4)
-      sqlite3 (~> 1.3)
-      xcinvoke (~> 0.3.0)
-    liferaft (0.0.6)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    molinillo (0.6.5)
-    mustache (0.99.8)
-    nanaimo (0.2.5)
+    molinillo (0.6.6)
+    nanaimo (0.2.6)
     nap (1.1.0)
     netrc (0.11.0)
-    nokogiri (1.8.2)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
-    open4 (1.3.4)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    redcarpet (3.4.0)
     rouge (2.0.7)
-    ruby-macho (1.1.0)
-    sass (3.5.6)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    slather (2.4.5)
+    ruby-macho (1.2.0)
+    slather (2.4.6)
       CFPropertyList (~> 2.2)
       activesupport (>= 4.0.2)
       clamp (~> 0.6)
       nokogiri (~> 1.8.2)
       xcodeproj (~> 1.4)
-    sqlite3 (1.3.13)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcinvoke (0.3.0)
-      liferaft (~> 0.0.6)
-    xcodeproj (1.5.7)
+    xcodeproj (1.6.0)
       CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.2)
+      atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.4)
-    xcpretty (0.2.8)
+      nanaimo (~> 0.2.6)
+    xcpretty (0.3.0)
       rouge (~> 2.0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (>= 1.2.1)
-  jazzy
+  cocoapods
   slather
   xcpretty
 

MetovaJSONCodable.podspec

@@ -1,18 +1,22 @@
 Pod::Spec.new do |s|
 
   s.name         = "MetovaJSONCodable"
-  s.version      = "1.0.0"
+  s.version      = "2.0.0"
   s.summary      = "MetovaJSONCodable is a small utility class that extends codable for easier JSON support"
   s.description  = <<-DESC
 MetovaJSONCodable is a simple protocol implemented on top of the existing codable protocol with specialized support for JSON
                    DESC
   s.homepage     = "https://github.com/metova/MetovaJSONCodable"
   s.license      = "MIT"
-  s.author       = { "Kalan Stowe" => "kalan.stowe@metova.com" }
+  s.authors      = {
+    "Kalan Stowe" => "kalan.stowe@metova.com",
+    "Nick Griffith" => "nick.griffith@metova.com"
+  }
 
   s.ios.deployment_target = "10.0"
+  s.swift_version = "4.2"
 
-  s.source       = { :git => "https://github.com/metova/MetovaJSONCodable.git", :tag => "1.0.0" }
+  s.source       = { :git => "https://github.com/metova/MetovaJSONCodable.git", :tag => s.version.to_s }
   s.source_files  = "MetovaJSONCodable/*.swift"
 
 end

MetovaJSONCodable.xcodeproj/project.pbxproj

@@ -48,7 +48,6 @@
 		6A09D0F0207D785D00A533F4 /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitignore; sourceTree = SOURCE_ROOT; };
 		6A1DFAD0207E9D5E000030B7 /* .swiftlint.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .swiftlint.yml; sourceTree = SOURCE_ROOT; };
 		6A1DFAD1207E9D77000030B7 /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .travis.yml; sourceTree = SOURCE_ROOT; };
-		6A1DFAD2207E9DC6000030B7 /* .swift-version */ = {isa = PBXFileReference; lastKnownFileType = text; path = ".swift-version"; sourceTree = SOURCE_ROOT; };
 		6A1DFAD5207FE51E000030B7 /* CustomChildProtocolTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomChildProtocolTests.swift; sourceTree = "<group>"; };
 		6A1DFAD7207FF622000030B7 /* JSONCodable+DateHandling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "JSONCodable+DateHandling.swift"; sourceTree = "<group>"; };
 		6A1DFADB20867813000030B7 /* Podfile */ = {isa = PBXFileReference; lastKnownFileType = text; path = Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
@@ -78,12 +77,30 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		4A4F8DEB215BDF1D00E3461C /* Related Files */ = {
+			isa = PBXGroup;
+			children = (
+				6A1DFADB20867813000030B7 /* Podfile */,
+				6A09D0EC207D780C00A533F4 /* Gemfile */,
+				6A09D0EA207D780B00A533F4 /* Gemfile.lock */,
+				6A09D0F0207D785D00A533F4 /* .gitignore */,
+				6A1DFAD0207E9D5E000030B7 /* .swiftlint.yml */,
+				6A09D0EB207D780C00A533F4 /* CHANGELOG.md */,
+				6A09D0EE207D780C00A533F4 /* README.md */,
+				6A09D0ED207D780C00A533F4 /* MetovaJSONCodable.podspec */,
+				6A09D0EF207D784800A533F4 /* LICENSE */,
+				6A09D0E6207D3AB700A533F4 /* Package.swift */,
+				6A1DFAD1207E9D77000030B7 /* .travis.yml */,
+			);
+			name = "Related Files";
+			sourceTree = "<group>";
+		};
 		6A09D09C207D2B7D00A533F4 = {
 			isa = PBXGroup;
 			children = (
 				6A09D0A8207D2B7D00A533F4 /* MetovaJSONCodable */,
 				6A09D0B3207D2B7D00A533F4 /* MetovaJSONCodableTests */,
-				6A09D0E8207D3DEA00A533F4 /* RelatedFiles */,
+				4A4F8DEB215BDF1D00E3461C /* Related Files */,
 				6A09D0A7207D2B7D00A533F4 /* Products */,
 				F50100D763C3530FB1BFF566 /* Pods */,
 				EDF1BBE9B447BBB313030D29 /* Frameworks */,
@@ -120,25 +137,6 @@
 			path = MetovaJSONCodableTests;
 			sourceTree = "<group>";
 		};
-		6A09D0E8207D3DEA00A533F4 /* RelatedFiles */ = {
-			isa = PBXGroup;
-			children = (
-				6A1DFADB20867813000030B7 /* Podfile */,
-				6A09D0EC207D780C00A533F4 /* Gemfile */,
-				6A09D0EA207D780B00A533F4 /* Gemfile.lock */,
-				6A09D0F0207D785D00A533F4 /* .gitignore */,
-				6A1DFAD0207E9D5E000030B7 /* .swiftlint.yml */,
-				6A09D0EB207D780C00A533F4 /* CHANGELOG.md */,
-				6A09D0EE207D780C00A533F4 /* README.md */,
-				6A09D0ED207D780C00A533F4 /* MetovaJSONCodable.podspec */,
-				6A09D0EF207D784800A533F4 /* LICENSE */,
-				6A09D0E6207D3AB700A533F4 /* Package.swift */,
-				6A1DFAD1207E9D77000030B7 /* .travis.yml */,
-				6A1DFAD2207E9DC6000030B7 /* .swift-version */,
-			);
-			path = RelatedFiles;
-			sourceTree = "<group>";
-		};
 		EDF1BBE9B447BBB313030D29 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -406,6 +404,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -462,6 +461,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_VERSION = 4.2;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -483,13 +483,17 @@
 				INFOPLIST_FILE = MetovaJSONCodable/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = Metova.MetovaJSONCodable;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -509,12 +513,16 @@
 				INFOPLIST_FILE = MetovaJSONCodable/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = Metova.MetovaJSONCodable;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -526,10 +534,14 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				INFOPLIST_FILE = MetovaJSONCodableTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = Metova.MetovaJSONCodableTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -541,10 +553,14 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				INFOPLIST_FILE = MetovaJSONCodableTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = Metova.MetovaJSONCodableTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:4.2
 
 import PackageDescription
 

Podfile.lock

@@ -1,16 +1,16 @@
 PODS:
-  - SwiftLint (0.24.2)
+  - SwiftLint (0.27.0)
 
 DEPENDENCIES:
   - SwiftLint
 
 SPEC REPOS:
-  https://github.com/CocoaPods/Specs.git:
+  https://github.com/cocoapods/specs.git:
     - SwiftLint
 
 SPEC CHECKSUMS:
-  SwiftLint: 2aa21b96c8d13396a051bc1cb659d2ce1e0075b0
+  SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
 
 PODFILE CHECKSUM: 411d0ccab0dcae30f64fb55dbc94991c14f178ae
 
-COCOAPODS: 1.5.0
+COCOAPODS: 1.5.3

README.md

@@ -24,7 +24,7 @@ MetovaJSONCodable is a lightweight Codable protocol with addtional support for J
 
 ## Requirements
 
-- Swift 4.0
+- Swift 4.2
 - iOS 9+
 
 ## Installation
@@ -131,9 +131,9 @@ public extension JSONDecodeableIOS8601 {
 
     static var jsonDecoder: JSONDecoder {
 
-    let decoder = JSONDecoder()
-    decoder.dateDecodingStrategy = .iso8601
-    return decoder
+        let decoder = JSONDecoder()
+        decoder.dateDecodingStrategy = .iso8601
+        return decoder
     }
 }
 ```