Update master to build with Xcode 9 beta 4

cmake/modules/AddSwift.cmake

@@ -1553,9 +1553,17 @@ function(add_swift_library name)
         endif()
 
         # Add PrivateFrameworks, rdar://28466433
+        set(swiftlib_link_flags_all ${SWIFTLIB_LINK_FLAGS})
         if(SWIFTLIB_IS_SDK_OVERLAY)
           list(APPEND swiftlib_swift_compile_flags_all "-Fsystem" "${SWIFT_SDK_${sdk}_PATH}/System/Library/PrivateFrameworks/")
         endif()
+
+       if("${sdk}" STREQUAL "IOS_SIMULATOR")
+         if("${name}" STREQUAL "swiftMediaPlayer")
+           message("DISABLING AUTOLINK FOR swiftMediaPlayer")
+           list(APPEND swiftlib_link_flags_all "-Xlinker" "-ignore_auto_link")
+         endif()
+       endif()
 
         # Add this library variant.
         _add_swift_library_single(
@@ -1576,7 +1584,7 @@ function(add_swift_library name)
           FILE_DEPENDS ${SWIFTLIB_FILE_DEPENDS} ${swiftlib_module_dependency_targets}
           C_COMPILE_FLAGS ${SWIFTLIB_C_COMPILE_FLAGS}
           SWIFT_COMPILE_FLAGS ${swiftlib_swift_compile_flags_all}
-          LINK_FLAGS ${SWIFTLIB_LINK_FLAGS}
+          LINK_FLAGS ${swiftlib_link_flags_all}
           PRIVATE_LINK_LIBRARIES ${swiftlib_private_link_libraries_targets}
           INCORPORATE_OBJECT_LIBRARIES ${SWIFTLIB_INCORPORATE_OBJECT_LIBRARIES}
           INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY ${SWIFTLIB_INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY}

stdlib/public/SDK/ARKit/ARKit.swift

@@ -19,6 +19,9 @@ extension ARCamera {
      */
     public enum TrackingState {
         public enum Reason {
+            /** Tracking is limited due to initialization in progress. */
+            case initializing
+
             /** Tracking is limited due to a excessive motion of the camera. */
             case excessiveMotion
 
@@ -47,6 +50,7 @@ extension ARCamera {
             let reason: TrackingState.Reason
 
             switch __trackingStateReason {
+            case .initializing: reason = .initializing
             case .excessiveMotion: reason = .excessiveMotion
             default: reason = .insufficientFeatures
             }

stdlib/public/SDK/AVFoundation/AVCaptureDevice.swift

@@ -0,0 +1,45 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 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
+//
+//===----------------------------------------------------------------------===//
+
+@_exported import AVFoundation // Clang module
+import Foundation
+
+
+#if os(iOS)
+
+internal protocol _AVCaptureDeviceFormatSupportedColorSpaces {
+  @available(iOS, introduced: 10.0)
+  var __supportedColorSpaces: [NSNumber] { get }
+}
+
+extension _AVCaptureDeviceFormatSupportedColorSpaces {
+  @available(swift, obsoleted: 4.0)
+  @available(iOS, introduced: 10.0)
+  @nonobjc
+  public var supportedColorSpaces: [NSNumber]! {
+    return __supportedColorSpaces
+  }
+
+  @available(swift, introduced: 4.0)
+  @available(iOS, introduced: 10.0)
+  @nonobjc
+  public var supportedColorSpaces: [AVCaptureColorSpace] {
+    return __supportedColorSpaces.map { AVCaptureColorSpace(rawValue: $0.intValue)! }
+  }
+}
+
+@available(iOS, introduced: 10.0)
+extension AVCaptureDevice.Format : _AVCaptureDeviceFormatSupportedColorSpaces {
+}
+
+#endif
+

stdlib/public/SDK/AVFoundation/AVCapturePhotoOutput.swift

@@ -0,0 +1,98 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 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
+//
+//===----------------------------------------------------------------------===//
+
+@_exported import AVFoundation // Clang module
+import Foundation
+
+
+#if os(iOS)
+
+internal protocol _AVCapturePhotoOutputSwiftNativeTypes {
+  var __supportedFlashModes: [NSNumber] { get }
+  var __availablePhotoPixelFormatTypes: [NSNumber] { get }
+  var __availableRawPhotoPixelFormatTypes: [NSNumber] { get }
+}
+
+extension _AVCapturePhotoOutputSwiftNativeTypes {
+  @available(swift, obsoleted: 4.0)
+  @available(iOS, introduced: 10.0)
+  @nonobjc
+  public var supportedFlashModes: [NSNumber] {
+    return __supportedFlashModes
+  }
+
+  @available(swift, introduced: 4.0)
+  @available(iOS, introduced: 10.0)
+  @nonobjc
+  public var supportedFlashModes: [AVCaptureDevice.FlashMode] {
+    return __supportedFlashModes.map { AVCaptureDevice.FlashMode(rawValue: $0.intValue)! }
+  }
+
+  @available(swift, obsoleted: 4.0)
+  @available(iOS, introduced: 10.0)
+  @nonobjc
+  public var availablePhotoPixelFormatTypes: [NSNumber] {
+    return __availablePhotoPixelFormatTypes
+  }
+
+  @available(swift, introduced: 4.0)
+  @available(iOS, introduced: 10.0)
+  @nonobjc
+  public var availablePhotoPixelFormatTypes: [OSType] {
+    return __availablePhotoPixelFormatTypes.map { $0.uint32Value } as [OSType]
+  }
+
+  @available(swift, obsoleted: 4.0)
+  @available(iOS, introduced: 10.0)
+  @nonobjc
+  public var availableRawPhotoPixelFormatTypes: [NSNumber] {
+    return __availableRawPhotoPixelFormatTypes
+  }
+
+  @available(swift, introduced: 4.0)
+  @available(iOS, introduced: 10.0)
+  @nonobjc
+  public var availableRawPhotoPixelFormatTypes: [OSType] {
+    return __availableRawPhotoPixelFormatTypes.map { $0.uint32Value } as [OSType]
+  }
+}
+
+@available(iOS, introduced: 10.0)
+extension AVCapturePhotoOutput : _AVCapturePhotoOutputSwiftNativeTypes {
+}
+
+
+internal protocol _AVCapturePhotoSettingsSwiftNativeTypes {
+  var __availablePreviewPhotoPixelFormatTypes: [NSNumber] { get }
+}
+
+extension _AVCapturePhotoSettingsSwiftNativeTypes {
+  @available(swift, obsoleted: 4.0)
+  @available(iOS, introduced: 10.0)
+  @nonobjc
+  public var availablePreviewPhotoPixelFormatTypes: [NSNumber] {
+    return __availablePreviewPhotoPixelFormatTypes
+  }
+
+  @available(swift, introduced: 4.0)
+  @available(iOS, introduced: 10.0)
+  @nonobjc
+  public var availablePreviewPhotoPixelFormatTypes: [OSType] {
+    return __availablePreviewPhotoPixelFormatTypes.map { $0.uint32Value } as [OSType]
+  }
+}
+
+@available(iOS, introduced: 10.0)
+extension AVCapturePhotoSettings : _AVCapturePhotoSettingsSwiftNativeTypes {
+}
+
+#endif

stdlib/public/SDK/AVFoundation/AVCaptureSynchronizedDataCollection.swift

@@ -30,7 +30,7 @@ extension AVCaptureSynchronizedDataCollection : Sequence {
 
     public mutating func next() -> AVCaptureSynchronizedData? {
       guard let nextAny = fastIterator.next() else { return nil }
-      return nextAny as! AVCaptureSynchronizedData
+      return (nextAny as! AVCaptureSynchronizedData)
     }
   }
 }

stdlib/public/SDK/AVFoundation/AVCaptureVideoDataOutput.swift

@@ -0,0 +1,37 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 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
+//
+//===----------------------------------------------------------------------===//
+
+@_exported import AVFoundation // Clang module
+import Foundation
+
+
+#if os(macOS) || os(iOS)
+
+extension AVCaptureVideoDataOutput {
+  @available(swift, obsoleted: 4.0)
+  @available(macOS, introduced: 10.7)
+  @available(iOS, introduced: 5.0)
+  @nonobjc
+  public var availableVideoCVPixelFormatTypes: [NSNumber]! {
+    return __availableVideoCVPixelFormatTypes
+  }
+
+  @available(swift, introduced: 4.0)
+  @available(macOS, introduced: 10.7)
+  @available(iOS, introduced: 5.0)
+  @nonobjc
+  public var availableVideoPixelFormatTypes: [OSType] {
+    return __availableVideoCVPixelFormatTypes.map { $0.uint32Value } as [OSType]
+  }
+}
+
+#endif

stdlib/public/SDK/AVFoundation/AVMetadataObject.swift

@@ -0,0 +1,37 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 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
+//
+//===----------------------------------------------------------------------===//
+
+@_exported import AVFoundation // Clang module
+import Foundation
+import CoreGraphics
+
+
+#if os(iOS)
+
+extension AVMetadataMachineReadableCodeObject {
+  @available(swift, obsoleted: 4.0)
+  @available(iOS, introduced: 7.0)
+  @nonobjc
+  public var corners: [Any]! {
+    return __corners
+  }
+
+  @available(swift, introduced: 4.0)
+  @available(iOS, introduced: 7.0)
+  @nonobjc
+  public var corners: [CGPoint] {
+    return __corners.map { CGPoint(dictionaryRepresentation: $0 as CFDictionary)! }
+  }
+}
+
+#endif
+

stdlib/public/SDK/AVFoundation/CMakeLists.txt

@@ -2,8 +2,12 @@ cmake_minimum_required(VERSION 3.4.3)
 include("../../../../cmake/modules/StandaloneOverlay.cmake")
 
 add_swift_library(swiftAVFoundation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
+  AVCaptureDevice.swift
+  AVCapturePhotoOutput.swift
   AVCaptureSynchronizedDataCollection.swift
+  AVCaptureVideoDataOutput.swift
   AVError.swift
+  AVMetadataObject.swift
   NSValue.swift.gyb
 
   TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR

stdlib/public/SDK/CMakeLists.txt

@@ -10,7 +10,7 @@ endif()
 
 list(APPEND SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS "${STDLIB_SIL_SERIALIZE_WITNESS_TABLES}")
 
-set(all_overlays "Accelerate;AppKit;ARKit;AssetsLibrary;AVFoundation;CallKit;CloudKit;Contacts;CoreAudio;CoreData;CoreFoundation;CoreGraphics;CoreImage;CoreLocation;CoreMedia;CryptoTokenKit;Dispatch;Foundation;GameplayKit;GLKit;HomeKit;IOKit;Intents;MapKit;ModelIO;ObjectiveC;OpenCL;os;Photos;QuartzCore;SafariServices;SceneKit;simd;SpriteKit;UIKit;WatchKit;XCTest;XPC")
+set(all_overlays "Accelerate;AppKit;ARKit;AssetsLibrary;AVFoundation;CallKit;CloudKit;Contacts;CoreAudio;CoreData;CoreFoundation;CoreGraphics;CoreImage;CoreLocation;CoreMedia;CryptoTokenKit;Dispatch;Foundation;GameplayKit;GLKit;HomeKit;IOKit;Intents;MapKit;MediaPlayer;ModelIO;ObjectiveC;OpenCL;os;Photos;QuartzCore;SafariServices;SceneKit;simd;SpriteKit;UIKit;WatchKit;XCTest;XPC")
 
 if(DEFINED SWIFT_OVERLAY_TARGETS)
   set(overlays_to_build ${SWIFT_OVERLAY_TARGETS})

stdlib/public/SDK/Intents/CMakeLists.txt

@@ -8,6 +8,7 @@ add_swift_library(swiftIntents ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_O
   INGetCarLockStatusIntentResponse.swift
   INGetCarPowerLevelStatusIntentResponse.swift
   INIntegerResolutionResult.swift
+  INNotebookItemTypeResolutionResult.swift
   INParameter.swift
   INRequestRideIntent.swift
   INRideOption.swift

stdlib/public/SDK/Intents/INNotebookItemTypeResolutionResult.swift

@@ -0,0 +1,26 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 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
+//
+//===----------------------------------------------------------------------===//
+
+@_exported import Intents
+import Foundation
+
+#if os(iOS) || os(watchOS)
+@available(iOS 11.0, watchOS 4.0, *)
+extension INNotebookItemTypeResolutionResult {
+    @nonobjc public
+    static func disambiguation(with valuesToDisambiguate: [INNotebookItemType]) -> Self {
+        let numbers = valuesToDisambiguate.map { NSNumber(value: $0.rawValue) }
+        return __disambiguationWithValues(toDisambiguate: numbers)
+    }
+}
+#endif
+

stdlib/public/SDK/MediaPlayer/CMakeLists.txt

@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.4.3)
+include("../../../../cmake/modules/StandaloneOverlay.cmake")
+
+add_swift_library(swiftMediaPlayer ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
+  MPMusicPlayerPlayParameters.swift
+
+  SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
+  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
+  TARGET_SDKS IOS IOS_SIMULATOR
+
+  SWIFT_MODULE_DEPENDS_IOS Darwin AVFoundation CoreAudio CoreFoundation CoreGraphics CoreImage CoreMedia Dispatch Foundation ObjectiveC QuartzCore simd UIKit os CoreData # auto-updated
+  FRAMEWORK_DEPENDS_WEAK MediaPlayer
+
+  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_MEDIAPLAYER_IOS}
+)