Skip to content

[gardening][Overlay] Prefer macOS over OSX for @available #15445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 23, 2018
Merged

[gardening][Overlay] Prefer macOS over OSX for @available #15445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions stdlib/public/SDK/Accelerate/BNNS.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import Swift

%{
bnns2016 = [
('OSX','10.12'), ('iOS','10.0'), ('tvOS','10.0'), ('watchOS','3.0')
('macOS','10.12'), ('iOS','10.0'), ('tvOS','10.0'), ('watchOS','3.0')
]

bnns2017 = [
('OSX','10.13'), ('iOS','11.0'), ('tvOS','11.0'), ('watchOS','4.0')
('macOS','10.13'), ('iOS','11.0'), ('tvOS','11.0'), ('watchOS','4.0')
]

def relString(releases):
Expand Down
4 changes: 2 additions & 2 deletions stdlib/public/SDK/AppKit/AppKit_FoundationExtensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public extension IndexPath {

public extension URLResourceValues {
/// Returns all thumbnails as a single NSImage.
@available(OSX 10.10, *)
@available(macOS 10.10, *)
public var thumbnail : NSImage? {
return allValues[URLResourceKey.thumbnailKey] as? NSImage
}
Expand All @@ -74,7 +74,7 @@ public extension URLResourceValues {
}

/// Returns a dictionary of NSImage objects keyed by size.
@available(OSX 10.10, *)
@available(macOS 10.10, *)
public var thumbnailDictionary : [URLThumbnailDictionaryItem : NSImage]? {
return allValues[URLResourceKey.thumbnailDictionaryKey] as? [URLThumbnailDictionaryItem : NSImage]
}
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/SDK/CoreGraphics/CoreGraphics.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ extension CGAffineTransform: Equatable {
//===----------------------------------------------------------------------===//

extension CGColor {
@available(OSX 10.3, iOS 2.0, *)
@available(macOS 10.3, iOS 2.0, *)
public var components: [CGFloat]? {
guard let pointer = self.__unsafeComponents else { return nil }
let buffer = UnsafeBufferPointer(start: pointer, count: self.numberOfComponents)
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/SDK/CoreImage/CoreImage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ extension CIFilter {
#endif

@available(iOS, introduced: 8.0)
@available(OSX, introduced: 10.10)
@available(macOS, introduced: 10.10)
convenience init?(
name: String, elements: (String, AnyObject)...
) {
Expand Down
6 changes: 3 additions & 3 deletions stdlib/public/SDK/CryptoTokenKit/TKSmartCard.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import Foundation

@available(OSX 10.10, *)
@available(macOS 10.10, *)
extension TKSmartCard {
public func send(ins: UInt8, p1: UInt8, p2: UInt8, data: Data? = nil,
le: Int? = nil, reply: @escaping (Data?, UInt16, Error?) -> Void) {
Expand All @@ -23,7 +23,7 @@ extension TKSmartCard {
le: le.map { NSNumber(value: $0) }, reply: reply)
}

@available(OSX 10.12, *)
@available(macOS 10.12, *)
public func send(ins: UInt8, p1: UInt8, p2: UInt8, data: Data? = nil,
le: Int? = nil) throws -> (sw: UInt16, response: Data) {

Expand All @@ -33,7 +33,7 @@ extension TKSmartCard {
return (sw: sw, response: response)
}

@available(OSX 10.12, *)
@available(macOS 10.12, *)
public func withSession<T>(_ body: @escaping () throws -> T) throws -> T {
var result: T?
try self.__inSession(executeBlock: {
Expand Down
10 changes: 5 additions & 5 deletions stdlib/public/SDK/GameplayKit/GameplayKit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import simd


@available(iOS, introduced: 9.0)
@available(OSX, introduced: 10.11)
@available(macOS, introduced: 10.11)
@available(tvOS, introduced: 9.0)
extension GKPath {
/// Creates a path from an array of points
Expand All @@ -31,7 +31,7 @@ extension GKPath {


@available(iOS, introduced: 10.0)
@available(OSX, introduced: 10.12)
@available(macOS, introduced: 10.12)
@available(tvOS, introduced: 10.0)
extension GKPath {
/// Creates a path from an array of points
Expand All @@ -45,7 +45,7 @@ extension GKPath {
}

@available(iOS, introduced: 9.0)
@available(OSX, introduced: 10.11)
@available(macOS, introduced: 10.11)
@available(tvOS, introduced: 9.0)
extension GKPolygonObstacle {
/// Creates a polygon obstacle with an array of points.
Expand All @@ -57,7 +57,7 @@ extension GKPolygonObstacle {
}

@available(iOS, introduced: 9.0)
@available(OSX, introduced: 10.11)
@available(macOS, introduced: 10.11)
@available(tvOS, introduced: 9.0)
extension GKEntity {
/// Gets the component of the indicated class. Returns nil if entity does not have this component
Expand All @@ -79,7 +79,7 @@ internal protocol _SwiftGKStateMachineLike {
}

@available(iOS, introduced: 9.0)
@available(OSX, introduced: 10.11)
@available(macOS, introduced: 10.11)
@available(tvOS, introduced: 9.0)
extension GKStateMachine {
/// Gets the state of the indicated class. Returns nil if the state machine does not have this state.
Expand Down
20 changes: 10 additions & 10 deletions stdlib/public/SDK/ModelIO/ModelIO.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
@_exported import ModelIO
import simd

@available(OSX, introduced: 10.13)
@available(macOS, introduced: 10.13)
@available(iOS, introduced: 11.0)
@available(tvOS, introduced: 11.0)
extension MDLMatrix4x4Array {
Expand Down Expand Up @@ -44,7 +44,7 @@ extension MDLMatrix4x4Array {



@available(OSX, introduced: 10.13)
@available(macOS, introduced: 10.13)
@available(iOS, introduced: 11.0)
@available(tvOS, introduced: 11.0)
extension MDLAnimatedValue {
Expand All @@ -57,7 +57,7 @@ extension MDLAnimatedValue {
}
}

@available(OSX, introduced: 10.13)
@available(macOS, introduced: 10.13)
@available(iOS, introduced: 11.0)
@available(tvOS, introduced: 11.0)
extension MDLAnimatedScalarArray {
Expand Down Expand Up @@ -108,7 +108,7 @@ extension MDLAnimatedScalarArray {
}
}

@available(OSX, introduced: 10.13)
@available(macOS, introduced: 10.13)
@available(iOS, introduced: 11.0)
@available(tvOS, introduced: 11.0)
extension MDLAnimatedVector3Array {
Expand Down Expand Up @@ -159,7 +159,7 @@ extension MDLAnimatedVector3Array {
}
}

@available(OSX, introduced: 10.13)
@available(macOS, introduced: 10.13)
@available(iOS, introduced: 11.0)
@available(tvOS, introduced: 11.0)
extension MDLAnimatedQuaternionArray {
Expand Down Expand Up @@ -210,7 +210,7 @@ extension MDLAnimatedQuaternionArray {
}
}

@available(OSX, introduced: 10.13)
@available(macOS, introduced: 10.13)
@available(iOS, introduced: 11.0)
@available(tvOS, introduced: 11.0)
extension MDLAnimatedScalar {
Expand Down Expand Up @@ -239,7 +239,7 @@ extension MDLAnimatedScalar {
}
}

@available(OSX, introduced: 10.13)
@available(macOS, introduced: 10.13)
@available(iOS, introduced: 11.0)
@available(tvOS, introduced: 11.0)
extension MDLAnimatedVector2 {
Expand Down Expand Up @@ -268,7 +268,7 @@ extension MDLAnimatedVector2 {
}
}

@available(OSX, introduced: 10.13)
@available(macOS, introduced: 10.13)
@available(iOS, introduced: 11.0)
@available(tvOS, introduced: 11.0)
extension MDLAnimatedVector3 {
Expand Down Expand Up @@ -297,7 +297,7 @@ extension MDLAnimatedVector3 {
}
}

@available(OSX, introduced: 10.13)
@available(macOS, introduced: 10.13)
@available(iOS, introduced: 11.0)
@available(tvOS, introduced: 11.0)
extension MDLAnimatedVector4 {
Expand Down Expand Up @@ -326,7 +326,7 @@ extension MDLAnimatedVector4 {
}
}

@available(OSX, introduced: 10.13)
@available(macOS, introduced: 10.13)
@available(iOS, introduced: 11.0)
@available(tvOS, introduced: 11.0)
extension MDLAnimatedMatrix4x4 {
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/SDK/OpenCL/OpenCL.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

@_exported import OpenCL // Clang module

@available(OSX, introduced: 10.7)
@available(macOS, introduced: 10.7)
public func clSetKernelArgsListAPPLE(
_ kernel: cl_kernel, _ uint: cl_uint, _ args: CVarArg...
) -> cl_int {
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/SDK/SafariServices/SafariServices.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import _SwiftSafariServicesOverlayShims

#if os(macOS)

@available(OSX, introduced: 10.11)
@available(macOS, introduced: 10.11)
public func SFSafariServicesAvailable(_ version: SFSafariServicesVersion = SFSafariServicesVersion.version10_0) -> Bool {
return _swift_SafariServices_isSafariServicesAvailable(version)
}
Expand Down
8 changes: 4 additions & 4 deletions stdlib/public/SDK/SceneKit/SceneKit.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ extension double4x4 {
// MARK: Swift Extensions

@available(iOS, introduced: 8.0)
@available(OSX, introduced: 10.8)
@available(macOS, introduced: 10.8)
extension SCNGeometryElement {
/// Creates an instance from `indices` for a `primitiveType`
/// that has a constant number of indices per primitive
Expand Down Expand Up @@ -175,7 +175,7 @@ extension SCNGeometryElement {
}

@available(iOS, introduced: 8.0)
@available(OSX, introduced: 10.8)
@available(macOS, introduced: 10.8)
extension SCNGeometrySource {
@nonobjc
public convenience init(vertices: [SCNVector3]) {
Expand All @@ -192,7 +192,7 @@ extension SCNGeometrySource {
}

@available(iOS, introduced: 8.0)
@available(OSX, introduced: 10.10)
@available(macOS, introduced: 10.10)
extension SCNBoundingVolume {
public var boundingBox: (min: SCNVector3, max: SCNVector3) {
get {
Expand All @@ -218,7 +218,7 @@ extension SCNBoundingVolume {
// MARK: APIs refined for Swift

@available(iOS, introduced: 8.0)
@available(OSX, introduced: 10.8)
@available(macOS, introduced: 10.8)
extension SCNSceneSource {
public func entryWithIdentifier<T: AnyObject>(_ uid: String, withClass entryClass: T.Type) -> T? {
return self.__entry(withIdentifier: uid, with: entryClass) as! T?
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/SDK/SpriteKit/SpriteKit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public typealias SKColor = UIColor
}

@available(iOS, introduced: 10.0)
@available(OSX, introduced: 10.12)
@available(macOS, introduced: 10.12)
@available(tvOS, introduced: 10.0)
@available(watchOS, introduced: 3.0)
extension SKWarpGeometryGrid {
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/SDK/Vision/Vision.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import Darwin

#if !os(watchOS)

@available(OSX, introduced: 10.13)
@available(macOS, introduced: 10.13)
@available(iOS, introduced: 11.0)
@available(tvOS, introduced: 11.0)
extension VNFaceLandmarkRegion2D {
Expand Down
18 changes: 9 additions & 9 deletions stdlib/public/SDK/os/os_log.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@_exported import os.log
import _SwiftOSOverlayShims

@available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
@available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
public func os_log(
_ message: StaticString,
dso: UnsafeRawPointer? = #dsohandle,
Expand All @@ -39,30 +39,30 @@ public func os_log(
}

extension OSLogType {
@available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
@available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
public static let `default` = __OS_LOG_TYPE_DEFAULT

@available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
@available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
public static let info = __OS_LOG_TYPE_INFO

@available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
@available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
public static let debug = __OS_LOG_TYPE_DEBUG

@available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
@available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
public static let error = __OS_LOG_TYPE_ERROR

@available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
@available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
public static let fault = __OS_LOG_TYPE_FAULT
}

extension OSLog {
@available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
@available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
public static let disabled = _swift_os_log_disabled()

@available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
@available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
public static let `default` = _swift_os_log_default()

@available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
@available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
public convenience init(subsystem: String, category: String) {
self.init(__subsystem: subsystem, category: category)
}
Expand Down
4 changes: 2 additions & 2 deletions stdlib/public/SDK/simd/simd.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ extension ${mattype} {
% if rows == cols:
/// Inverse of the matrix if it exists, otherwise the contents of the
/// resulting matrix are undefined.
@available(OSX 10.10, iOS 8.0, tvOS 10.0, watchOS 3.0, *)
@available(macOS 10.10, iOS 8.0, tvOS 10.0, watchOS 3.0, *)
@_transparent
public var inverse: ${mattype} {
return simd_inverse(self)
Expand Down Expand Up @@ -845,7 +845,7 @@ public func matrix_from_diagonal(_ d: ${diagtype}) -> ${mattype} {
}

@available(swift, deprecated: 4, message: "Use the .inverse property instead.")
@available(OSX 10.10, iOS 8.0, tvOS 10.0, watchOS 3.0, *)
@available(macOS 10.10, iOS 8.0, tvOS 10.0, watchOS 3.0, *)
public func matrix_invert(_ x: ${mattype}) -> ${mattype} {
return x.inverse
}
Expand Down