Merge branch 'release/1.6.0' into master

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## [Unreleased]
 
+## [1.6.0] - 2020-08-11
+*  Add month year combined formatting - [@blackjacx](https://github.com/blackjacx).
+
 ## [1.5.0] - 2020-08-07
 * [#21](https://github.com/Blackjacx/SHDateFormatter/pull/21): Add month/year formatting - [@blackjacx](https://github.com/blackjacx).
 

Gemfile.lock

@@ -14,7 +14,7 @@ GEM
       json (>= 1.5.1)
     atomos (0.1.3)
     aws-eventstream (1.1.0)
-    aws-partitions (1.352.0)
+    aws-partitions (1.354.0)
     aws-sdk-core (3.104.3)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -23,8 +23,8 @@ GEM
     aws-sdk-kms (1.36.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.75.0)
-      aws-sdk-core (~> 3, >= 3.104.1)
+    aws-sdk-s3 (1.77.0)
+      aws-sdk-core (~> 3, >= 3.104.3)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.1)
@@ -76,7 +76,7 @@ GEM
     colored2 (3.1.2)
     commander-fastlane (4.4.6)
       highline (~> 1.7.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     cork (0.3.0)
       colored2 (~> 3.1)
     danger (8.0.4)
@@ -127,7 +127,7 @@ GEM
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     fastimage (2.2.0)
-    fastlane (2.155.1)
+    fastlane (2.155.3)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       aws-sdk-s3 (~> 1.0)

SHDateFormatter.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'SHDateFormatter'
-    s.version          = '1.5.1'
+    s.version          = '1.6.0'
     s.license          = { :type => 'MIT', :file => 'LICENSE' }
     s.summary          = 'A date formatter supporting encoding as well as decoding of many different date and time formats including the often used ISO8601 standard.'
     s.description      = <<-DESC

SHDateFormatter.xcodeproj/project.pbxproj

@@ -487,12 +487,12 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = PCW579R278;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 12;
+				DYLIB_CURRENT_VERSION = 13;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = source/Info.plist;
@@ -528,11 +528,11 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = PCW579R278;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 12;
+				DYLIB_CURRENT_VERSION = 13;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = source/Info.plist;

Tests/Info.plist

@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.1</string>
+	<string>1.6.0</string>
 	<key>CFBundleVersion</key>
-	<string>12</string>
+	<string>13</string>
 </dict>
 </plist>

source/Classes/SHDateFormatter.swift

@@ -9,8 +9,10 @@ public enum SHDateFormat: String {
     case longWeekday            = "EEEE"
     case shortMonth             = "MMM"
     case longMonth              = "MMMM"
-    case longYear               = "yyyy"
     case shortYear              = "yy"
+    case longYear               = "yyyy"
+    case shortYearMonth         = "MMM yy"
+    case longYearMonth          = "MMMM yyyy"
     case shortTimeNoDate
     case shortTimeMediumDate
     case noTimeShortDateNoYear  = "d.M."
@@ -48,7 +50,8 @@ public struct SHDateFormatter {
         let locale = SHDateFormatter.formatter.locale
 
         switch format {
-        case .shortWeekday, .longWeekday, .shortMonth, .longMonth, .longYear, .shortYear, .noTimeShortDateNoYear:
+        case .shortWeekday, .longWeekday, .shortMonth, .longMonth, .longYear, .shortYear, .noTimeShortDateNoYear,
+             .shortYearMonth, .longYearMonth:
             SHDateFormatter.formatter.dateFormat = DateFormatter.dateFormat(fromTemplate: format.rawValue,
                                                                             options: 0,
                                                                             locale: locale)

source/Info.plist

@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.1</string>
+	<string>1.6.0</string>
 	<key>CFBundleVersion</key>
-	<string>12</string>
+	<string>13</string>
 </dict>
 </plist>