Skip to content

Commit ed9117a

Browse files
committed
Bumping Swift version number to 5.1.2
1 parent 71def56 commit ed9117a

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
@@ -123,7 +123,7 @@ set_property(CACHE SWIFT_ANALYZE_CODE_COVERAGE PROPERTY
123123
# SWIFT_VERSION is deliberately /not/ cached so that an existing build directory
124124
# can be reused when a new version of Swift comes out (assuming the user hasn't
125125
# manually set it as part of their own CMake configuration).
126-
set(SWIFT_VERSION "5.1")
126+
set(SWIFT_VERSION "5.1.2")
127127

128128
set(SWIFT_VENDOR "" CACHE STRING
129129
"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.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.1) 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.1.2) 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.1.2) 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: 1
5-
// CHECK: key.version_patch: 0
5+
// CHECK: key.version_patch: 2

utils/build_swift/defaults.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
CMAKE_GENERATOR = 'Ninja'
4141

4242
COMPILER_VENDOR = 'none'
43-
SWIFT_USER_VISIBLE_VERSION = CompilerVersion('5.1')
43+
SWIFT_USER_VISIBLE_VERSION = CompilerVersion('5.1.2')
4444
CLANG_USER_VISIBLE_VERSION = CompilerVersion('7.0.0')
4545
SWIFT_ANALYZE_CODE_COVERAGE = 'false'
4646

0 commit comments

Comments
 (0)