Skip to content

Bump the Swift version to 6.1 #75979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 21, 2024
Merged

Bump the Swift version to 6.1 #75979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ac0dff
Bump the Swift version to 6.1
shahmishal Aug 20, 2024
b98ec18
Update the objc.swift test to support 6.1 version
shahmishal Aug 20, 2024
271482d
Fix the test to use the correct version
shahmishal Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/SwiftVersion.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# can be reused when a new version of Swift comes out (assuming the user hasn't
# manually set it as part of their own CMake configuration).
set(SWIFT_VERSION_MAJOR 6)
set(SWIFT_VERSION_MINOR 0)
set(SWIFT_VERSION_MINOR 1)
set(SWIFT_VERSION "${SWIFT_VERSION_MAJOR}.${SWIFT_VERSION_MINOR}")

4 changes: 2 additions & 2 deletions test/IRGen/objc.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ class WeakObjC {
// CHECK: i32 1, !"Objective-C Version", i32 2}
// CHECK: i32 1, !"Objective-C Image Info Version", i32 0}
// CHECK: i32 1, !"Objective-C Image Info Section", !"__DATA,__objc_imageinfo,regular,no_dead_strip"}
// 100665088 == (6 << 24) | (0 << 16) | (7 << 8).
// 100730624 == (6 << 24) | (1 << 16) | (7 << 8).
// 5 and 8 is the current major.minor version. 7 is the Swift ABI version.
// CHECK: i32 4, !"Objective-C Garbage Collection", i32 100665088}
// CHECK: i32 4, !"Objective-C Garbage Collection", i32 100730624}
// CHECK: i32 1, !"Swift Version", i32 7}
2 changes: 1 addition & 1 deletion test/SourceKit/Misc/compiler_version.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %sourcekitd-test -req=compiler-version | %FileCheck %s

// CHECK: key.version_major: 6
// CHECK: key.version_minor: 0
// CHECK: key.version_minor: 1
// CHECK: key.version_patch: 0
2 changes: 1 addition & 1 deletion utils/build_swift/build_swift/defaults.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
CMAKE_GENERATOR = 'Ninja'

COMPILER_VENDOR = 'none'
SWIFT_USER_VISIBLE_VERSION = Version('6.0')
SWIFT_USER_VISIBLE_VERSION = Version('6.1')
CLANG_USER_VISIBLE_VERSION = Version('17.0.0')
SWIFT_ANALYZE_CODE_COVERAGE = 'false'

Expand Down