Skip to content

Commit

Permalink
Merge branch 'release/1.6.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
Blackjacx committed Apr 9, 2021
2 parents be6168e + 066eb17 commit 60b3776
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 16 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## [Unreleased]

## [1.6.3] - 2021-04-09Z
* Exclude info plist in package manifest - [@blackjacx](https://github.com/blackjacx).

## [1.6.2] - 2021-04-08
* [#25](https://github.com/Blackjacx/SHDateFormatter/pull/25): Add notimeiso8601date format - [@stherold](https://github.com/stherold).

## [1.6.1] - 2021-02-23
* Xcode 12.4 migrations - [@blackjacx](https://github.com/blackjacx).
* Disables SwiftLint - [@blackjacx](https://github.com/blackjacx).
Expand Down
10 changes: 3 additions & 7 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,10 @@ let package = Package(
// .watchOS(.v3)
],
products: [
.library(
name: "SHDateFormatter",
targets: ["SHDateFormatter"])
.library(name: "SHDateFormatter", targets: ["SHDateFormatter"])
],
targets: [
.target(
name: "SHDateFormatter",
path: "source")
.target(name: "SHDateFormatter", path: "source", exclude: ["Info.plist"])
],
swiftLanguageVersions: [.v5]
)
)
2 changes: 1 addition & 1 deletion SHDateFormatter.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'SHDateFormatter'
s.version = '1.6.2'
s.version = '1.6.3'
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
Expand Down
8 changes: 4 additions & 4 deletions SHDateFormatter.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -470,12 +470,12 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 15;
CURRENT_PROJECT_VERSION = 16;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = PCW579R278;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 15;
DYLIB_CURRENT_VERSION = 16;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = source/Info.plist;
Expand Down Expand Up @@ -511,11 +511,11 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 15;
CURRENT_PROJECT_VERSION = 16;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = PCW579R278;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 15;
DYLIB_CURRENT_VERSION = 16;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = source/Info.plist;
Expand Down
4 changes: 2 additions & 2 deletions Tests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.6.2</string>
<string>1.6.3</string>
<key>CFBundleVersion</key>
<string>15</string>
<string>16</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions source/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.6.2</string>
<string>1.6.3</string>
<key>CFBundleVersion</key>
<string>15</string>
<string>16</string>
</dict>
</plist>

0 comments on commit 60b3776

Please sign in to comment.