update for Xcode 8 beta 4

kevinlawler · Aug 2, 2016 · 6f1041c · 6f1041c
1 parent 8b096d8
commit 6f1041c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/NSDate+Extension.swift b/NSDate+Extension.swift
@@ -24,7 +24,7 @@ func NSDateTimeAgoLocalizedStrings(_ key: String) -> String {
         return ""
     }
 
-    let path = try! URL(fileURLWithPath: resourcePath!).appendingPathComponent("NSDateTimeAgo.bundle")
+    let path = URL(fileURLWithPath: resourcePath!).appendingPathComponent("NSDateTimeAgo.bundle")
     guard let bundle = Bundle(url: path) else {
         return ""
     }
@@ -138,8 +138,7 @@ extension Date {
     }
 
     private func dateComponents() -> DateComponents {
-        let calander = Calendar.current
-        return calander.components([.second, .minute, .hour, .day, .month, .year], from: self, to: Date(), options: [])
+        return Calendar.current.dateComponents([.second, .minute, .hour, .day, .month, .year], from: self, to: Date())
     }
 
     private func string(fromFormat format: String, withValue value: Int) -> String {

diff --git a/Tests/NSDateTimeAgoTests.swift b/Tests/NSDateTimeAgoTests.swift
@@ -21,11 +21,11 @@ class NSDateTimeAgoTests: XCTestCase {
         super.tearDown()
     }
 
-    func dateForComponents(block: (inout components: DateComponents) -> Void) -> Date? {
+    func dateForComponents(block: ( components: inout DateComponents) -> Void) -> Date? {
         let calander = Calendar.current
         var components = DateComponents()
         block(components: &components)
-        return calander.date(byAdding: components, to: Date(), options: [])
+        return calander.date(byAdding: components, to: Date())
     }
 
     // MARK: - timeAgoSimple