Merge branch 'release/5.0.4'

malcommac · Jul 18, 2018 · a5e4633 · a5e4633
2 parents 1c6593a + 0cfe021
commit a5e4633
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -5,6 +5,7 @@ disabled_rules: # rule identifiers to exclude from running
   - multiple_closures_with_trailing_closure
   - xctfail_message
   - vertical_parameter_alignment
+  - identifier_name
 
   # Swift 3 rules that do not make sense for Swift 2.3
   - implicit_getter

diff --git a/Sources/SwiftDate/DateInRegion/DateInRegion.swift b/Sources/SwiftDate/DateInRegion/DateInRegion.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public struct DateInRegion: DateRepresentable, Codable, CustomStringConvertible, Comparable, Hashable {
+public struct DateInRegion: DateRepresentable, Decodable, CustomStringConvertible, Comparable, Hashable {
 
 	/// Absolute date represented. This date is not associated with any timezone or calendar
 	/// but represent the absolute number of seconds since Jan 1, 2001 at 00:00:00 UTC.

diff --git a/Sources/SwiftDate/DateInRegion/Region.swift b/Sources/SwiftDate/DateInRegion/Region.swift
@@ -10,7 +10,7 @@ import Foundation
 
 /// Region define a context both for `Date` and `DateInRegion`.
 /// Each `Date` is assigned to the currently set `SwiftDate.default
-public struct Region: Codable, Equatable, Hashable, CustomStringConvertible {
+public struct Region: Decodable, Equatable, Hashable, CustomStringConvertible {
 
 	// MARK: - Properties
 

diff --git a/SwiftDate.podspec b/SwiftDate.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SwiftDate"
-  s.version      = "5.0.3"
+  s.version      = "5.0.4"
   s.summary      = "The best way to deal with Dates & Time Zones in Swift"
   s.homepage     = "https://github.com/malcommac/SwiftDate.git"
   s.license      = { :type => "MIT", :file => "LICENSE" }