Merge pull request swiftlang#75979 from swiftlang/update-swift-version

Bump the Swift version to 6.1
swiftwasm · Aug 21, 2024 · 08721cf · 08721cf
2 parents 011c127 + 271482d
commit 08721cf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/cmake/SwiftVersion.cmake b/cmake/SwiftVersion.cmake
@@ -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}")
 
diff --git a/test/IRGen/objc.swift b/test/IRGen/objc.swift
@@ -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}
diff --git a/test/SourceKit/Misc/compiler_version.swift b/test/SourceKit/Misc/compiler_version.swift
@@ -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
diff --git a/utils/build_swift/build_swift/defaults.py b/utils/build_swift/build_swift/defaults.py
@@ -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'