Skip to content
Permalink
Browse files

[Version] Bump the Swift version to 5.1.1

(cherry picked from commit fff1a39)
  • Loading branch information
shahmishal committed Oct 3, 2019
1 parent 1d38d61 commit 8332029dd6a278668753d4c5dac2de34987d6e10
@@ -123,7 +123,7 @@ set_property(CACHE SWIFT_ANALYZE_CODE_COVERAGE PROPERTY
# 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.1")
set(SWIFT_VERSION "5.1.1")

set(SWIFT_VENDOR "" CACHE STRING
"The vendor name of the Swift compiler")
@@ -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.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.1) 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.1.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.1.1) because it has requirements that could not be loaded in Swift 4.1.50}}
#else // TEST
@@ -2,4 +2,4 @@
// CHECK: key.version_major: 5
// CHECK: key.version_minor: 1
// CHECK: key.version_patch: 0
// CHECK: key.version_patch: 1
@@ -40,7 +40,7 @@
CMAKE_GENERATOR = 'Ninja'

COMPILER_VENDOR = 'none'
SWIFT_USER_VISIBLE_VERSION = CompilerVersion('5.1')
SWIFT_USER_VISIBLE_VERSION = CompilerVersion('5.1.1')
CLANG_USER_VISIBLE_VERSION = CompilerVersion('7.0.0')
SWIFT_ANALYZE_CODE_COVERAGE = 'false'

0 comments on commit 8332029

Please sign in to comment.
You can’t perform that action at this time.