New configuration for CocoaPods and Carthage

- New configuration for CocoaPods and Carthage
- Resolved a bug with time components algebra when one of the time components of a side is undefined

SwiftDate/SwiftDate_macOS/Info.plist → Configs/SwiftDate.plist

@@ -15,11 +15,13 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>4.1</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016 Daniele Margutti. All rights reserved.</string>
+	<string>Copyright © 2017 Daniele Margutti. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

SwiftDate/SwiftDateTests/Info.plist → Configs/SwiftDateTests.plist

@@ -16,6 +16,8 @@
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

Package.swift

@@ -1,5 +1,5 @@
 import PackageDescription
 
 let package = Package(
-	name: "SwiftDate"
+    name: "SwiftDate"
 )

Sources/SwiftDate/DateComponents+Extension.swift → Sources/DateComponents+Extension.swift

@@ -125,6 +125,13 @@ public extension DateComponents {
 			if left != nil && right != nil && left != Int(NSDateComponentUndefined) && right != Int(NSDateComponentUndefined) {
 				let value = left! + (right! * multipler)
 				newCmps.setValue(value, for: component)
+			} else {
+				if left != nil && left != Int(NSDateComponentUndefined) {
+					newCmps.setValue(left!, for: component)
+				}
+				if right != nil && right != Int(NSDateComponentUndefined) {
+					newCmps.setValue(right!, for: component)
+				}
 			}
 		}
 		return newCmps

Sources/SwiftDate/DateInRegionFormatter.swift → Sources/DateInRegionFormatter.swift

@@ -191,7 +191,8 @@ public class DateInRegionFormatter {
 		let isFuture = (fDate > tDate)
         if cmp.year != nil && (cmp.year != 0 || !hasLowerAllowedComponents(than: .year)) {
             let colloquial_time = try self.colloquial_time(forUnit: .year, withValue: cmp.year!, date: fDate)
-            let colloquial_date = try self.localized(unit: .year, withValue: cmp.year!, asFuture: isFuture, args: abs(fDate.year))
+			let value = (cmp.year == 1 ? cmp.year! : fDate.year)
+            let colloquial_date = try self.localized(unit: .year, withValue: value, asFuture: isFuture, args: abs(value))
             return (colloquial_date,colloquial_time)
         }
 
@@ -200,7 +201,7 @@ public class DateInRegionFormatter {
             let colloquial_date = try self.localized(unit: .month, withValue: cmp.month!, asFuture: isFuture, args: abs(cmp.month!))
             return (colloquial_date,colloquial_time)
         }
-
+		
         if cmp.day != nil && (cmp.day != 0 || !hasLowerAllowedComponents(than: .day)) {
             // Week ago
             if cmp.day! >= DAYS_IN_WEEK {
@@ -216,9 +217,9 @@ public class DateInRegionFormatter {
         }
 
         if cmp.hour != nil && (cmp.hour != 0 || !hasLowerAllowedComponents(than: .hour)) {
-            let colloquial_time = try self.colloquial_time(forUnit: .hour, withValue: cmp.hour!, date: fDate)
-            let colloquial_date = try self.localized(unit: .hour, withValue: cmp.hour!, asFuture: isFuture, args: abs(cmp.hour!))
-            return (colloquial_date,colloquial_time)
+			let colloquial_time = try self.colloquial_time(forUnit: .hour, withValue: cmp.hour!, date: fDate)
+			let colloquial_date = try self.localized(unit: .hour, withValue: cmp.hour!, asFuture: isFuture, args: abs(cmp.hour!))
+			return (colloquial_date,colloquial_time)
         }
 
         if cmp.minute != nil && (cmp.minute != 0 || !hasLowerAllowedComponents(than: .minute)) {

SwiftDate.podspec

@@ -1,18 +1,19 @@
-Pod::Spec.new do |spec|
-  spec.name = 'SwiftDate'
-  spec.version = '4.1.2'
-  spec.summary = 'The best way to deal with Dates & Time Zones in Swift'
-  spec.homepage = 'https://github.com/malcommac/SwiftDate'
-  spec.license = { :type => 'MIT', :file => 'LICENSE' }
-  spec.author = { 'Daniele Margutti' => 'me@danielemargutti.com' }
-  spec.social_media_url = 'http://twitter.com/danielemargutti'
-  spec.source = { :git => 'https://github.com/malcommac/SwiftDate.git', :tag => "#{spec.version}" }
-  spec.source_files = 'Sources/**/*.swift'
-  spec.ios.deployment_target = '8.0'
-  spec.watchos.deployment_target = '2.0'
-  spec.osx.deployment_target = '10.10'
-  spec.tvos.deployment_target = '9.0'
-  spec.requires_arc = true
-  spec.module_name = 'SwiftDate'
-  spec.resource = 'Sources/SwiftDate/SwiftDate.bundle'
+Pod::Spec.new do |s|
+  s.name         = "SwiftDate"
+  s.version      = "4.1.5"
+  s.summary      = "The best way to deal with Dates & Time Zones in Swift"
+  s.homepage     = "https://github.com/malcommac/SwiftDate"
+  s.license      = { :type => "MIT", :file => "LICENSE" }
+  s.author             = { "Daniele Margutti" => "me@danielemargutti.com" }
+  s.social_media_url   = "http://twitter.com/danielemargutti"
+  s.ios.deployment_target = "8.0"
+  s.osx.deployment_target = "10.10"
+  s.watchos.deployment_target = "2.0"
+  s.tvos.deployment_target = "9.0"
+  s.source       = { :git => "https://github.com/malcommac/SwiftDate.git", :tag => s.version.to_s }
+  s.source_files  = "Sources/**/*.swift"
+  s.frameworks  = "Foundation"
+  s.requires_arc = true
+  s.module_name = 'SwiftDate'
+  s.resource = 'Sources/SwiftDate/SwiftDate.bundle'
 end