[CMake] Switch to building the overlays in Swift 5 mode (#24350)

jrose-apple · web-flow · commit d20a7ca64e00 · 2019-04-29T17:55:20.000-07:00
Now that that's stabilized, we don't have to keep them in Swift 4 mode
any longer. (Arguably we don't need the CMake variable at all, but it
may be useful again in the future.)

rdar://problem/49040980
diff --git a/cmake/modules/SwiftSource.cmake b/cmake/modules/SwiftSource.cmake
@@ -260,7 +260,7 @@ function(_compile_swift_files
 
   # Force swift 4 compatibility mode for overlays.
   if (SWIFTFILE_IS_SDK_OVERLAY)
-    list(APPEND swift_flags "-swift-version" "4")
+    list(APPEND swift_flags "-swift-version" "5")
   endif()
 
   if(SWIFTFILE_IS_SDK_OVERLAY)
diff --git a/stdlib/public/Darwin/AppKit/CMakeLists.txt b/stdlib/public/Darwin/AppKit/CMakeLists.txt
@@ -11,7 +11,7 @@ add_swift_target_library(swiftAppKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS
 
   "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
 
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} -swift-version 4 
+  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
   TARGET_SDKS OSX
   SWIFT_MODULE_DEPENDS_OSX Darwin CoreData CoreGraphics CoreImage Dispatch Foundation IOKit ObjectiveC QuartzCore XPC # auto-updated
diff --git a/stdlib/public/Darwin/CloudKit/CMakeLists.txt b/stdlib/public/Darwin/CloudKit/CMakeLists.txt
@@ -16,7 +16,7 @@ add_swift_target_library(swiftCloudKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES}
   CKRecordValue.swift
   DefaultParameters.swift
 
-  SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}" "-swift-version" "4.2"
+  SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
   TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
 
diff --git a/stdlib/public/Darwin/CoreImage/CoreImage.swift b/stdlib/public/Darwin/CoreImage/CoreImage.swift
@@ -38,7 +38,7 @@ extension CIFilter {
     for (key, value) in elements {
       dict[key] = value
     }
-    self.init(name: name, withInputParameters: dict)
+    self.init(name: name, parameters: dict)
   }
 }
 
diff --git a/stdlib/public/Darwin/CoreMedia/CMTime.swift b/stdlib/public/Darwin/CoreMedia/CMTime.swift
@@ -14,11 +14,11 @@
 
 extension CMTime {
   public init(seconds: Double, preferredTimescale: CMTimeScale) {
-    self = CMTimeMakeWithSeconds(seconds, preferredTimescale)
+    self = CMTimeMakeWithSeconds(seconds, preferredTimescale: preferredTimescale)
   }
 
   public init(value: CMTimeValue, timescale: CMTimeScale) {
-    self = CMTimeMake(value, timescale)
+    self = CMTimeMake(value: value, timescale: timescale)
   }
 }
 
@@ -67,7 +67,7 @@ extension CMTime {
 
   public func convertScale(_ newTimescale: Int32, method: CMTimeRoundingMethod)
     -> CMTime {
-    return CMTimeConvertScale(self, newTimescale, method)
+    return CMTimeConvertScale(self, timescale: newTimescale, method: method)
   }
 }
 
diff --git a/stdlib/public/Darwin/CoreMedia/CMTimeRange.swift b/stdlib/public/Darwin/CoreMedia/CMTimeRange.swift
@@ -24,7 +24,7 @@
 // CMTimeRangeFromTimeToTime
 extension CMTimeRange {
   public init(start: CMTime, end: CMTime) {
-    self = CMTimeRangeFromTimeToTime(start, end)
+    self = CMTimeRangeFromTimeToTime(start: start, end: end)
   }
 
   public var isValid: Bool {
@@ -40,24 +40,24 @@ extension CMTimeRange {
   }
 
   public var isEmpty: Bool {
-    return self.isValid && (self.duration == kCMTimeZero)
+    return self.isValid && (self.duration == .zero)
   }
 
   public var end: CMTime {
     return CMTimeRangeGetEnd(self)
   }
 
   public func union(_ otherRange: CMTimeRange) -> CMTimeRange {
-    return CMTimeRangeGetUnion(self, otherRange)
+    return CMTimeRangeGetUnion(self, otherRange: otherRange)
   }
   public func intersection(_ otherRange: CMTimeRange) -> CMTimeRange {
-    return CMTimeRangeGetIntersection(self, otherRange)
+    return CMTimeRangeGetIntersection(self, otherRange: otherRange)
   }
   public func containsTime(_ time: CMTime) -> Bool {
-    return CMTimeRangeContainsTime(self, time)
+    return CMTimeRangeContainsTime(self, time: time)
   }
   public func containsTimeRange(_ range: CMTimeRange) -> Bool {
-    return CMTimeRangeContainsTimeRange(self, range)
+    return CMTimeRangeContainsTimeRange(self, otherRange: range)
   }
 }
 
diff --git a/stdlib/public/Darwin/Foundation/CMakeLists.txt b/stdlib/public/Darwin/Foundation/CMakeLists.txt
@@ -68,7 +68,7 @@ add_swift_target_library(swiftFoundation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES
   GYB_SOURCES
     NSValue.swift.gyb
 
-  SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}" "-Xllvm" "-sil-inline-generics" "-Xllvm" "-sil-partial-specialization" "-swift-version" "5"
+  SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}" "-Xllvm" "-sil-inline-generics" "-Xllvm" "-sil-partial-specialization"
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
 
   SWIFT_MODULE_DEPENDS_OSX Darwin CoreFoundation CoreGraphics Dispatch IOKit ObjectiveC # auto-updated
diff --git a/stdlib/public/Darwin/UIKit/CMakeLists.txt b/stdlib/public/Darwin/UIKit/CMakeLists.txt
@@ -10,7 +10,7 @@ add_swift_target_library(swiftUIKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_
   GYB_SOURCES
     UIKit_FoundationExtensions.swift.gyb
 
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} -swift-version 4.2
+  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
   TARGET_SDKS IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
   SWIFT_MODULE_DEPENDS_IOS Darwin CoreFoundation CoreGraphics CoreImage Dispatch Foundation ObjectiveC QuartzCore os # auto-updated
diff --git a/stdlib/public/Darwin/UIKit/UIKit.swift b/stdlib/public/Darwin/UIKit/UIKit.swift
@@ -298,7 +298,7 @@ internal struct _UIViewQuickLookState {
   static var views = Set<UIView>()
 }
 
-extension UIView : _DefaultCustomPlaygroundQuickLookable {
+extension UIView : __DefaultCustomPlaygroundQuickLookable {
   @available(*, deprecated, message: "UIView._defaultCustomPlaygroundQuickLook will be removed in a future Swift version")
   public var _defaultCustomPlaygroundQuickLook: PlaygroundQuickLook {
     if _UIViewQuickLookState.views.contains(self) {

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ extension CIFilter {`
`38`	`38`	`for (key, value) in elements {`
`39`	`39`	`dict[key] = value`
`40`	`40`	`}`
`41`		`- self.init(name: name, withInputParameters: dict)`
	`41`	`+ self.init(name: name, parameters: dict)`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@`
`14`	`14`
`15`	`15`	`extension CMTime {`
`16`	`16`	`public init(seconds: Double, preferredTimescale: CMTimeScale) {`
`17`		`- self = CMTimeMakeWithSeconds(seconds, preferredTimescale)`
	`17`	`+ self = CMTimeMakeWithSeconds(seconds, preferredTimescale: preferredTimescale)`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public init(value: CMTimeValue, timescale: CMTimeScale) {`
`21`		`- self = CMTimeMake(value, timescale)`
	`21`	`+ self = CMTimeMake(value: value, timescale: timescale)`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`@@ -67,7 +67,7 @@ extension CMTime {`
`67`	`67`
`68`	`68`	`public func convertScale(_ newTimescale: Int32, method: CMTimeRoundingMethod)`
`69`	`69`	`-> CMTime {`
`70`		`- return CMTimeConvertScale(self, newTimescale, method)`
	`70`	`+ return CMTimeConvertScale(self, timescale: newTimescale, method: method)`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`// CMTimeRangeFromTimeToTime`
`25`	`25`	`extension CMTimeRange {`
`26`	`26`	`public init(start: CMTime, end: CMTime) {`
`27`		`- self = CMTimeRangeFromTimeToTime(start, end)`
	`27`	`+ self = CMTimeRangeFromTimeToTime(start: start, end: end)`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public var isValid: Bool {`
`@@ -40,24 +40,24 @@ extension CMTimeRange {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public var isEmpty: Bool {`
`43`		`- return self.isValid && (self.duration == kCMTimeZero)`
	`43`	`+ return self.isValid && (self.duration == .zero)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public var end: CMTime {`
`47`	`47`	`return CMTimeRangeGetEnd(self)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public func union(_ otherRange: CMTimeRange) -> CMTimeRange {`
`51`		`- return CMTimeRangeGetUnion(self, otherRange)`
	`51`	`+ return CMTimeRangeGetUnion(self, otherRange: otherRange)`
`52`	`52`	`}`
`53`	`53`	`public func intersection(_ otherRange: CMTimeRange) -> CMTimeRange {`
`54`		`- return CMTimeRangeGetIntersection(self, otherRange)`
	`54`	`+ return CMTimeRangeGetIntersection(self, otherRange: otherRange)`
`55`	`55`	`}`
`56`	`56`	`public func containsTime(_ time: CMTime) -> Bool {`
`57`		`- return CMTimeRangeContainsTime(self, time)`
	`57`	`+ return CMTimeRangeContainsTime(self, time: time)`
`58`	`58`	`}`
`59`	`59`	`public func containsTimeRange(_ range: CMTimeRange) -> Bool {`
`60`		`- return CMTimeRangeContainsTimeRange(self, range)`
	`60`	`+ return CMTimeRangeContainsTimeRange(self, otherRange: range)`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ internal struct _UIViewQuickLookState {`
`298`	`298`	`static var views = Set<UIView>()`
`299`	`299`	`}`
`300`	`300`
`301`		`-extension UIView : _DefaultCustomPlaygroundQuickLookable {`
	`301`	`+extension UIView : __DefaultCustomPlaygroundQuickLookable {`
`302`	`302`	`@available(*, deprecated, message: "UIView._defaultCustomPlaygroundQuickLook will be removed in a future Swift version")`
`303`	`303`	`public var _defaultCustomPlaygroundQuickLook: PlaygroundQuickLook {`
`304`	`304`	`if _UIViewQuickLookState.views.contains(self) {`