Skip to content

[5.10] Bump the Swift version to 5.10.1 #74137

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.

Sign up for GitHub

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 2 commits into from
Jun 6, 2024
Merged

[5.10] Bump the Swift version to 5.10.1 #74137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cb1c83
Bump the Swift version to 5.10.1
shahmishal Jun 5, 2024
0c7af02
Update the Swift version to 5.10.1
shahmishal Jun 5, 2024
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
3 changes: 2 additions & 1 deletion cmake/SwiftVersion.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")

4 changes: 2 additions & 2 deletions test/Serialization/Recovery/types-5-to-4.swift
View file
Open in desktop
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.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

Expand Down
2 changes: 1 addition & 1 deletion test/SourceKit/Misc/compiler_version.swift
View file
Open in desktop
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: 10
// CHECK: key.version_patch: 0
// CHECK: key.version_patch: 1
2 changes: 1 addition & 1 deletion utils/build_swift/build_swift/defaults.py
View file
Open in desktop
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.10')
SWIFT_USER_VISIBLE_VERSION = Version('5.10.1')
CLANG_USER_VISIBLE_VERSION = Version('15.0.0')
SWIFT_ANALYZE_CODE_COVERAGE = 'false'

Expand Down