Skip to content

Commit 0e2d54d

Browse files
authored
Merge pull request #74137 from apple/bump-version-5.10.1
[5.10] Bump the Swift version to 5.10.1
2 parents 0e5cb27 + 0c7af02 commit 0e2d54d

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

cmake/SwiftVersion.cmake

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
# manually set it as part of their own CMake configuration).
44
set(SWIFT_VERSION_MAJOR 5)
55
set(SWIFT_VERSION_MINOR 10)
6-
set(SWIFT_VERSION "${SWIFT_VERSION_MAJOR}.${SWIFT_VERSION_MINOR}")
6+
set(SWIFT_VERSION_PATCHLEVEL 1)
7+
set(SWIFT_VERSION "${SWIFT_VERSION_MAJOR}.${SWIFT_VERSION_MINOR}.${SWIFT_VERSION_PATCHLEVEL}")
78

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

+2-2
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-
classSub: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}}
20-
classImpl: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}}
19+
classSub: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}}
20+
classImpl: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}}
2121

2222
#else // TEST
2323

test/SourceKit/Misc/compiler_version.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
// CHECK: key.version_major: 5
44
// CHECK: key.version_minor: 10
5-
// CHECK: key.version_patch: 0
5+
// CHECK: key.version_patch: 1

utils/build_swift/build_swift/defaults.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
CMAKE_GENERATOR='Ninja'
4747

4848
COMPILER_VENDOR='none'
49-
SWIFT_USER_VISIBLE_VERSION=Version('5.10')
49+
SWIFT_USER_VISIBLE_VERSION=Version('5.10.1')
5050
CLANG_USER_VISIBLE_VERSION=Version('15.0.0')
5151
SWIFT_ANALYZE_CODE_COVERAGE='false'
5252

0 commit comments

Comments
 (0)
close