[5.1] [CMake] Switch to building the overlays in Swift 5 mode

cmake/modules/SwiftSource.cmake

@@ -265,7 +265,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)

stdlib/public/Darwin/AppKit/CMakeLists.txt

@@ -9,7 +9,7 @@ add_swift_target_library(swiftAppKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS
   NSGraphics.swift
   NSOpenGL.swift
 
-  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

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
 

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)
   }
 }
 

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)
   }
 }
 

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)
   }
 }
 

stdlib/public/Darwin/Foundation/CMakeLists.txt

@@ -64,7 +64,7 @@ add_swift_target_library(swiftFoundation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES
   UUID.swift
   CheckClass.mm
 
-  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

stdlib/public/Darwin/UIKit/CMakeLists.txt

@@ -6,7 +6,7 @@ add_swift_target_library(swiftUIKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_
   UIKit.swift
   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

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) {