Change the NSHTTPCookie API to the Darwin version

Author: Pushkar N Kulkarni

Foundation/NSCache.swift

@@ -38,7 +38,7 @@ public class NSCache : NSObject {
 
     public weak var delegate: NSCacheDelegate?
 
-    public func objectForKey(_ key: AnyObject) -> AnyObject? {
+    public func object(forKey key: AnyObject) -> AnyObject? {
         var object: AnyObject?
 
         let keyRef = unsafeBitCast(key, to: UnsafePointer<Void>.self)
@@ -157,7 +157,7 @@ public class NSCache : NSObject {
         _lock.unlock()
     }
 
-    public func removeObjectForKey(_ key: AnyObject) {
+    public func removeObject(forKey key: AnyObject) {
         let keyRef = unsafeBitCast(key, to: UnsafePointer<Void>.self)
 
         _lock.lock()

Foundation/NSCalendar.swift

@@ -814,7 +814,7 @@ public class NSCalendar : NSObject, NSCopying, NSSecureCoding {
     */
     public func isDateInYesterday(_ date: NSDate) -> Bool {
         if let interval = rangeOfUnit(.Day, forDate: NSDate()) {
-            let inYesterday = interval.start.dateByAddingTimeInterval(-60.0)
+            let inYesterday = interval.start.addingTimeInterval(-60.0)
             return compareDate(date, toDate: inYesterday, toUnitGranularity: .Day) == .OrderedSame
         } else {
             return false
@@ -826,7 +826,7 @@ public class NSCalendar : NSObject, NSCopying, NSSecureCoding {
     */
     public func isDateInTomorrow(_ date: NSDate) -> Bool {
         if let interval = rangeOfUnit(.Day, forDate: NSDate()) {
-            let inTomorrow = interval.end.dateByAddingTimeInterval(60.0)
+            let inTomorrow = interval.end.addingTimeInterval(60.0)
             return compareDate(date, toDate: inTomorrow, toUnitGranularity: .Day) == .OrderedSame
         } else {
             return false
@@ -878,7 +878,7 @@ public class NSCalendar : NSObject, NSCopying, NSSecureCoding {
             let comp = NSDateComponents()
             comp.weekday = range.start
             if let nextStart = nextDateAfterDate(date, matchingComponents: comp, options: options.union(.MatchNextTime)) {
-                let start = nextStart.dateByAddingTimeInterval(range.onsetTime)
+                let start = nextStart.addingTimeInterval(range.onsetTime)
                 comp.weekday = range.end
                 if let nextEnd = nextDateAfterDate(date, matchingComponents: comp, options: options.union(.MatchNextTime)) {
                     var end = nextEnd
@@ -890,7 +890,7 @@ public class NSCalendar : NSObject, NSCopying, NSSecureCoding {
                         }
                     }
                     if range.ceaseTime > 0 {
-                        end = end.dateByAddingTimeInterval(range.ceaseTime)
+                        end = end.addingTimeInterval(range.ceaseTime)
                     } else {
                         if let dayEnd = rangeOfUnit(.Day, forDate: end) {
                             end = startOfDayForDate(dayEnd.end)
@@ -1042,7 +1042,7 @@ public class NSCalendar : NSObject, NSCopying, NSSecureCoding {
             if opts.contains(.MatchStrictly) {
                 options.unionInPlace(.MatchStrictly)
             }
-            if let result = nextDateAfterDate(range.start.dateByAddingTimeInterval(-0.5), matchingComponents: comps, options: options) {
+            if let result = nextDateAfterDate(range.start.addingTimeInterval(-0.5), matchingComponents: comps, options: options) {
                 if result.compare(range.start) == .OrderedAscending {
                     return nextDateAfterDate(range.start, matchingComponents: comps, options: options)
                 }

Foundation/NSData.swift

@@ -30,7 +30,7 @@ public class NSDate : NSObject, NSCopying, NSSecureCoding, NSCoding {
 
     public override func isEqual(_ object: AnyObject?) -> Bool {
         if let date = object as? NSDate {
-            return isEqualToDate(date)
+            return isEqual(to: date)
         } else {
             return false
         }
@@ -149,19 +149,19 @@ public class NSDate : NSObject, NSCopying, NSSecureCoding, NSCoding {
 
 extension NSDate {
 
-    public func timeIntervalSinceDate(_ anotherDate: NSDate) -> NSTimeInterval {
+    public func timeIntervalSince(_ anotherDate: NSDate) -> NSTimeInterval {
         return self.timeIntervalSinceReferenceDate - anotherDate.timeIntervalSinceReferenceDate
     }
 
     public var timeIntervalSinceNow: NSTimeInterval {
-        return timeIntervalSinceDate(NSDate())
+        return timeIntervalSince(NSDate())
     }
 
     public var timeIntervalSince1970: NSTimeInterval {
         return timeIntervalSinceReferenceDate + NSTimeIntervalSince1970
     }
 
-    public func dateByAddingTimeInterval(_ ti: NSTimeInterval) -> NSDate {
+    public func addingTimeInterval(_ ti: NSTimeInterval) -> NSDate {
         return NSDate(timeIntervalSinceReferenceDate:_timeIntervalSinceReferenceDate + ti)
     }
 
@@ -193,7 +193,7 @@ extension NSDate {
         }
     }
 
-    public func isEqualToDate(_ otherDate: NSDate) -> Bool {
+    public func isEqual(to otherDate: NSDate) -> Bool {
         return timeIntervalSinceReferenceDate == otherDate.timeIntervalSinceReferenceDate
     }
 }

Foundation/NSDate.swift

@@ -47,10 +47,10 @@ public class NSDateFormatter : NSFormatter {
 
     public override func stringForObjectValue(_ obj: AnyObject) -> String? {
         guard let date = obj as? NSDate else { return nil }
-        return stringFromDate(date)
+        return string(from: date)
     }
 
-    public func stringFromDate(_ date: NSDate) -> String {
+    public func string(from date: NSDate) -> String {
         return CFDateFormatterCreateStringWithDate(kCFAllocatorSystemDefault, _cfObject, date._cfObject)._swiftObject
     }
 
@@ -65,14 +65,14 @@ public class NSDateFormatter : NSFormatter {
         return date
     }
 
-    public class func localizedStringFromDate(_ date: NSDate, dateStyle dstyle: NSDateFormatterStyle, timeStyle tstyle: NSDateFormatterStyle) -> String {
+    public class func localizedString(from date: NSDate, dateStyle dstyle: NSDateFormatterStyle, timeStyle tstyle: NSDateFormatterStyle) -> String {
         let df = NSDateFormatter()
         df.dateStyle = dstyle
         df.timeStyle = tstyle
         return df.stringForObjectValue(date)!
     }
 
-    public class func dateFormatFromTemplate(_ tmplate: String, options opts: Int, locale: NSLocale?) -> String? {
+    public class func dateFormat(fromTemplate tmplate: String, options opts: Int, locale: NSLocale?) -> String? {
         guard let res = CFDateFormatterCreateDateFormatFromTemplate(kCFAllocatorSystemDefault, tmplate._cfObject, CFOptionFlags(opts), locale?._cfObject) else {
             return nil
         }

Foundation/NSDateFormatter.swift

@@ -111,7 +111,7 @@ public class NSFileHandle : NSObject, NSSecureCoding {
     }
 
     public func writeData(_ data: NSData) {
-        data.enumerateByteRangesUsingBlock() { (bytes, range, stop) in
+        data.enumerateBytes() { (bytes, range, stop) in
             do {
                 try NSData.writeToFileDescriptor(self._fd, path: nil, buf: bytes, length: range.length)
             } catch {

Foundation/NSFileHandle.swift

@@ -680,7 +680,7 @@ public class NSFileManager : NSObject {
 
     public func createFile(atPath path: String, contents data: NSData?, attributes attr: [String : AnyObject]? = [:]) -> Bool {
         do {
-            try (data ?? NSData()).writeToFile(path, options: .DataWritingAtomic)
+            try (data ?? NSData()).write(toFile: path, options: .dataWritingAtomic)
             return true
         } catch _ {
             return false