Skip to content

Commit 312771e

Browse files
ikesyoikesyo
authored
Merge pull request #15445 from ikesyo/overlay-macos-over-osx
[gardening][Overlay] Prefer macOS over OSX for `@available`
2 parents a61cd12 + c076316 commit 312771e

File tree

14 files changed

+43
-43
lines changed

14 files changed

+43
-43
lines changed

‎stdlib/public/SDK/Accelerate/BNNS.swift.gyb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import Swift
1616

1717
%{
1818
bnns2016 = [
19-
('OSX','10.12'), ('iOS','10.0'), ('tvOS','10.0'), ('watchOS','3.0')
19+
('macOS','10.12'), ('iOS','10.0'), ('tvOS','10.0'), ('watchOS','3.0')
2020
]
2121

2222
bnns2017 = [
23-
('OSX','10.13'), ('iOS','11.0'), ('tvOS','11.0'), ('watchOS','4.0')
23+
('macOS','10.13'), ('iOS','11.0'), ('tvOS','11.0'), ('watchOS','4.0')
2424
]
2525

2626
def relString(releases):

‎stdlib/public/SDK/AppKit/AppKit_FoundationExtensions.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public extension IndexPath {
5353

5454
public extension URLResourceValues {
5555
/// Returns all thumbnails as a single NSImage.
56-
@available(OSX 10.10, *)
56+
@available(macOS 10.10, *)
5757
public var thumbnail : NSImage? {
5858
return allValues[URLResourceKey.thumbnailKey] as? NSImage
5959
}
@@ -74,7 +74,7 @@ public extension URLResourceValues {
7474
}
7575

7676
/// Returns a dictionary of NSImage objects keyed by size.
77-
@available(OSX 10.10, *)
77+
@available(macOS 10.10, *)
7878
public var thumbnailDictionary : [URLThumbnailDictionaryItem : NSImage]? {
7979
return allValues[URLResourceKey.thumbnailDictionaryKey] as? [URLThumbnailDictionaryItem : NSImage]
8080
}

‎stdlib/public/SDK/CoreGraphics/CoreGraphics.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ extension CGAffineTransform: Equatable {
2929
//===----------------------------------------------------------------------===//
3030

3131
extension CGColor {
32-
@available(OSX 10.3, iOS 2.0, *)
32+
@available(macOS 10.3, iOS 2.0, *)
3333
public var components: [CGFloat]? {
3434
guard let pointer = self.__unsafeComponents else { return nil }
3535
let buffer = UnsafeBufferPointer(start: pointer, count: self.numberOfComponents)

‎stdlib/public/SDK/CoreImage/CoreImage.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ extension CIFilter {
3030
#endif
3131

3232
@available(iOS, introduced: 8.0)
33-
@available(OSX, introduced: 10.10)
33+
@available(macOS, introduced: 10.10)
3434
convenience init?(
3535
name: String, elements: (String, AnyObject)...
3636
) {

‎stdlib/public/SDK/CryptoTokenKit/TKSmartCard.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import Foundation
1616

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

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

@@ -33,7 +33,7 @@ extension TKSmartCard {
3333
return (sw: sw, response: response)
3434
}
3535

36-
@available(OSX 10.12, *)
36+
@available(macOS 10.12, *)
3737
public func withSession<T>(_ body: @escaping () throws -> T) throws -> T {
3838
var result: T?
3939
try self.__inSession(executeBlock: {

‎stdlib/public/SDK/GameplayKit/GameplayKit.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import simd
1616

1717

1818
@available(iOS, introduced: 9.0)
19-
@available(OSX, introduced: 10.11)
19+
@available(macOS, introduced: 10.11)
2020
@available(tvOS, introduced: 9.0)
2121
extension GKPath {
2222
/// Creates a path from an array of points
@@ -31,7 +31,7 @@ extension GKPath {
3131

3232

3333
@available(iOS, introduced: 10.0)
34-
@available(OSX, introduced: 10.12)
34+
@available(macOS, introduced: 10.12)
3535
@available(tvOS, introduced: 10.0)
3636
extension GKPath {
3737
/// Creates a path from an array of points
@@ -45,7 +45,7 @@ extension GKPath {
4545
}
4646

4747
@available(iOS, introduced: 9.0)
48-
@available(OSX, introduced: 10.11)
48+
@available(macOS, introduced: 10.11)
4949
@available(tvOS, introduced: 9.0)
5050
extension GKPolygonObstacle {
5151
/// Creates a polygon obstacle with an array of points.
@@ -57,7 +57,7 @@ extension GKPolygonObstacle {
5757
}
5858

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

8181
@available(iOS, introduced: 9.0)
82-
@available(OSX, introduced: 10.11)
82+
@available(macOS, introduced: 10.11)
8383
@available(tvOS, introduced: 9.0)
8484
extension GKStateMachine {
8585
/// Gets the state of the indicated class. Returns nil if the state machine does not have this state.

‎stdlib/public/SDK/ModelIO/ModelIO.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
@_exported import ModelIO
1414
import simd
1515

16-
@available(OSX, introduced: 10.13)
16+
@available(macOS, introduced: 10.13)
1717
@available(iOS, introduced: 11.0)
1818
@available(tvOS, introduced: 11.0)
1919
extension MDLMatrix4x4Array {
@@ -44,7 +44,7 @@ extension MDLMatrix4x4Array {
4444

4545

4646

47-
@available(OSX, introduced: 10.13)
47+
@available(macOS, introduced: 10.13)
4848
@available(iOS, introduced: 11.0)
4949
@available(tvOS, introduced: 11.0)
5050
extension MDLAnimatedValue {
@@ -57,7 +57,7 @@ extension MDLAnimatedValue {
5757
}
5858
}
5959

60-
@available(OSX, introduced: 10.13)
60+
@available(macOS, introduced: 10.13)
6161
@available(iOS, introduced: 11.0)
6262
@available(tvOS, introduced: 11.0)
6363
extension MDLAnimatedScalarArray {
@@ -108,7 +108,7 @@ extension MDLAnimatedScalarArray {
108108
}
109109
}
110110

111-
@available(OSX, introduced: 10.13)
111+
@available(macOS, introduced: 10.13)
112112
@available(iOS, introduced: 11.0)
113113
@available(tvOS, introduced: 11.0)
114114
extension MDLAnimatedVector3Array {
@@ -159,7 +159,7 @@ extension MDLAnimatedVector3Array {
159159
}
160160
}
161161

162-
@available(OSX, introduced: 10.13)
162+
@available(macOS, introduced: 10.13)
163163
@available(iOS, introduced: 11.0)
164164
@available(tvOS, introduced: 11.0)
165165
extension MDLAnimatedQuaternionArray {
@@ -210,7 +210,7 @@ extension MDLAnimatedQuaternionArray {
210210
}
211211
}
212212

213-
@available(OSX, introduced: 10.13)
213+
@available(macOS, introduced: 10.13)
214214
@available(iOS, introduced: 11.0)
215215
@available(tvOS, introduced: 11.0)
216216
extension MDLAnimatedScalar {
@@ -239,7 +239,7 @@ extension MDLAnimatedScalar {
239239
}
240240
}
241241

242-
@available(OSX, introduced: 10.13)
242+
@available(macOS, introduced: 10.13)
243243
@available(iOS, introduced: 11.0)
244244
@available(tvOS, introduced: 11.0)
245245
extension MDLAnimatedVector2 {
@@ -268,7 +268,7 @@ extension MDLAnimatedVector2 {
268268
}
269269
}
270270

271-
@available(OSX, introduced: 10.13)
271+
@available(macOS, introduced: 10.13)
272272
@available(iOS, introduced: 11.0)
273273
@available(tvOS, introduced: 11.0)
274274
extension MDLAnimatedVector3 {
@@ -297,7 +297,7 @@ extension MDLAnimatedVector3 {
297297
}
298298
}
299299

300-
@available(OSX, introduced: 10.13)
300+
@available(macOS, introduced: 10.13)
301301
@available(iOS, introduced: 11.0)
302302
@available(tvOS, introduced: 11.0)
303303
extension MDLAnimatedVector4 {
@@ -326,7 +326,7 @@ extension MDLAnimatedVector4 {
326326
}
327327
}
328328

329-
@available(OSX, introduced: 10.13)
329+
@available(macOS, introduced: 10.13)
330330
@available(iOS, introduced: 11.0)
331331
@available(tvOS, introduced: 11.0)
332332
extension MDLAnimatedMatrix4x4 {

‎stdlib/public/SDK/OpenCL/OpenCL.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
@_exported import OpenCL // Clang module
1414

15-
@available(OSX, introduced: 10.7)
15+
@available(macOS, introduced: 10.7)
1616
public func clSetKernelArgsListAPPLE(
1717
_ kernel: cl_kernel, _ uint: cl_uint, _ args: CVarArg...
1818
) -> cl_int {

‎stdlib/public/SDK/SafariServices/SafariServices.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import _SwiftSafariServicesOverlayShims
1515

1616
#if os(macOS)
1717

18-
@available(OSX, introduced: 10.11)
18+
@available(macOS, introduced: 10.11)
1919
public func SFSafariServicesAvailable(_ version: SFSafariServicesVersion = SFSafariServicesVersion.version10_0) -> Bool {
2020
return _swift_SafariServices_isSafariServicesAvailable(version)
2121
}

‎stdlib/public/SDK/SceneKit/SceneKit.swift.gyb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ extension double4x4 {
142142
// MARK: Swift Extensions
143143

144144
@available(iOS, introduced: 8.0)
145-
@available(OSX, introduced: 10.8)
145+
@available(macOS, introduced: 10.8)
146146
extension SCNGeometryElement {
147147
/// Creates an instance from `indices` for a `primitiveType`
148148
/// that has a constant number of indices per primitive
@@ -175,7 +175,7 @@ extension SCNGeometryElement {
175175
}
176176

177177
@available(iOS, introduced: 8.0)
178-
@available(OSX, introduced: 10.8)
178+
@available(macOS, introduced: 10.8)
179179
extension SCNGeometrySource {
180180
@nonobjc
181181
public convenience init(vertices: [SCNVector3]) {
@@ -192,7 +192,7 @@ extension SCNGeometrySource {
192192
}
193193

194194
@available(iOS, introduced: 8.0)
195-
@available(OSX, introduced: 10.10)
195+
@available(macOS, introduced: 10.10)
196196
extension SCNBoundingVolume {
197197
public var boundingBox: (min: SCNVector3, max: SCNVector3) {
198198
get {
@@ -218,7 +218,7 @@ extension SCNBoundingVolume {
218218
// MARK: APIs refined for Swift
219219

220220
@available(iOS, introduced: 8.0)
221-
@available(OSX, introduced: 10.8)
221+
@available(macOS, introduced: 10.8)
222222
extension SCNSceneSource {
223223
public func entryWithIdentifier<T: AnyObject>(_ uid: String, withClass entryClass: T.Type) -> T? {
224224
return self.__entry(withIdentifier: uid, with: entryClass) as! T?

‎stdlib/public/SDK/SpriteKit/SpriteKit.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public typealias SKColor = UIColor
3030
}
3131

3232
@available(iOS, introduced: 10.0)
33-
@available(OSX, introduced: 10.12)
33+
@available(macOS, introduced: 10.12)
3434
@available(tvOS, introduced: 10.0)
3535
@available(watchOS, introduced: 3.0)
3636
extension SKWarpGeometryGrid {

‎stdlib/public/SDK/Vision/Vision.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import Darwin
1919

2020
#if !os(watchOS)
2121

22-
@available(OSX, introduced: 10.13)
22+
@available(macOS, introduced: 10.13)
2323
@available(iOS, introduced: 11.0)
2424
@available(tvOS, introduced: 11.0)
2525
extension VNFaceLandmarkRegion2D {

‎stdlib/public/SDK/os/os_log.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@_exported import os.log
1515
import _SwiftOSOverlayShims
1616

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

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

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

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

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

54-
@available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
54+
@available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
5555
public static let fault = __OS_LOG_TYPE_FAULT
5656
}
5757

5858
extension OSLog {
59-
@available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
59+
@available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
6060
public static let disabled = _swift_os_log_disabled()
6161

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

65-
@available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
65+
@available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
6666
public convenience init(subsystem: String, category: String) {
6767
self.init(__subsystem: subsystem, category: category)
6868
}

‎stdlib/public/SDK/simd/simd.swift.gyb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ extension ${mattype} {
741741
% if rows == cols:
742742
/// Inverse of the matrix if it exists, otherwise the contents of the
743743
/// resulting matrix are undefined.
744-
@available(OSX 10.10, iOS 8.0, tvOS 10.0, watchOS 3.0, *)
744+
@available(macOS 10.10, iOS 8.0, tvOS 10.0, watchOS 3.0, *)
745745
@_transparent
746746
public var inverse: ${mattype} {
747747
return simd_inverse(self)
@@ -845,7 +845,7 @@ public func matrix_from_diagonal(_ d: ${diagtype}) -> ${mattype} {
845845
}
846846
847847
@available(swift, deprecated: 4, message: "Use the .inverse property instead.")
848-
@available(OSX 10.10, iOS 8.0, tvOS 10.0, watchOS 3.0, *)
848+
@available(macOS 10.10, iOS 8.0, tvOS 10.0, watchOS 3.0, *)
849849
public func matrix_invert(_ x: ${mattype}) -> ${mattype} {
850850
return x.inverse
851851
}

0 commit comments

Comments
 (0)