Skip to content

Commit fbaf73d

Browse files
authored
Merge pull request #39804 from apple/5.5.1-bump-version
Bump the Swift version
2 parents 63fc969 + 2dbf3e2 commit fbaf73d

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ set(SWIFT_ANALYZE_CODE_COVERAGE FALSE CACHE STRING
148148
# SWIFT_VERSION is deliberately /not/ cached so that an existing build directory
149149
# can be reused when a new version of Swift comes out (assuming the user hasn't
150150
# manually set it as part of their own CMake configuration).
151-
set(SWIFT_VERSION "5.5")
151+
set(SWIFT_VERSION "5.5.1")
152152

153153
set(SWIFT_VENDOR "" CACHE STRING
154154
"The vendor name of the Swift compiler")

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-
class Sub: Base {} // expected-error {{cannot inherit from class 'Base' (compiled with Swift 5.5) because it has overridable members that could not be loaded in Swift 4.1.50}}
20-
class Impl: Proto {} // expected-error {{type 'Impl' cannot conform to protocol 'Proto' (compiled with Swift 5.5) because it has requirements that could not be loaded in Swift 4.1.50}}
19+
class Sub: Base {} // expected-error {{cannot inherit from class 'Base' (compiled with Swift 5.5.1) because it has overridable members that could not be loaded in Swift 4.1.50}}
20+
class Impl: Proto {} // expected-error {{type 'Impl' cannot conform to protocol 'Proto' (compiled with Swift 5.5.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: 5
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
@@ -49,7 +49,7 @@
4949
CMAKE_GENERATOR = 'Ninja'
5050

5151
COMPILER_VENDOR = 'none'
52-
SWIFT_USER_VISIBLE_VERSION = Version('5.5')
52+
SWIFT_USER_VISIBLE_VERSION = Version('5.5.1')
5353
CLANG_USER_VISIBLE_VERSION = Version('10.0.0')
5454
SWIFT_ANALYZE_CODE_COVERAGE = 'false'
5555

0 commit comments

Comments
 (0)