Skip to content

Commit 841f015

Browse files
authored
Merge pull request #68583 from apple/bump-version-5.11
[main] Bump the Swift version to 5.11
2 parents fa3ba92 + 5b73dd6 commit 841f015

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

cmake/SwiftVersion.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# can be reused when a new version of Swift comes out (assuming the user hasn't
33
# manually set it as part of their own CMake configuration).
44
set(SWIFT_VERSION_MAJOR 5)
5-
set(SWIFT_VERSION_MINOR 9)
5+
set(SWIFT_VERSION_MINOR 11)
66
set(SWIFT_VERSION "${SWIFT_VERSION_MAJOR}.${SWIFT_VERSION_MINOR}")
77

test/IRGen/objc.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class WeakObjC {
139139
// CHECK: i32 1, !"Objective-C Version", i32 2}
140140
// CHECK: i32 1, !"Objective-C Image Info Version", i32 0}
141141
// CHECK: i32 1, !"Objective-C Image Info Section", !"__DATA,__objc_imageinfo,regular,no_dead_strip"}
142-
// 84477696 == (5 << 24) | (9 << 16) | (7 << 8).
142+
// 84608768 == (5 << 24) | (11 << 16) | (7 << 8).
143143
// 5 and 8 is the current major.minor version. 7 is the Swift ABI version.
144-
// CHECK: i32 4, !"Objective-C Garbage Collection", i32 84477696}
144+
// CHECK: i32 4, !"Objective-C Garbage Collection", i32 84608768}
145145
// CHECK: i32 1, !"Swift Version", i32 7}

test/Serialization/Recovery/types-5-to-4.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import Lib
1616
func requiresConformance(_: B_RequiresConformance<B_ConformsToProto>) {}
1717
func requiresConformance(_: B_RequiresConformance<C_RelyOnConformanceImpl.Assoc>) {}
1818

19-
class Sub: Base {} // expected-error {{cannot inherit from class 'Base' (compiled with Swift 5.9) because it has overridable members that could not be loaded in Swift 4.1.50}}
20-
class Impl: Proto {} // expected-error {{type 'Impl' cannot conform to protocol 'Proto' (compiled with Swift 5.9) because it has requirements that could not be loaded in Swift 4.1.50}}
19+
class Sub: Base {} // expected-error {{cannot inherit from class 'Base' (compiled with Swift 5.11) because it has overridable members that could not be loaded in Swift 4.1.50}}
20+
class Impl: Proto {} // expected-error {{type 'Impl' cannot conform to protocol 'Proto' (compiled with Swift 5.11) because it has requirements that could not be loaded in Swift 4.1.50}}
2121

2222
#else // TEST
2323

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %sourcekitd-test -req=compiler-version | %FileCheck %s
22

33
// CHECK: key.version_major: 5
4-
// CHECK: key.version_minor: 9
4+
// CHECK: key.version_minor: 11
55
// CHECK: key.version_patch: 0

utils/build_swift/build_swift/defaults.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
CMAKE_GENERATOR = 'Ninja'
4747

4848
COMPILER_VENDOR = 'none'
49-
SWIFT_USER_VISIBLE_VERSION = Version('5.9')
50-
CLANG_USER_VISIBLE_VERSION = Version('13.0.0')
49+
SWIFT_USER_VISIBLE_VERSION = Version('5.11')
50+
CLANG_USER_VISIBLE_VERSION = Version('15.0.0')
5151
SWIFT_ANALYZE_CODE_COVERAGE = 'false'
5252

5353
DARWIN_XCRUN_TOOLCHAIN = 'default'

0 commit comments

Comments
 (0)