Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

stdlib/public/Darwin/Foundation/NSValue.swift.gyb

@@ -24,7 +24,7 @@ ${ ObjectiveCBridgeableImplementationForNSValue("CGSize") }
 ${ ObjectiveCBridgeableImplementationForNSValue("CGAffineTransform") }
 
 extension NSValue {
-    @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+    @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
     public func value<StoredType>(of type: StoredType.Type) -> StoredType? {
         if StoredType.self is AnyObject.Type {
             let encoding = String(cString: objCType)
@@ -42,11 +42,7 @@ extension NSValue {
             }
             let allocated = UnsafeMutablePointer<StoredType>.allocate(capacity: 1)
             defer { allocated.deallocate() }
-            if #available(OSX 10.13, iOS 11.0, tvOS 11.0, watchOS 4.0, *) {
-                getValue(allocated, size: storedSize)
-            } else {
-                getValue(allocated)
-            }
+            getValue(allocated, size: storedSize)
             return allocated.pointee
         }
         return nil

stdlib/public/SwiftShims/CMakeLists.txt

@@ -49,6 +49,8 @@ set(sources
   NSTimeZoneShims.h
   NSUndoManagerShims.h
 
+  ClockKitOverlayShims.h
+
   module.modulemap
   )
 set(output_dir "${SWIFTLIB_DIR}/shims")

stdlib/public/SwiftShims/ClockKitOverlayShims.h

@@ -0,0 +1,23 @@
+//===--- ClockKitOverlayShims.h --------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_STDLIB_SHIMS_CLOCKKITOVERLAY_H
+#define SWIFT_STDLIB_SHIMS_CLOCKKITOVERLAY_H
+
+@import ClockKit;
+
+@interface CLKTextProvider (OverlaySupport)
++ (CLKTextProvider *)textProviderWithFormat:(NSString *)format arguments:(va_list)arguments API_AVAILABLE(watchos(2.0)) API_UNAVAILABLE(macos, tvos, ios);
+@end
+
+// SWIFT_STDLIB_SHIMS_CLOCKKITOVERLAY_H
+#endif

stdlib/public/SwiftShims/module.modulemap

@@ -71,3 +71,7 @@ module _SwiftFoundationOverlayShims {
 module _SwiftNetworkOverlayShims {
   header "NetworkOverlayShims.h"
 }
+
+module _SwiftClockKitOverlayShims {
+    header "ClockKitOverlayShims.h"
+}

test/stdlib/NSValueBridging.swift.gyb

@@ -92,7 +92,7 @@ nsValueBridging.test("NSValue can only be cast back to its original type") {
 }
 
 nsValueBridging.test("NSValue fetching method should be able to convert constructed values safely") {
-  guard #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) else { return }
+  guard #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) else { return }
 
   let range = NSRange(location: 17, length: 38)
   let value = NSValue(range: range)