Skip to content

Bump the Swift version to 5.7.1 #60658

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.

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 1 commit into from
Aug 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ set(SWIFT_ANALYZE_CODE_COVERAGE FALSE CACHE STRING
# SWIFT_VERSION is deliberately /not/ cached so that an existing build directory
# 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 "5.7")
set(SWIFT_VERSION "5.7.1")

set(SWIFT_VENDOR "" CACHE STRING
"The vendor name of the Swift compiler")
Expand Down
4 changes: 2 additions & 2 deletions test/Serialization/Recovery/types-5-to-4.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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.7) 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.7) 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.7.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.7.1) because it has requirements that could not be loaded in Swift 4.1.50}}

#else // TEST

Expand Down
2 changes: 1 addition & 1 deletion test/SourceKit/Misc/compiler_version.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

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

COMPILER_VENDOR = 'none'
SWIFT_USER_VISIBLE_VERSION = Version('5.7')
SWIFT_USER_VISIBLE_VERSION = Version('5.7.1')
CLANG_USER_VISIBLE_VERSION = Version('13.0.0')
SWIFT_ANALYZE_CODE_COVERAGE = 'false'

Expand Down