Skip to content

Commit e1c5216

Browse files
authored
Merge pull request #77799 from swiftlang/bump-swift-version-6.2
Bump the Swift version to 6.2
2 parents 04a4a3f + 9a48056 commit e1c5216

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
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 6)
5-
set(SWIFT_VERSION_MINOR 1)
5+
set(SWIFT_VERSION_MINOR 2)
66
set(SWIFT_VERSION "${SWIFT_VERSION_MAJOR}.${SWIFT_VERSION_MINOR}")
77

test/IRGen/objc.swift

Lines changed: 3 additions & 3 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-
// 100730624 == (6 << 24) | (1 << 16) | (7 << 8).
143-
// 6 and 1 is the current major.minor version. 7 is the Swift ABI version.
144-
// CHECK: i32 4, !"Objective-C Garbage Collection", i32 100730624}
142+
// 100796160 == (6 << 24) | (2 << 16) | (7 << 8).
143+
// 6 and 2 is the current major.minor version. 7 is the Swift ABI version.
144+
// CHECK: i32 4, !"Objective-C Garbage Collection", i32 100796160}
145145
// CHECK: i32 1, !"Swift Version", i32 7}
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: 6
4-
// CHECK: key.version_minor: 1
4+
// CHECK: key.version_minor: 2
55
// CHECK: key.version_patch: 0

utils/build_swift/build_swift/defaults.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
CMAKE_GENERATOR = 'Ninja'
4848

4949
COMPILER_VENDOR = 'none'
50-
SWIFT_USER_VISIBLE_VERSION = Version('6.1')
50+
SWIFT_USER_VISIBLE_VERSION = Version('6.2')
5151
CLANG_USER_VISIBLE_VERSION = Version('17.0.0')
5252
SWIFT_ANALYZE_CODE_COVERAGE = 'false'
5353

0 commit comments

Comments
 (0)