diff --git a/cmake/SwiftVersion.cmake b/cmake/SwiftVersion.cmake index 931a295767329..2457a1dfdec5b 100644 --- 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 index 79a117c371e15..73193140cc403 100644 --- 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) {} func requiresConformance(_: B_RequiresConformance) {} -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 index ce29db0c92127..0baee55784bd3 100644 --- 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 index ba53e9a89403f..22a709535ca83 100644 --- 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'