Skip to content

Commit

Permalink
Merge branch 'release/6.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
malcommac committed Mar 28, 2019
2 parents 6caadd4 + 11a0308 commit 8da3c1c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Configs/SwiftDate.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>6.0.0</string>
<string>6.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,27 +48,27 @@ public extension RelativeFormatter {
/// The first available flavour for specified locale is used.
/// If no flavour is available `.long` is used instead (this flavour
/// MUST be part of every lang structure).
var flavours: [Flavour]
public var flavours: [Flavour]

/// Gradation specify how the unit are evaluated in order to get the
/// best one to represent a given amount of time interval.
/// By default `convenient()` is used.
var gradation: Gradation = .convenient()
public var gradation: Gradation = .convenient()

/// Allowed time units the style can use. Some styles may not include
/// some time units (ie. `.quarter`) because they are not useful for
/// a given representation.
/// If not specified all the following units are set:
/// `.now, .minute, .hour, .day, .week, .month, .year`
var allowedUnits: [Unit]?
public var allowedUnits: [Unit]?

/// Create a new style.
///
/// - Parameters:
/// - flavours: flavours of the style.
/// - gradation: gradation rules.
/// - units: allowed units.
init(flavours: [Flavour], gradation: Gradation, allowedUnits units: [Unit]? = nil) {
public init(flavours: [Flavour], gradation: Gradation, allowedUnits units: [Unit]? = nil) {
self.flavours = flavours
self.gradation = gradation
allowedUnits = (units ?? [.now, .minute, .hour, .day, .week, .month, .year])
Expand Down
2 changes: 1 addition & 1 deletion SwiftDate.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "SwiftDate"
s.version = "6.0.0"
s.version = "6.0.1"
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" }
Expand Down

0 comments on commit 8da3c1c

Please sign in to comment.