Merge pull request #1257 from ianpartridge/api-fixup-4.0
[4.0] Darwin API compatibility fixes
diff --git a/Foundation/ByteCountFormatter.swift b/Foundation/ByteCountFormatter.swift
index e268880..3234e4e 100644
--- a/Foundation/ByteCountFormatter.swift
+++ b/Foundation/ByteCountFormatter.swift
@@ -13,8 +13,6 @@
public let rawValue : UInt
public init(rawValue: UInt) { self.rawValue = rawValue }
- // This causes default units appropriate for the platform to be used. Specifying any units explicitly causes just those units to be used in showing the number.
- public static let useDefault = Units(rawValue: 0)
// Specifying any of the following causes the specified units to be used in showing the number.
public static let useBytes = Units(rawValue: 1 << 0)
public static let useKB = Units(rawValue: 1 << 1)
@@ -50,9 +48,9 @@
NSUnimplemented()
}
- /* Specify the units that can be used in the output. If ByteCountFormatter.Units.useDefault, uses platform-appropriate settings; otherwise will only use the specified units. This is the default value. Note that ZB and YB cannot be covered by the range of possible values, but you can still choose to use these units to get fractional display ("0.0035 ZB" for instance).
+ /* Specify the units that can be used in the output. If ByteCountFormatter.Units is empty, uses platform-appropriate settings; otherwise will only use the specified units. This is the default value. Note that ZB and YB cannot be covered by the range of possible values, but you can still choose to use these units to get fractional display ("0.0035 ZB" for instance).
*/
- open var allowedUnits: Units = .useDefault
+ open var allowedUnits: Units = []
/* Specify how the count is displayed by indicating the number of bytes to be used for kilobyte. The default setting is ByteCountFormatter.CountStyle.fileCount, which is the system specific value for file and storage sizes.
*/
@@ -127,52 +125,52 @@
*/
private func convertValue(fromByteCount byteCount: Int64, for byteSize: [Unit: Double]) -> String {
let byte = Double(byteCount)
- if byte == 0, allowsNonnumericFormatting, allowedUnits == .useDefault, includesUnit, includesCount {
+ if byte == 0, allowsNonnumericFormatting, allowedUnits == [], includesUnit, includesCount {
return partsToIncludeFor(value: "Zero", unit: Unit.KB)
} else if byte == 1 || byte == -1 {
- if allowedUnits.contains(.useAll) || allowedUnits == .useDefault {
+ if allowedUnits.contains(.useAll) || allowedUnits == [] {
return formatNumberFor(bytes: byte, unit: Unit.byte)
} else {
return valueToUseFor(byteCount: byte, unit: allowedUnits)
}
} else if byte < byteSize[Unit.KB]! && byte > -byteSize[Unit.KB]!{
- if allowedUnits.contains(.useAll) || allowedUnits == .useDefault {
+ if allowedUnits.contains(.useAll) || allowedUnits == [] {
return formatNumberFor(bytes: byte, unit: Unit.bytes)
} else {
return valueToUseFor(byteCount: byte, unit: allowedUnits)
}
} else if byte < byteSize[Unit.MB]! && byte > -byteSize[Unit.MB]! {
- if allowedUnits.contains(.useAll) || allowedUnits == .useDefault {
+ if allowedUnits.contains(.useAll) || allowedUnits == [] {
return divide(byte, by: byteSize, for: .KB)
}
return valueToUseFor(byteCount: byte, unit: allowedUnits)
} else if byte < byteSize[Unit.GB]! && byte > -byteSize[Unit.GB]! {
- if allowedUnits.contains(.useAll) || allowedUnits == .useDefault {
+ if allowedUnits.contains(.useAll) || allowedUnits == [] {
return divide(byte, by: byteSize, for: .MB)
}
return valueToUseFor(byteCount: byte, unit: allowedUnits)
} else if byte < byteSize[Unit.TB]! && byte > -byteSize[Unit.TB]! {
- if allowedUnits.contains(.useAll) || allowedUnits == .useDefault {
+ if allowedUnits.contains(.useAll) || allowedUnits == [] {
return divide(byte, by: byteSize, for: .GB)
}
return valueToUseFor(byteCount: byte, unit: allowedUnits)
} else if byte < byteSize[Unit.PB]! && byte > -byteSize[Unit.PB]! {
- if allowedUnits.contains(.useAll) || allowedUnits == .useDefault {
+ if allowedUnits.contains(.useAll) || allowedUnits == [] {
return divide(byte, by: byteSize, for: .TB)
}
return valueToUseFor(byteCount: byte, unit: allowedUnits)
} else if byte < byteSize[Unit.EB]! && byte > -byteSize[Unit.EB]! {
- if allowedUnits.contains(.useAll) || allowedUnits == .useDefault {
+ if allowedUnits.contains(.useAll) || allowedUnits == [] {
return divide(byte, by: byteSize, for: .PB)
}
return valueToUseFor(byteCount: byte, unit: allowedUnits)
} else {
- if allowedUnits.contains(.useAll) || allowedUnits == .useDefault {
+ if allowedUnits.contains(.useAll) || allowedUnits == [] {
return divide(byte, by: byteSize, for: .EB)
}
return valueToUseFor(byteCount: byte, unit: allowedUnits)
@@ -297,7 +295,7 @@
} else {
if lengthOfInt(number: Int(bytes)) == 3 {
numberFormatter.usesSignificantDigits = false
- numberFormatter.maximumFractionDigits = 1
+ numberFormatter.maximumFractionDigits = 0
} else {
numberFormatter.maximumSignificantDigits = 3
numberFormatter.minimumSignificantDigits = 3
@@ -376,7 +374,7 @@
} else if includesCount, includesUnit {
return "\(value) \(unit)"
} else if includesCount, !includesUnit {
- if value == "Zero", allowedUnits == .useDefault {
+ if value == "Zero", allowedUnits == [] {
return "0"
} else {
return value
diff --git a/Foundation/JSONEncoder.swift b/Foundation/JSONEncoder.swift
index 59a3844..ecafeed 100644
--- a/Foundation/JSONEncoder.swift
+++ b/Foundation/JSONEncoder.swift
@@ -65,7 +65,7 @@
/// The strategy to use for encoding `Data` values.
public enum DataEncodingStrategy {
/// Encoded the `Data` as a Base64-encoded string. This is the default strategy.
- case base64Encode
+ case base64
/// Encode the `Data` as a custom value encoded by the given closure.
///
@@ -88,8 +88,8 @@
/// The strategy to use in encoding dates. Defaults to `.deferredToDate`.
open var dateEncodingStrategy: DateEncodingStrategy = .deferredToDate
- /// The strategy to use in encoding binary data. Defaults to `.base64Encode`.
- open var dataEncodingStrategy: DataEncodingStrategy = .base64Encode
+ /// The strategy to use in encoding binary data. Defaults to `.base64`.
+ open var dataEncodingStrategy: DataEncodingStrategy = .base64
/// The strategy to use in encoding non-conforming numbers. Defaults to `.throw`.
open var nonConformingFloatEncodingStrategy: NonConformingFloatEncodingStrategy = .throw
@@ -672,7 +672,7 @@
fileprivate func box(_ data: Data) throws -> NSObject {
switch self.options.dataEncodingStrategy {
- case .base64Encode:
+ case .base64:
return NSString(string: data.base64EncodedString())
case .custom(let closure):
@@ -827,7 +827,7 @@
/// The strategy to use for decoding `Data` values.
public enum DataDecodingStrategy {
/// Decode the `Data` from a Base64-encoded string. This is the default strategy.
- case base64Decode
+ case base64
/// Decode the `Data` as a custom value decoded by the given closure.
case custom((_ decoder: Decoder) throws -> Data)
@@ -845,8 +845,8 @@
/// The strategy to use in decoding dates. Defaults to `.deferredToDate`.
open var dateDecodingStrategy: DateDecodingStrategy = .deferredToDate
- /// The strategy to use in decoding binary data. Defaults to `.base64Decode`.
- open var dataDecodingStrategy: DataDecodingStrategy = .base64Decode
+ /// The strategy to use in decoding binary data. Defaults to `.base64`.
+ open var dataDecodingStrategy: DataDecodingStrategy = .base64
/// The strategy to use in decoding non-conforming numbers. Defaults to `.throw`.
open var nonConformingFloatDecodingStrategy: NonConformingFloatDecodingStrategy = .throw
@@ -2042,7 +2042,7 @@
guard !(value is NSNull) else { return nil }
switch self.options.dataDecodingStrategy {
- case .base64Decode:
+ case .base64:
guard let string = value as? String else {
throw DecodingError._typeMismatch(at: self.codingPath, expectation: type, reality: value)
}
diff --git a/Foundation/NSNotification.swift b/Foundation/NSNotification.swift
index 688b86a..b848d6d 100644
--- a/Foundation/NSNotification.swift
+++ b/Foundation/NSNotification.swift
@@ -169,7 +169,7 @@
}
}
- open func post(name aName: Notification.Name, object anObject: Any?, userInfo aUserInfo: [AnyHashable : Any]? = nil) {
+ open func post(name aName: NSNotification.Name, object anObject: Any?, userInfo aUserInfo: [AnyHashable : Any]? = nil) {
let notification = Notification(name: aName, object: anObject, userInfo: aUserInfo)
post(notification)
}
@@ -187,8 +187,13 @@
self._observers = _observers.filterOutObserver(observer, name: aName, object: object)
})
}
-
- open func addObserver(forName name: Notification.Name?, object obj: Any?, queue: OperationQueue?, usingBlock block: @escaping (Notification) -> Void) -> NSObjectProtocol {
+
+ @available(*,obsoleted:4.0,renamed:"addObserver(forName:object:queue:using:)")
+ open func addObserver(forName name: NSNotification.Name?, object obj: Any?, queue: OperationQueue?, usingBlock block: @escaping (Notification) -> Void) -> NSObjectProtocol {
+ return addObserver(forName: name, object: obj, queue: queue, using: block)
+ }
+
+ open func addObserver(forName name: NSNotification.Name?, object obj: Any?, queue: OperationQueue?, using block: @escaping (Notification) -> Void) -> NSObjectProtocol {
let object = NSObject()
let newObserver = NSNotificationReceiver()
diff --git a/Foundation/NSTextCheckingResult.swift b/Foundation/NSTextCheckingResult.swift
index caed9a8..74dd8c0 100644
--- a/Foundation/NSTextCheckingResult.swift
+++ b/Foundation/NSTextCheckingResult.swift
@@ -87,7 +87,7 @@
extension NSTextCheckingResult {
- public func resultByAdjustingRangesWithOffset(_ offset: Int) -> NSTextCheckingResult {
+ public func adjustingRanges(offset: Int) -> NSTextCheckingResult {
let count = self.numberOfRanges
var newRanges = [NSRange]()
for idx in 0..<count {
diff --git a/Foundation/Stream.swift b/Foundation/Stream.swift
index d34949d..410be23 100644
--- a/Foundation/Stream.swift
+++ b/Foundation/Stream.swift
@@ -241,11 +241,11 @@
#endif
extension StreamDelegate {
- func stream(_ aStream: Stream, handleEvent eventCode: Stream.Event) { }
+ func stream(_ aStream: Stream, handle eventCode: Stream.Event) { }
}
public protocol StreamDelegate : class {
- func stream(_ aStream: Stream, handleEvent eventCode: Stream.Event)
+ func stream(_ aStream: Stream, handle eventCode: Stream.Event)
}
// MARK: -
diff --git a/TestFoundation/TestByteCountFormatter.swift b/TestFoundation/TestByteCountFormatter.swift
index 8046a0f..c077266 100644
--- a/TestFoundation/TestByteCountFormatter.swift
+++ b/TestFoundation/TestByteCountFormatter.swift
@@ -49,7 +49,7 @@
func test_DefaultValues() {
let formatter = ByteCountFormatter()
- XCTAssertEqual(formatter.allowedUnits, ByteCountFormatter.Units.useDefault)
+ XCTAssertEqual(formatter.allowedUnits, [])
XCTAssertEqual(formatter.countStyle, ByteCountFormatter.CountStyle.file)
XCTAssertEqual(formatter.allowsNonnumericFormatting, true)
XCTAssertEqual(formatter.includesUnit, true)
@@ -68,7 +68,7 @@
formatter.allowedUnits = .useGB
XCTAssertEqual(formatter.string(fromByteCount: 0), "Zero KB")
- formatter.allowedUnits = .useDefault
+ formatter.allowedUnits = []
formatter.allowsNonnumericFormatting = false
XCTAssertEqual(formatter.string(fromByteCount: 0), "0 bytes")
@@ -91,7 +91,7 @@
formatter.allowedUnits = .useGB
XCTAssertEqual(formatter.string(fromByteCount: 1), "0 GB")
- formatter.allowedUnits = .useDefault
+ formatter.allowedUnits = []
formatter.isAdaptive = false
XCTAssertEqual(formatter.string(fromByteCount: 1), "1 byte")
@@ -365,7 +365,7 @@
XCTAssertEqual(formatter.string(fromByteCount: 11999), "12.0 KB")
XCTAssertEqual(formatter.string(fromByteCount: 900000), "900 KB")
XCTAssertEqual(formatter.string(fromByteCount: 12345678), "12.3 MB")
- XCTAssertEqual(formatter.string(fromByteCount: 123456789), "123.5 MB")
+ XCTAssertEqual(formatter.string(fromByteCount: 123456789), "123 MB")
XCTAssertEqual(formatter.string(fromByteCount: 1234567898), "1.23 GB")
XCTAssertEqual(formatter.string(fromByteCount: 12345678987), "12.3 GB")
}
diff --git a/TestFoundation/TestJSONEncoder.swift b/TestFoundation/TestJSONEncoder.swift
index 842eb52..76dc81a 100644
--- a/TestFoundation/TestJSONEncoder.swift
+++ b/TestFoundation/TestJSONEncoder.swift
@@ -446,8 +446,8 @@
outputFormatting: JSONEncoder.OutputFormatting = [],
dateEncodingStrategy: JSONEncoder.DateEncodingStrategy = .deferredToDate,
dateDecodingStrategy: JSONDecoder.DateDecodingStrategy = .deferredToDate,
- dataEncodingStrategy: JSONEncoder.DataEncodingStrategy = .base64Encode,
- dataDecodingStrategy: JSONDecoder.DataDecodingStrategy = .base64Decode,
+ dataEncodingStrategy: JSONEncoder.DataEncodingStrategy = .base64,
+ dataDecodingStrategy: JSONDecoder.DataDecodingStrategy = .base64,
nonConformingFloatEncodingStrategy: JSONEncoder.NonConformingFloatEncodingStrategy = .throw,
nonConformingFloatDecodingStrategy: JSONDecoder.NonConformingFloatDecodingStrategy = .throw) where T : Codable, T : Equatable {
var payload: Data! = nil
diff --git a/TestFoundation/TestNSTextCheckingResult.swift b/TestFoundation/TestNSTextCheckingResult.swift
index f008fc2..181898f 100644
--- a/TestFoundation/TestNSTextCheckingResult.swift
+++ b/TestFoundation/TestNSTextCheckingResult.swift
@@ -34,17 +34,17 @@
let searchRange = NSMakeRange(0,7)
let match: NSTextCheckingResult = regex.firstMatch(in: searchString, options: searchOptions, range: searchRange)!
//Positive offset
- var result = match.resultByAdjustingRangesWithOffset(1)
+ var result = match.adjustingRanges(offset: 1)
XCTAssertEqual(result.range(at: 0).location, 6)
XCTAssertEqual(result.range(at: 1).location, NSNotFound)
XCTAssertEqual(result.range(at: 2).location, 6)
//Negative offset
- result = match.resultByAdjustingRangesWithOffset(-2)
+ result = match.adjustingRanges(offset: -2)
XCTAssertEqual(result.range(at: 0).location, 3)
XCTAssertEqual(result.range(at: 1).location, NSNotFound)
XCTAssertEqual(result.range(at: 2).location, 3)
//ZeroOffset
- result = match.resultByAdjustingRangesWithOffset(0)
+ result = match.adjustingRanges(offset: 0)
XCTAssertEqual(result.range(at: 0).location, 5)
XCTAssertEqual(result.range(at: 1).location, NSNotFound)
XCTAssertEqual(result.range(at: 2).location, 5)
