Merge branch 'release/1.5.1' into master

Blackjacx · Aug 7, 2020 · cf289b0 · cf289b0
2 parents 8fb0b2c + a80b3b8
commit cf289b0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## [Unreleased]
 
 ## [1.5.0] - 2020-08-07
-* [#21](https://github.com/Blackjacx/SHDateFormatter/pull/21): Add month formatting - [@blackjacx](https://github.com/blackjacx).
+* [#21](https://github.com/Blackjacx/SHDateFormatter/pull/21): Add month/year formatting - [@blackjacx](https://github.com/blackjacx).
 
 ## [1.4.3] - 2019-12-03
 * [#19](https://github.com/Blackjacx/SHDateFormatter/pull/19): Add new accessibility date format & Fix Vulnerabilities & 12/24h check - [@blackjacx](https://github.com/blackjacx).

diff --git a/SHDateFormatter.podspec b/SHDateFormatter.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'SHDateFormatter'
-    s.version          = '1.5.0'
+    s.version          = '1.5.1'
     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

diff --git a/SHDateFormatter.xcodeproj/project.pbxproj b/SHDateFormatter.xcodeproj/project.pbxproj
@@ -487,12 +487,12 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 12;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = PCW579R278;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 11;
+				DYLIB_CURRENT_VERSION = 12;
 				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 = 11;
+				CURRENT_PROJECT_VERSION = 12;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = PCW579R278;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 11;
+				DYLIB_CURRENT_VERSION = 12;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = source/Info.plist;

diff --git a/Tests/Info.plist b/Tests/Info.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.5.1</string>
 	<key>CFBundleVersion</key>
-	<string>11</string>
+	<string>12</string>
 </dict>
 </plist>
diff --git a/source/Info.plist b/source/Info.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.5.1</string>
 	<key>CFBundleVersion</key>
-	<string>11</string>
+	<string>12</string>
 </dict>
 </plist>