diff --git a/src/swift/Block.swift b/src/swift/Block.swift index e27079a95..bf2cee1a8 100644 --- a/src/swift/Block.swift +++ b/src/swift/Block.swift @@ -19,23 +19,23 @@ public struct DispatchWorkItemFlags : OptionSet, RawRepresentable { public static let barrier = DispatchWorkItemFlags(rawValue: 0x1) - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public static let detached = DispatchWorkItemFlags(rawValue: 0x2) - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public static let assignCurrentContext = DispatchWorkItemFlags(rawValue: 0x4) - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public static let noQoS = DispatchWorkItemFlags(rawValue: 0x8) - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public static let inheritQoS = DispatchWorkItemFlags(rawValue: 0x10) - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public static let enforceQoS = DispatchWorkItemFlags(rawValue: 0x20) } -@available(OSX 10.10, iOS 8.0, *) +@available(macOS 10.10, iOS 8.0, *) public class DispatchWorkItem { internal var _block: _DispatchBlock diff --git a/src/swift/Dispatch.swift b/src/swift/Dispatch.swift index ec73acbb7..221555f1f 100644 --- a/src/swift/Dispatch.swift +++ b/src/swift/Dispatch.swift @@ -16,14 +16,14 @@ import CDispatch /// dispatch_assert -@available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) +@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) public enum DispatchPredicate { case onQueue(DispatchQueue) case onQueueAsBarrier(DispatchQueue) case notOnQueue(DispatchQueue) } -@available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) +@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) public func _dispatchPreconditionTest(_ condition: DispatchPredicate) -> Bool { switch condition { case .onQueue(let q): @@ -37,7 +37,7 @@ public func _dispatchPreconditionTest(_ condition: DispatchPredicate) -> Bool { } @_transparent -@available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) +@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) public func dispatchPrecondition(condition: @autoclosure () -> DispatchPredicate) { // precondition is able to determine release-vs-debug asserts where the overlay // cannot, so formulating this into a call that we can call with precondition() @@ -50,44 +50,44 @@ public struct DispatchQoS : Equatable { public let qosClass: QoSClass public let relativePriority: Int - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public static let background = DispatchQoS(qosClass: .background, relativePriority: 0) - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public static let utility = DispatchQoS(qosClass: .utility, relativePriority: 0) - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public static let `default` = DispatchQoS(qosClass: .default, relativePriority: 0) - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public static let userInitiated = DispatchQoS(qosClass: .userInitiated, relativePriority: 0) - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public static let userInteractive = DispatchQoS(qosClass: .userInteractive, relativePriority: 0) public static let unspecified = DispatchQoS(qosClass: .unspecified, relativePriority: 0) public enum QoSClass { - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) case background - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) case utility - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) case `default` - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) case userInitiated - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) case userInteractive case unspecified // _OSQoSClass is internal on Linux, so this initialiser has to // remain as an internal init. - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) internal init?(rawValue: _OSQoSClass) { switch rawValue { case .QOS_CLASS_BACKGROUND: self = .background @@ -100,7 +100,7 @@ public struct DispatchQoS : Equatable { } } - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) internal var rawValue: _OSQoSClass { switch self { case .background: return .QOS_CLASS_BACKGROUND @@ -135,7 +135,7 @@ public enum DispatchTimeoutResult { public extension DispatchGroup { public func notify(qos: DispatchQoS = .unspecified, flags: DispatchWorkItemFlags = [], queue: DispatchQueue, execute work: @escaping @convention(block) () -> ()) { - if #available(OSX 10.10, iOS 8.0, *), qos != .unspecified || !flags.isEmpty { + if #available(macOS 10.10, iOS 8.0, *), qos != .unspecified || !flags.isEmpty { let item = DispatchWorkItem(qos: qos, flags: flags, block: work) dispatch_group_notify(self.__wrapped, queue.__wrapped, item._block) } else { @@ -143,7 +143,7 @@ public extension DispatchGroup { } } - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public func notify(queue: DispatchQueue, work: DispatchWorkItem) { dispatch_group_notify(self.__wrapped, queue.__wrapped, work._block) } diff --git a/src/swift/Queue.swift b/src/swift/Queue.swift index bd79a853c..449831835 100644 --- a/src/swift/Queue.swift +++ b/src/swift/Queue.swift @@ -31,7 +31,7 @@ public extension DispatchQueue { public static let concurrent = Attributes(rawValue: 1<<1) - @available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) + @available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) public static let initiallyInactive = Attributes(rawValue: 1<<2) fileprivate func _attr() -> dispatch_queue_attr_t? { @@ -40,7 +40,7 @@ public extension DispatchQueue { if self.contains(.concurrent) { attr = _swift_dispatch_queue_concurrent() } - if #available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) { + if #available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) { if self.contains(.initiallyInactive) { attr = CDispatch.dispatch_queue_attr_make_initially_inactive(attr) } @@ -50,19 +50,19 @@ public extension DispatchQueue { } public enum GlobalQueuePriority { - @available(OSX, deprecated: 10.10, message: "Use qos attributes instead") + @available(macOS, deprecated: 10.10, message: "Use qos attributes instead") @available(*, deprecated: 8.0, message: "Use qos attributes instead") case high - @available(OSX, deprecated: 10.10, message: "Use qos attributes instead") + @available(macOS, deprecated: 10.10, message: "Use qos attributes instead") @available(*, deprecated: 8.0, message: "Use qos attributes instead") case `default` - @available(OSX, deprecated: 10.10, message: "Use qos attributes instead") + @available(macOS, deprecated: 10.10, message: "Use qos attributes instead") @available(*, deprecated: 8.0, message: "Use qos attributes instead") case low - @available(OSX, deprecated: 10.10, message: "Use qos attributes instead") + @available(macOS, deprecated: 10.10, message: "Use qos attributes instead") @available(*, deprecated: 8.0, message: "Use qos attributes instead") case background @@ -79,14 +79,14 @@ public extension DispatchQueue { public enum AutoreleaseFrequency { case inherit - @available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) + @available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) case workItem - @available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) + @available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) case never internal func _attr(attr: dispatch_queue_attr_t?) -> dispatch_queue_attr_t? { - if #available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) { + if #available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) { switch self { case .inherit: // DISPATCH_AUTORELEASE_FREQUENCY_INHERIT @@ -112,13 +112,13 @@ public extension DispatchQueue { return DispatchQueue(queue: _swift_dispatch_get_main_queue()) } - @available(OSX, deprecated: 10.10, message: "") + @available(macOS, deprecated: 10.10, message: "") @available(*, deprecated: 8.0, message: "") public class func global(priority: GlobalQueuePriority) -> DispatchQueue { return DispatchQueue(queue: CDispatch.dispatch_get_global_queue(priority._translatedValue, 0)) } - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public class func global(qos: DispatchQoS.QoSClass = .default) -> DispatchQueue { return DispatchQueue(queue: CDispatch.dispatch_get_global_queue(Int(qos.rawValue.rawValue), 0)) } @@ -145,11 +145,11 @@ public extension DispatchQueue { if autoreleaseFrequency != .inherit { attr = autoreleaseFrequency._attr(attr: attr) } - if #available(OSX 10.10, iOS 8.0, *), qos != .unspecified { + if #available(macOS 10.10, iOS 8.0, *), qos != .unspecified { attr = CDispatch.dispatch_queue_attr_make_with_qos_class(attr, qos.qosClass.rawValue.rawValue, Int32(qos.relativePriority)) } - if #available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) { + if #available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) { self.init(__label: label, attr: attr, queue: target) } else { self.init(__label: label, attr: attr) @@ -161,17 +161,17 @@ public extension DispatchQueue { return String(validatingUTF8: dispatch_queue_get_label(self.__wrapped))! } - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public func sync(execute workItem: DispatchWorkItem) { CDispatch.dispatch_sync(self.__wrapped, workItem._block) } - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public func async(execute workItem: DispatchWorkItem) { CDispatch.dispatch_async(self.__wrapped, workItem._block) } - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public func async(group: DispatchGroup, execute workItem: DispatchWorkItem) { CDispatch.dispatch_group_async(group.__wrapped, self.__wrapped, workItem._block) } @@ -194,7 +194,7 @@ public extension DispatchQueue { } var block: @convention(block) () -> Void = work - if #available(OSX 10.10, iOS 8.0, *), (qos != .unspecified || !flags.isEmpty) { + if #available(macOS 10.10, iOS 8.0, *), (qos != .unspecified || !flags.isEmpty) { let workItem = DispatchWorkItem(qos: qos, flags: flags, block: work) block = workItem._block } @@ -233,7 +233,7 @@ public extension DispatchQueue { } } - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) private func _syncHelper( fn: (DispatchWorkItem) -> (), flags: DispatchWorkItemFlags, @@ -264,7 +264,7 @@ public extension DispatchQueue { public func sync(flags: DispatchWorkItemFlags, execute work: () throws -> T) rethrows -> T { if flags == .barrier { return try self._syncHelper(fn: _syncBarrier, execute: work, rescue: { throw $0 }) - } else if #available(OSX 10.10, iOS 8.0, *), !flags.isEmpty { + } else if #available(macOS 10.10, iOS 8.0, *), !flags.isEmpty { return try self._syncHelper(fn: sync, flags: flags, execute: work, rescue: { throw $0 }) } else { return try self._syncHelper(fn: sync, execute: work, rescue: { throw $0 }) @@ -277,7 +277,7 @@ public extension DispatchQueue { flags: DispatchWorkItemFlags = [], execute work: @escaping @convention(block) () -> Void) { - if #available(OSX 10.10, iOS 8.0, *), qos != .unspecified || !flags.isEmpty { + if #available(macOS 10.10, iOS 8.0, *), qos != .unspecified || !flags.isEmpty { let item = DispatchWorkItem(qos: qos, flags: flags, block: work) CDispatch.dispatch_after(deadline.rawValue, self.__wrapped, item._block) } else { @@ -291,7 +291,7 @@ public extension DispatchQueue { flags: DispatchWorkItemFlags = [], execute work: @escaping @convention(block) () -> Void) { - if #available(OSX 10.10, iOS 8.0, *), qos != .unspecified || !flags.isEmpty { + if #available(macOS 10.10, iOS 8.0, *), qos != .unspecified || !flags.isEmpty { let item = DispatchWorkItem(qos: qos, flags: flags, block: work) CDispatch.dispatch_after(wallDeadline.rawValue, self.__wrapped, item._block) } else { @@ -299,17 +299,17 @@ public extension DispatchQueue { } } - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public func asyncAfter(deadline: DispatchTime, execute: DispatchWorkItem) { CDispatch.dispatch_after(deadline.rawValue, self.__wrapped, execute._block) } - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public func asyncAfter(wallDeadline: DispatchWallTime, execute: DispatchWorkItem) { CDispatch.dispatch_after(wallDeadline.rawValue, self.__wrapped, execute._block) } - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public var qos: DispatchQoS { var relPri: Int32 = 0 let cls = DispatchQoS.QoSClass(rawValue: _OSQoSClass(qosClass: dispatch_queue_get_qos_class(self.__wrapped, &relPri))!)! diff --git a/src/swift/Source.swift b/src/swift/Source.swift index a877121f8..4057c5981 100644 --- a/src/swift/Source.swift +++ b/src/swift/Source.swift @@ -16,7 +16,7 @@ import _SwiftDispatchOverlayShims public extension DispatchSourceProtocol { public func setEventHandler(qos: DispatchQoS = .unspecified, flags: DispatchWorkItemFlags = [], handler: DispatchSourceHandler?) { - if #available(OSX 10.10, iOS 8.0, *), let h = handler, qos != .unspecified || !flags.isEmpty { + if #available(macOS 10.10, iOS 8.0, *), let h = handler, qos != .unspecified || !flags.isEmpty { let item = DispatchWorkItem(qos: qos, flags: flags, block: h) CDispatch.dispatch_source_set_event_handler((self as! DispatchSource).__wrapped, item._block) } else { @@ -24,13 +24,13 @@ public extension DispatchSourceProtocol { } } - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public func setEventHandler(handler: DispatchWorkItem) { CDispatch.dispatch_source_set_event_handler((self as! DispatchSource).__wrapped, handler._block) } public func setCancelHandler(qos: DispatchQoS = .unspecified, flags: DispatchWorkItemFlags = [], handler: DispatchSourceHandler?) { - if #available(OSX 10.10, iOS 8.0, *), let h = handler, qos != .unspecified || !flags.isEmpty { + if #available(macOS 10.10, iOS 8.0, *), let h = handler, qos != .unspecified || !flags.isEmpty { let item = DispatchWorkItem(qos: qos, flags: flags, block: h) CDispatch.dispatch_source_set_cancel_handler((self as! DispatchSource).__wrapped, item._block) } else { @@ -38,13 +38,13 @@ public extension DispatchSourceProtocol { } } - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public func setCancelHandler(handler: DispatchWorkItem) { CDispatch.dispatch_source_set_cancel_handler((self as! DispatchSource).__wrapped, handler._block) } public func setRegistrationHandler(qos: DispatchQoS = .unspecified, flags: DispatchWorkItemFlags = [], handler: DispatchSourceHandler?) { - if #available(OSX 10.10, iOS 8.0, *), let h = handler, qos != .unspecified || !flags.isEmpty { + if #available(macOS 10.10, iOS 8.0, *), let h = handler, qos != .unspecified || !flags.isEmpty { let item = DispatchWorkItem(qos: qos, flags: flags, block: h) CDispatch.dispatch_source_set_registration_handler((self as! DispatchSource).__wrapped, item._block) } else { @@ -52,12 +52,12 @@ public extension DispatchSourceProtocol { } } - @available(OSX 10.10, iOS 8.0, *) + @available(macOS 10.10, iOS 8.0, *) public func setRegistrationHandler(handler: DispatchWorkItem) { CDispatch.dispatch_source_set_registration_handler((self as! DispatchSource).__wrapped, handler._block) } - @available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) + @available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) public func activate() { (self as! DispatchSource).activate() }