Skip to content

Commit 95baef1

Browse files
authored
Merge pull request #83300 from slavapestov/update-availability-macros-26-6.0
[6.2] Update utils/availability-macros.def
2 parents ab7cd23 + 4f7be08 commit 95baef1

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

include/swift/AST/RuntimeVersions.def

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,10 @@ RUNTIME_VERSION(
160160

161161
RUNTIME_VERSION(
162162
(6, 2),
163-
FUTURE
163+
PLATFORM(macOS, (26, 0, 0))
164+
PLATFORM(iOS, (26, 0, 0))
165+
PLATFORM(watchOS, (26, 0, 0))
166+
PLATFORM(visionOS,(26, 0, 0))
164167
)
165168

166169
END_MAJOR_VERSION(6)

stdlib/public/Concurrency/UnimplementedExecutor.swift

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

1515
// .. Main Executor ............................................................
1616

17-
@available(SwiftStdlib 6.2, *)
17+
@available(StdlibDeploymentTarget 6.2, *)
1818
final class UnimplementedMainExecutor: MainExecutor, @unchecked Sendable {
1919
public init() {}
2020

@@ -45,7 +45,7 @@ final class UnimplementedMainExecutor: MainExecutor, @unchecked Sendable {
4545

4646
// .. Task Executor ............................................................
4747

48-
@available(SwiftStdlib 6.2, *)
48+
@available(StdlibDeploymentTarget 6.2, *)
4949
final class UnimplementedTaskExecutor: TaskExecutor, @unchecked Sendable {
5050
public init() {}
5151

test/Availability/value_generics_availability.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
// REQUIRES: OS=macosx
44

5-
struct A<let N: Int> {} // expected-error {{values in generic types are only available in macOS 99.99.0 or newer}}
5+
struct A<let N: Int> {} // expected-error {{values in generic types are only available in macOS 26.0.0 or newer}}
66
// expected-note@-1 {{add '@available' attribute to enclosing generic struct}}
77

8-
class B<let N: Int> {} // expected-error {{values in generic types are only available in macOS 99.99.0 or newer}}
8+
class B<let N: Int> {} // expected-error {{values in generic types are only available in macOS 26.0.0 or newer}}
99
// expected-note@-1 {{add '@available' attribute to enclosing generic class}}
1010

11-
enum C<let N: Int> {} // expected-error {{values in generic types are only available in macOS 99.99.0 or newer}}
11+
enum C<let N: Int> {} // expected-error {{values in generic types are only available in macOS 26.0.0 or newer}}
1212
// expected-note@-1 {{add '@available' attribute to enclosing generic enum}}
1313

1414
func something<let N: Int>(_: A<N>) {} // OK, because A can't reference value generics.

utils/availability-macros.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ SwiftStdlib 5.9:macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0
4545
SwiftStdlib 5.10:macOS 14.4, iOS 17.4, watchOS 10.4, tvOS 17.4, visionOS 1.1
4646
SwiftStdlib 6.0:macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0
4747
SwiftStdlib 6.1:macOS 15.4, iOS 18.4, watchOS 11.4, tvOS 18.4, visionOS 2.4
48-
SwiftStdlib 6.2:macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, visionOS 9999
48+
SwiftStdlib 6.2:macOS 26.0, iOS 26.0, watchOS 26.0, tvOS 26.0, visionOS 26.0
4949

5050
# Like SwiftStdlib 5.0, but also the oldest visionOS.
5151
SwiftCompatibilitySpan 5.0:macOS 10.14.4, iOS 12.2, watchOS 5.2, tvOS 12.2, visionOS 1.0

0 commit comments

Comments
 (0)