Merge pull request #74137 from apple/bump-version-5.10.1

[5.10] Bump the Swift version to 5.10.1
swiftlang · Jun 6, 2024 · 0e2d54d · 0e2d54d
2 parents 0e5cb27 + 0c7af02
commit 0e2d54d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/cmake/SwiftVersion.cmake b/cmake/SwiftVersion.cmake
@@ -3,5 +3,6 @@
 # manually set it as part of their own CMake configuration).
 set(SWIFT_VERSION_MAJOR 5)
 set(SWIFT_VERSION_MINOR 10)
-set(SWIFT_VERSION "${SWIFT_VERSION_MAJOR}.${SWIFT_VERSION_MINOR}")
+set(SWIFT_VERSION_PATCHLEVEL 1)
+set(SWIFT_VERSION "${SWIFT_VERSION_MAJOR}.${SWIFT_VERSION_MINOR}.${SWIFT_VERSION_PATCHLEVEL}")
 
diff --git a/test/Serialization/Recovery/types-5-to-4.swift b/test/Serialization/Recovery/types-5-to-4.swift
@@ -16,8 +16,8 @@ import Lib
 func requiresConformance(_: B_RequiresConformance<B_ConformsToProto>) {}
 func requiresConformance(_: B_RequiresConformance<C_RelyOnConformanceImpl.Assoc>) {}
 
-class Sub: Base {} // expected-error {{cannot inherit from class 'Base' (compiled with Swift 5.10) because it has overridable members that could not be loaded in Swift 4.1.50}}
-class Impl: Proto {} // expected-error {{type 'Impl' cannot conform to protocol 'Proto' (compiled with Swift 5.10) because it has requirements that could not be loaded in Swift 4.1.50}}
+class Sub: Base {} // expected-error {{cannot inherit from class 'Base' (compiled with Swift 5.10.1) because it has overridable members that could not be loaded in Swift 4.1.50}}
+class Impl: Proto {} // expected-error {{type 'Impl' cannot conform to protocol 'Proto' (compiled with Swift 5.10.1) because it has requirements that could not be loaded in Swift 4.1.50}}
 
 #else // TEST
 

diff --git a/test/SourceKit/Misc/compiler_version.swift b/test/SourceKit/Misc/compiler_version.swift
@@ -2,4 +2,4 @@
 
 // CHECK: key.version_major: 5
 // CHECK: key.version_minor: 10
-// CHECK: key.version_patch: 0
+// CHECK: key.version_patch: 1
diff --git a/utils/build_swift/build_swift/defaults.py b/utils/build_swift/build_swift/defaults.py
@@ -46,7 +46,7 @@
 CMAKE_GENERATOR = 'Ninja'
 
 COMPILER_VENDOR = 'none'
-SWIFT_USER_VISIBLE_VERSION = Version('5.10')
+SWIFT_USER_VISIBLE_VERSION = Version('5.10.1')
 CLANG_USER_VISIBLE_VERSION = Version('15.0.0')
 SWIFT_ANALYZE_CODE_COVERAGE = 'false'