Skip to content

Commit b6d40d8

Browse files
rintarorintaro
committed
Bump host tools deployment version for Darwin OS
1 parent 3905955 commit b6d40d8

File tree

8 files changed

+77
-77
lines changed

8 files changed

+77
-77
lines changed

‎CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -440,16 +440,16 @@ set(SWIFT_DARWIN_STDLIB_INSTALL_NAME_DIR "/usr/lib/swift" CACHE STRING
440440
set(SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR "@rpath" CACHE STRING
441441
"The directory of the install_name for the private standard library dylibs")
442442

443-
set(SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX "10.9" CACHE STRING
443+
set(SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX "10.13" CACHE STRING
444444
"Minimum deployment target version for OS X")
445445

446-
set(SWIFT_DARWIN_DEPLOYMENT_VERSION_IOS "7.0" CACHE STRING
446+
set(SWIFT_DARWIN_DEPLOYMENT_VERSION_IOS "11.0" CACHE STRING
447447
"Minimum deployment target version for iOS")
448448

449-
set(SWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS "9.0" CACHE STRING
449+
set(SWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS "11.0" CACHE STRING
450450
"Minimum deployment target version for tvOS")
451451

452-
set(SWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS "2.0" CACHE STRING
452+
set(SWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS "4.0" CACHE STRING
453453
"Minimum deployment target version for watchOS")
454454

455455
#

‎test/ClangImporter/SceneKit_test.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func useRenamedValues() {
134134
let _ = SCNSceneSource.LoadingOption.createNormalsIfAbsent
135135
let _ = SCNSceneSource.LoadingOption.checkConsistency
136136
let _ = SCNSceneSource.LoadingOption.flattenScene
137-
let _ = SCNSceneSource.LoadingOption.useSafeMode
137+
let _ = SCNSceneSource.LoadingOption.useSafeMode // expected-warning {{'useSafeMode' was deprecated in macOS 10.13: No longer supported}}
138138
let _ = SCNSceneSource.LoadingOption.assetDirectoryURLs
139139
let _ = SCNSceneSource.LoadingOption.overrideAssetURLs
140140
let _ = SCNSceneSource.LoadingOption.strictConformance
@@ -183,8 +183,8 @@ func useRenamedAPIs(actionable: SCNActionable, action: SCNAction, data: Data,
183183
let _ = SCNAction.playAudio(audioSource, waitForCompletion: false)
184184

185185
animatable.addAnimation(animation, forKey: "key")
186-
let _ = animatable.isAnimationPaused(forKey: "key")
187-
let _ = animatable.setAnimationSpeed(1.0, forKey: "key")
186+
let _ = animatable.isAnimationPaused(forKey: "key") // expected-warning {{'isAnimationPaused(forKey:)' was deprecated in macOS 10.13: Use -[SCNAnimationPlayer paused] instead}}
187+
let _ = animatable.setAnimationSpeed(1.0, forKey: "key") // expected-warning {{'setAnimationSpeed(_:forKey:)' was deprecated in macOS 10.13: Use -[SCNAnimationPlayer setSpeed:] instead}}
188188

189189
let _ = lookAtConstraint.isGimbalLockEnabled
190190
let _ = SCNIKConstraint.inverseKinematicsConstraint(chainRootNode: node)

‎test/IRGen/availability.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import Foundation
1919
// OPT: s10Foundation11MeasurementVySo17NSUnitTemperature
2020

2121
public func dontHoist() {
22-
if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
22+
if #available(macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
2323
let measurement = Measurement<UnitTemperature>(value: Double(42), unit: .celsius)
2424
print("\(measurement)")
2525
} else {
@@ -49,13 +49,13 @@ public func dontHoist() {
4949
// OPT-NOT: call {{.*}} @"$ss26_stdlib_isOSVersionAtLeastyBi1_Bw_BwBwtF"
5050
// OPT: ret void
5151
public func multipleAvailabilityChecks() {
52-
if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
52+
if #available(macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
5353
print("test one")
5454
}
55-
if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
55+
if #available(macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
5656
print("test two")
5757
}
58-
if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
58+
if #available(macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
5959
print("test three")
6060
}
6161
}

‎test/Sema/availability_define.swift

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
// RUN: %target-typecheck-verify-swift \
2-
// RUN: -define-availability "_iOS8Aligned:macOS 10.10, iOS 8.0" \
3-
// RUN: -define-availability "_iOS9Aligned:macOS 10.11, iOS 9.0" \
4-
// RUN: -define-availability "_iOS9:iOS 9.0" \
5-
// RUN: -define-availability "_macOS10_11:macOS 10.11" \
6-
// RUN: -define-availability "_myProject 1.0:macOS 10.11" \
7-
// RUN: -define-availability "_myProject 2.5:macOS 10.12"
2+
// RUN: -define-availability "_iOS13Aligned:macOS 10.15, iOS 13.0" \
3+
// RUN: -define-availability "_iOS14Aligned:macOS 11.0, iOS 14.0" \
4+
// RUN: -define-availability "_iOS14:iOS 14.0" \
5+
// RUN: -define-availability "_macOS11_0:macOS 11.0" \
6+
// RUN: -define-availability "_myProject 1.0:macOS 11.0" \
7+
// RUN: -define-availability "_myProject 2.5:macOS 12.5"
88
// REQUIRES: OS=macosx
99

10-
@available(_iOS8Aligned, *)
11-
public func onMacOS10_10() {}
10+
@available(_iOS13Aligned, *)
11+
public func onMacOS10_15() {}
1212

13-
@available(_iOS9Aligned, *)
14-
public func onMacOS10_11() {}
13+
@available(_iOS14Aligned, *)
14+
public func onMacOS11_0() {}
1515

16-
@available(_iOS9, _macOS10_11, tvOS 11.0, *)
16+
@available(_iOS14, _macOS11_0, tvOS 14.0, *)
1717
public func composed() {}
1818

19-
@available(_iOS8Aligned, *)
20-
@available(macOS, deprecated: 10.10)
19+
@available(_iOS13Aligned, *)
20+
@available(macOS, deprecated: 10.15)
2121
public func onMacOSDeprecated() {}
2222

2323
@available(_myProject, *) // expected-error {{expected declaration}}
@@ -42,57 +42,57 @@ public func brokenVersion() {}
4242
// expected-error @-1 {{expected 'available' option such as 'unavailable', 'introduced', 'deprecated', 'obsoleted', 'message', or 'renamed'}}
4343
public func unknownMacro() {}
4444

45-
@available(_iOS9) // expected-error {{must handle potential future platforms with '*'}}
45+
@available(_iOS14) // expected-error {{must handle potential future platforms with '*'}}
4646
public func noOtherOSes() {}
4747

48-
@available(_iOS8Aligned, *)
48+
@available(_iOS13Aligned, *)
4949
func client() {
50-
onMacOS10_10()
51-
onMacOS10_11() // expected-error {{is only available in macOS 10.11 or newer}}
50+
onMacOS10_15()
51+
onMacOS11_0() // expected-error {{is only available in macOS 11.0 or newer}}
5252
// expected-note @-1 {{add 'if #available' version check}}
5353
onMacOSDeprecated()
5454

55-
if #available(_iOS9Aligned, *) {
56-
onMacOS10_11()
55+
if #available(_iOS14Aligned, *) {
56+
onMacOS11_0()
5757
}
5858

59-
if #unavailable(_iOS9Aligned) {
60-
onMacOS10_11() // expected-error {{is only available in macOS 10.11 or newer}}
59+
if #unavailable(_iOS14Aligned) {
60+
onMacOS11_0() // expected-error {{is only available in macOS 11.0 or newer}}
6161
// expected-note @-1 {{add 'if #available' version check}}
6262
} else {
63-
onMacOS10_11()
63+
onMacOS11_0()
6464
}
6565

6666
if #available(_unknownMacro, *) { } // expected-error {{expected version number}}
6767
}
6868

6969
@inlinable
7070
public func forbidMacrosInInlinableCode() {
71-
if #available(_iOS9Aligned, *) { } // expected-error {{availability macro cannot be used in an '@inlinable' function}}
72-
if #available(_iOS9, _macOS10_11, *) { } // expected-error {{availability macro cannot be used in an '@inlinable' function}}
73-
if #available(iOS 9.0, _macOS10_11, tvOS 9.0, *) { } // expected-error {{availability macro cannot be used in an '@inlinable' function}}
74-
if #unavailable(_iOS9Aligned) { } // expected-error {{availability macro cannot be used in an '@inlinable' function}}
75-
if #unavailable(_iOS9, _macOS10_11) { } // expected-error {{availability macro cannot be used in an '@inlinable' function}}
76-
if #unavailable(iOS 9.0, _macOS10_11, tvOS 9.0) { } // expected-error {{availability macro cannot be used in an '@inlinable' function}}
71+
if #available(_iOS14Aligned, *) { } // expected-error {{availability macro cannot be used in an '@inlinable' function}}
72+
if #available(_iOS14, _macOS11_0, *) { } // expected-error {{availability macro cannot be used in an '@inlinable' function}}
73+
if #available(iOS 14.0, _macOS11_0, tvOS 14.0, *) { } // expected-error {{availability macro cannot be used in an '@inlinable' function}}
74+
if #unavailable(_iOS14Aligned) { } // expected-error {{availability macro cannot be used in an '@inlinable' function}}
75+
if #unavailable(_iOS14, _macOS11_0) { } // expected-error {{availability macro cannot be used in an '@inlinable' function}}
76+
if #unavailable(iOS 14.0, _macOS11_0, tvOS 14.0) { } // expected-error {{availability macro cannot be used in an '@inlinable' function}}
7777
}
7878

7979
@_alwaysEmitIntoClient
8080
public func forbidMacrosInInlinableCode1() {
81-
if #available(_iOS9Aligned, *) { } // expected-error {{availability macro cannot be used in an '@_alwaysEmitIntoClient' function}}
82-
if #available(_iOS9, _macOS10_11, *) { } // expected-error {{availability macro cannot be used in an '@_alwaysEmitIntoClient' function}}
83-
if #available(iOS 9.0, _macOS10_11, tvOS 9.0, *) { } // expected-error {{availability macro cannot be used in an '@_alwaysEmitIntoClient' function}}
84-
if #unavailable(_iOS9Aligned) { } // expected-error {{availability macro cannot be used in an '@_alwaysEmitIntoClient' function}}
85-
if #unavailable(_iOS9, _macOS10_11) { } // expected-error {{availability macro cannot be used in an '@_alwaysEmitIntoClient' function}}
86-
if #unavailable(iOS 9.0, _macOS10_11, tvOS 9.0) { } // expected-error {{availability macro cannot be used in an '@_alwaysEmitIntoClient' function}}
81+
if #available(_iOS14Aligned, *) { } // expected-error {{availability macro cannot be used in an '@_alwaysEmitIntoClient' function}}
82+
if #available(_iOS14, _macOS11_0, *) { } // expected-error {{availability macro cannot be used in an '@_alwaysEmitIntoClient' function}}
83+
if #available(iOS 14.0, _macOS11_0, tvOS 14.0, *) { } // expected-error {{availability macro cannot be used in an '@_alwaysEmitIntoClient' function}}
84+
if #unavailable(_iOS14Aligned) { } // expected-error {{availability macro cannot be used in an '@_alwaysEmitIntoClient' function}}
85+
if #unavailable(_iOS14, _macOS11_0) { } // expected-error {{availability macro cannot be used in an '@_alwaysEmitIntoClient' function}}
86+
if #unavailable(iOS 14.0, _macOS11_0, tvOS 14.0) { } // expected-error {{availability macro cannot be used in an '@_alwaysEmitIntoClient' function}}
8787
}
8888

89-
@available(_iOS8Aligned, *)
90-
@_backDeploy(before: _iOS9Aligned)
89+
@available(_iOS13Aligned, *)
90+
@_backDeploy(before: _iOS14Aligned)
9191
public func forbidMacrosInInlinableCode2() {
92-
if #available(_iOS9Aligned, *) { } // expected-error {{availability macro cannot be used in a '@_backDeploy' function}}
93-
if #available(_iOS9, _macOS10_11, *) { } // expected-error {{availability macro cannot be used in a '@_backDeploy' function}}
94-
if #available(iOS 9.0, _macOS10_11, tvOS 9.0, *) { } // expected-error {{availability macro cannot be used in a '@_backDeploy' function}}
95-
if #unavailable(_iOS9Aligned) { } // expected-error {{availability macro cannot be used in a '@_backDeploy' function}}
96-
if #unavailable(_iOS9, _macOS10_11) { } // expected-error {{availability macro cannot be used in a '@_backDeploy' function}}
97-
if #unavailable(iOS 9.0, _macOS10_11, tvOS 9.0) { } // expected-error {{availability macro cannot be used in a '@_backDeploy' function}}
92+
if #available(_iOS14Aligned, *) { } // expected-error {{availability macro cannot be used in a '@_backDeploy' function}}
93+
if #available(_iOS14, _macOS11_0, *) { } // expected-error {{availability macro cannot be used in a '@_backDeploy' function}}
94+
if #available(iOS 14.0, _macOS11_0, tvOS 14.0, *) { } // expected-error {{availability macro cannot be used in a '@_backDeploy' function}}
95+
if #unavailable(_iOS14Aligned) { } // expected-error {{availability macro cannot be used in a '@_backDeploy' function}}
96+
if #unavailable(_iOS14, _macOS11_0) { } // expected-error {{availability macro cannot be used in a '@_backDeploy' function}}
97+
if #unavailable(iOS 14.0, _macOS11_0, tvOS 14.0) { } // expected-error {{availability macro cannot be used in a '@_backDeploy' function}}
9898
}

‎test/SymbolGraph/Symbols/Mixins/Availability/Basic.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
// REQUIRES: OS=macosx
77

8-
@available(macOS, introduced: 10.9, deprecated: 10.10, obsoleted: 10.11, message: "Everyone makes mistakes", renamed: "S2")
8+
@available(macOS, introduced: 10.9, deprecated: 11.0, obsoleted: 18.1, message: "Everyone makes mistakes", renamed: "S2")
99
public struct S {}
1010

1111
// CHECK: "domain": "macOS"
@@ -15,12 +15,12 @@ public struct S {}
1515
// CHECK-NEXT: "minor": 9
1616

1717
// CHECK: deprecated
18-
// CHECK-NEXT: "major": 10
19-
// CHECK-NEXT: "minor": 10
18+
// CHECK-NEXT: "major": 11
19+
// CHECK-NEXT: "minor": 0
2020

2121
// CHECK: obsoleted
22-
// CHECK-NEXT: "major": 10
23-
// CHECK-NEXT: "minor": 11
22+
// CHECK-NEXT: "major": 18
23+
// CHECK-NEXT: "minor": 1
2424

2525
// CHECK: "message": "Everyone makes mistakes"
2626
// CHECK: "renamed": "S2"

‎test/SymbolGraph/Symbols/Mixins/Availability/Inherited/ObsoletedReplaced.swift

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,88 +10,88 @@
1010

1111
// REQUIRES: OS=macosx
1212

13-
@available(macOS, obsoleted: 10.14)
13+
@available(macOS, obsoleted: 18.14)
1414
public struct S {
1515
// LESSTHAN-LABEL: "precise": "s:17ObsoletedReplaced1SV8lessThanyyF",
1616
// LESSTHAN: "availability": [
1717
// LESSTHAN-NEXT: {
1818
// LESSTHAN-NEXT: "domain": "macOS",
1919
// LESSTHAN-NEXT: "obsoleted": {
20-
// LESSTHAN-NEXT: "major": 10,
20+
// LESSTHAN-NEXT: "major": 18,
2121
// LESSTHAN-NEXT: "minor": 10
2222
// LESSTHAN-NEXT: }
2323
// LESSTHAN-NEXT: }
2424
// LESSTHAN-NEXT: ]
25-
@available(macOS, obsoleted: 10.10)
25+
@available(macOS, obsoleted: 18.10)
2626
public func lessThan() {}
2727

2828
// GREATERTHAN-LABEL: "precise": "s:17ObsoletedReplaced1SV11greaterThanyyF",
2929
// GREATERTHAN: "availability": [
3030
// GREATERTHAN-NEXT: {
3131
// GREATERTHAN-NEXT: "domain": "macOS",
3232
// GREATERTHAN-NEXT: "obsoleted": {
33-
// GREATERTHAN-NEXT: "major": 10,
33+
// GREATERTHAN-NEXT: "major": 18,
3434
// GREATERTHAN-NEXT: "minor": 14
3535
// GREATERTHAN-NEXT: }
3636
// GREATERTHAN-NEXT: }
3737
// GREATERTHAN-NEXT: ]
38-
@available(macOS, obsoleted: 10.15)
38+
@available(macOS, obsoleted: 18.15)
3939
public func greaterThan() {}
4040

4141
// EQUAL-LABEL: "precise": "s:17ObsoletedReplaced1SV5equalyyF",
4242
// EQUAL: "availability": [
4343
// EQUAL-NEXT: {
4444
// EQUAL-NEXT: "domain": "macOS",
4545
// EQUAL-NEXT: "obsoleted": {
46-
// EQUAL-NEXT: "major": 10,
46+
// EQUAL-NEXT: "major": 18,
4747
// EQUAL-NEXT: "minor": 14
4848
// EQUAL-NEXT: }
4949
// EQUAL-NEXT: }
5050
// EQUAL-NEXT: ]
51-
@available(macOS, obsoleted: 10.14)
51+
@available(macOS, obsoleted: 18.14)
5252
public func equal() {}
5353
}
5454

55-
@available(macOS, obsoleted: 10.14)
55+
@available(macOS, obsoleted: 18.14)
5656
public struct Outer {
5757
public struct Inner {
5858
// TRANSITIVELESSTHAN-LABEL: "precise": "s:17ObsoletedReplaced5OuterV5InnerV8lessThanyyF"
5959
// TRANSITIVELESSTHAN: "availability": [
6060
// TRANSITIVELESSTHAN-NEXT: {
6161
// TRANSITIVELESSTHAN-NEXT: "domain": "macOS",
6262
// TRANSITIVELESSTHAN-NEXT: "obsoleted": {
63-
// TRANSITIVELESSTHAN-NEXT: "major": 10,
63+
// TRANSITIVELESSTHAN-NEXT: "major": 18,
6464
// TRANSITIVELESSTHAN-NEXT: "minor": 10
6565
// TRANSITIVELESSTHAN-NEXT: }
6666
// TRANSITIVELESSTHAN-NEXT: }
6767
// TRANSITIVELESSTHAN-NEXT: ]
68-
@available(macOS, obsoleted: 10.10)
68+
@available(macOS, obsoleted: 18.10)
6969
public func lessThan() {}
7070

7171
// TRANSITIVEGREATERTHAN-LABEL:"precise": "s:17ObsoletedReplaced5OuterV5InnerV11greaterThanyyF"
7272
// TRANSITIVEGREATERTHAN: "availability": [
7373
// TRANSITIVEGREATERTHAN-NEXT: {
7474
// TRANSITIVEGREATERTHAN-NEXT: "domain": "macOS",
7575
// TRANSITIVEGREATERTHAN-NEXT: "obsoleted": {
76-
// TRANSITIVEGREATERTHAN-NEXT: "major": 10,
76+
// TRANSITIVEGREATERTHAN-NEXT: "major": 18,
7777
// TRANSITIVEGREATERTHAN-NEXT: "minor": 14
7878
// TRANSITIVEGREATERTHAN-NEXT: }
7979
// TRANSITIVEGREATERTHAN-NEXT: }
8080
// TRANSITIVEGREATERTHAN-NEXT: ]
81-
@available(macOS, obsoleted: 10.15)
81+
@available(macOS, obsoleted: 18.15)
8282
public func greaterThan() {}
8383

8484
// TRANSITIVEEQUAL-LABEL:"precise": "s:17ObsoletedReplaced5OuterV5InnerV5equalyyF"
8585
// TRANSITIVEEQUAL: "availability": [
8686
// TRANSITIVEEQUAL-NEXT: {
8787
// TRANSITIVEEQUAL-NEXT: "domain": "macOS",
8888
// TRANSITIVEEQUAL-NEXT: "obsoleted": {
89-
// TRANSITIVEEQUAL-NEXT: "major": 10,
89+
// TRANSITIVEEQUAL-NEXT: "major": 18,
9090
// TRANSITIVEEQUAL-NEXT: "minor": 14
9191
// TRANSITIVEEQUAL-NEXT: }
9292
// TRANSITIVEEQUAL-NEXT: }
9393
// TRANSITIVEEQUAL-NEXT: ]
94-
@available(macOS, obsoleted: 10.14)
94+
@available(macOS, obsoleted: 18.14)
9595
public func equal() {}
9696
}
9797
}

‎utils/build-script-impl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ KNOWN_SETTINGS=(
9595
## Darwin Options
9696
darwin-crash-reporter-client "" "whether to enable CrashReporter integration, default is 1 on Darwin platforms, 0 otherwise"
9797
darwin-deployment-version-ios "7.0" "minimum deployment target version for iOS"
98-
darwin-deployment-version-osx "10.9" "minimum deployment target version for OS X"
98+
darwin-deployment-version-osx "10.13" "minimum deployment target version for OS X"
9999
darwin-deployment-version-tvos "9.0" "minimum deployment target version for tvOS"
100100
darwin-deployment-version-watchos "2.0" "minimum deployment target version for watchOS"
101101
darwin-install-extract-symbols "" "whether to extract symbols with dsymutil during installations"

‎utils/build_swift/build_swift/defaults.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151
SWIFT_ANALYZE_CODE_COVERAGE = 'false'
5252

5353
DARWIN_XCRUN_TOOLCHAIN = 'default'
54-
DARWIN_DEPLOYMENT_VERSION_OSX = '10.9'
55-
DARWIN_DEPLOYMENT_VERSION_IOS = '7.0'
56-
DARWIN_DEPLOYMENT_VERSION_TVOS = '9.0'
57-
DARWIN_DEPLOYMENT_VERSION_WATCHOS = '2.0'
54+
DARWIN_DEPLOYMENT_VERSION_OSX = '10.13'
55+
DARWIN_DEPLOYMENT_VERSION_IOS = '11.0'
56+
DARWIN_DEPLOYMENT_VERSION_TVOS = '11.0'
57+
DARWIN_DEPLOYMENT_VERSION_WATCHOS = '4.0'
5858

5959
UNIX_INSTALL_PREFIX = '/usr'
6060
DARWIN_INSTALL_PREFIX = ('/Applications/Xcode.app/Contents/Developer/'

0 commit comments

Comments
 (0)