Update swift-3.0-preview-2-branch to build with Xcode 8 beta 2, OS X 10.12, iOS 10, tvOS 10, and watchOS 3 SDKs

Author: shahmishal

apinotes/Foundation.apinotes

@@ -15,49 +15,36 @@ Classes:
 - Name: NSCharacterSet
   SwiftName: NSCharacterSet
   SwiftBridge: CharacterSet
+  Properties:
+  - Name: controlCharacterSet
+    SwiftName: controlCharacters
+  - Name: whitespaceCharacterSet
+    SwiftName: whitespaces
+  - Name: whitespaceAndNewlineCharacterSet
+    SwiftName: whitespacesAndNewlines
+  - Name: decimalDigitCharacterSet
+    SwiftName: decimalDigits
+  - Name: letterCharacterSet
+    SwiftName: letters
+  - Name: lowercaseLetterCharacterSet
+    SwiftName: lowercaseLetters
+  - Name: uppercaseLetterCharacterSet
+    SwiftName: uppercaseLetters
+  - Name: nonBaseCharacterSet
+    SwiftName: nonBaseCharacters
+  - Name: alphanumericCharacterSet
+    SwiftName: alphanumerics
+  - Name: decomposableCharacterSet
+    SwiftName: decomposables
+  - Name: illegalCharacterSet
+    SwiftName: illegalCharacters
+  - Name: capitalizedLetterCharacterSet
+    SwiftName: capitalizedLetters
+  - Name: symbolCharacterSet
+    SwiftName: symbols
+  - Name: newlineCharacterSet
+    SwiftName: newlines
   Methods:
-  - Selector: controlCharacterSet
-    SwiftName: controlCharacters()
-    MethodKind: Class
-  - Selector: whitespaceCharacterSet
-    SwiftName: whitespaces()
-    MethodKind: Class
-  - Selector: whitespaceAndNewlineCharacterSet
-    SwiftName: whitespacesAndNewlines()
-    MethodKind: Class
-  - Selector: decimalDigitCharacterSet
-    SwiftName: decimalDigits()
-    MethodKind: Class
-  - Selector: letterCharacterSet
-    SwiftName: letters()
-    MethodKind: Class
-  - Selector: lowercaseLetterCharacterSet
-    SwiftName: lowercaseLetters()
-    MethodKind: Class
-  - Selector: uppercaseLetterCharacterSet
-    SwiftName: uppercaseLetters()
-    MethodKind: Class
-  - Selector: nonBaseCharacterSet
-    SwiftName: nonBaseCharacters()
-    MethodKind: Class
-  - Selector: alphanumericCharacterSet
-    SwiftName: alphanumerics()
-    MethodKind: Class
-  - Selector: decomposableCharacterSet
-    SwiftName: decomposables()
-    MethodKind: Class
-  - Selector: illegalCharacterSet
-    SwiftName: illegalCharacters()
-    MethodKind: Class
-  - Selector: capitalizedLetterCharacterSet
-    SwiftName: capitalizedLetters()
-    MethodKind: Class
-  - Selector: symbolCharacterSet
-    SwiftName: symbols()
-    MethodKind: Class
-  - Selector: newlineCharacterSet
-    SwiftName: newlines()
-    MethodKind: Class
   - Selector: 'hasMemberInPlane:'
     SwiftName: hasMemberInPlane(_:)
     MethodKind: Instance

apinotes/UIKit.apinotes

@@ -287,6 +287,18 @@ Classes:
     SwiftName: sendEvent(_:)
     MethodKind: Instance
 Protocols:
+- Name: UIAppearance
+  Methods:
+  - Selector: 'appearanceWhenContainedInInstancesOfClasses:'
+    SwiftName: 'appearance(whenContainedInInstancesOf:)'
+    MethodKind: Class
+  - Selector: 'appearanceForTraitCollection:'
+    SwiftName: 'appearance(for:)'
+    MethodKind: Class
+  - Selector: 'appearanceForTraitCollection:whenContainedInInstancesOfClasses:'
+    SwiftName: 'appearance(for:whenContainedInInstancesOf:)'
+    MethodKind: Class
+
 - Name: UIBarPositioningDelegate
   Methods:
   - Selector: 'positionForBar:'
@@ -377,6 +389,17 @@ Protocols:
   - Selector: 'tabBarController:interactionControllerForAnimationController:'
     SwiftName: tabBarController(_:interactionControllerFor:)
     MethodKind: Instance
+- Name: UIViewControllerAnimatedTransitioning
+  Methods:
+  - Selector: 'transitionDuration:'
+    SwiftName: 'transitionDuration(using:)'
+    MethodKind: Instance
+  - Selector: 'animateTransition:'
+    SwiftName: 'animateTransition(using:)'
+    MethodKind: Instance
+  - Selector: 'interruptibleAnimatorForTransition:'
+    SwiftName: 'interruptibleAnimator(using:)'
+    MethodKind: Instance
 - Name: UIViewControllerTransitioningDelegate
   Methods:
   - Selector: 'animationControllerForPresentedController:presentingController:sourceController:'
@@ -386,10 +409,10 @@ Protocols:
     SwiftName: 'animationController(forDismissed:)'
     MethodKind: Instance
   - Selector: 'interactionControllerForPresentation:'
-    SwiftName: 'interactionControllerForPresentation(_:)'
+    SwiftName: 'interactionControllerForPresentation(using:)'
     MethodKind: Instance
   - Selector: 'interactionControllerForDismissal:'
-    SwiftName: 'interactionControllerForDismissal(_:)'
+    SwiftName: 'interactionControllerForDismissal(using:)'
     MethodKind: Instance
   - Selector: 'presentationControllerForPresentedViewController:presentingViewController:sourceViewController:'
     SwiftName: 'presentationController(forPresented:presenting:source:)'

lib/ClangImporter/ClangImporter.cpp

@@ -354,7 +354,7 @@ getNormalInvocationArguments(std::vector<std::string> &invocationArgStrs,
       "-D_ISO646_H_", "-D__ISO646_H",
 
       // Request new APIs from Foundation.
-      "-DSWIFT_SDK_OVERLAY_FOUNDATION_EPOCH=7",
+      "-DSWIFT_SDK_OVERLAY_FOUNDATION_EPOCH=8",
 
       // Request new APIs from SceneKit.
       "-DSWIFT_SDK_OVERLAY2_SCENEKIT_EPOCH=2",
@@ -3259,12 +3259,11 @@ bool ClangImporter::Implementation::shouldSuppressDeclImport(
 
     if (objcClass) {
       if (auto objcSuperclass = objcClass->getSuperClass()) {
-        if (auto getterMethod
-              = objcSuperclass->lookupInstanceMethod(
-                  objcProperty->getGetterName())) {
-          if (!shouldSuppressDeclImport(getterMethod))
-            return true;
-        }
+        auto getterMethod =
+            objcSuperclass->lookupMethod(objcProperty->getGetterName(),
+                                         objcProperty->isInstanceProperty());
+        if (getterMethod && !shouldSuppressDeclImport(getterMethod))
+          return true;
       }
     }
 

lib/ClangImporter/ImportDecl.cpp

@@ -5888,7 +5888,8 @@ namespace {
         if (auto var = dyn_cast<VarDecl>(result)) {
           // If the selectors of the getter match in Objective-C, we have an
           // override.
-          if (var->getObjCGetterSelector() ==
+          if (var->isInstanceMember() == decl->isInstanceProperty() &&
+              var->getObjCGetterSelector() ==
                 Impl.importSelector(decl->getGetterName()))
             overridden = var;
         }

stdlib/private/StdlibUnittestFoundationExtras/StdlibUnittestFoundationExtras.swift

@@ -27,7 +27,7 @@ public func withOverriddenLocaleCurrentLocale<Result>(
   _ body: @noescape () -> Result
 ) -> Result {
   let oldMethod = class_getClassMethod(
-    Locale.self, #selector(Locale.current))
+    Locale.self, #selector(getter: Locale.current))
   precondition(oldMethod != nil, "could not find +[Locale currentLocale]")
 
   let newMethod = class_getClassMethod(
@@ -51,7 +51,7 @@ public func withOverriddenLocaleCurrentLocale<Result>(
   _ body: @noescape () -> Result
 ) -> Result {
   precondition(
-    Locale.availableLocaleIdentifiers().contains(temporaryLocaleIdentifier),
+    Locale.availableLocaleIdentifiers.contains(temporaryLocaleIdentifier),
     "requested locale \(temporaryLocaleIdentifier) is not available")
 
   return withOverriddenLocaleCurrentLocale(

stdlib/public/SDK/CoreAudio/CMakeLists.txt

@@ -2,7 +2,7 @@ add_swift_library(swiftCoreAudio IS_SDK_OVERLAY
   CoreAudio.swift
   ../../../public/core/WriteBackMutableSlice.swift
 
-  TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS
+  TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
   SWIFT_MODULE_DEPENDS Dispatch
   SWIFT_MODULE_DEPENDS_OSX IOKit
   # Also depends on: CoreFoundation

stdlib/public/SDK/Foundation/CharacterSet.swift

@@ -139,109 +139,109 @@ public struct CharacterSet : ReferenceConvertible, Equatable, Hashable, SetAlgeb
 
     /// Returns a character set containing the characters in Unicode General Category Cc and Cf.
     public static var controlCharacters : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.controlCharacters() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.controlCharacters as NSCharacterSet)
     }
 
     /// Returns a character set containing the characters in Unicode General Category Zs and `CHARACTER TABULATION (U+0009)`.
     public static var whitespaces : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.whitespaces() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.whitespaces as NSCharacterSet)
     }
 
     /// Returns a character set containing characters in Unicode General Category Z*, `U+000A ~ U+000D`, and `U+0085`.
     public static var whitespacesAndNewlines : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.whitespacesAndNewlines() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.whitespacesAndNewlines as NSCharacterSet)
     }
 
     /// Returns a character set containing the characters in the category of Decimal Numbers.
     public static var decimalDigits : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.decimalDigits() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.decimalDigits as NSCharacterSet)
     }
 
     /// Returns a character set containing the characters in Unicode General Category L* & M*.
     public static var letters : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.letters() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.letters as NSCharacterSet)
     }
 
     /// Returns a character set containing the characters in Unicode General Category Ll.
     public static var lowercaseLetters : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.lowercaseLetters() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.lowercaseLetters as NSCharacterSet)
     }
 
     /// Returns a character set containing the characters in Unicode General Category Lu and Lt.
     public static var uppercaseLetters : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.uppercaseLetters() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.uppercaseLetters as NSCharacterSet)
     }
 
     /// Returns a character set containing the characters in Unicode General Category M*.
     public static var nonBaseCharacters : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.nonBaseCharacters() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.nonBaseCharacters as NSCharacterSet)
     }
 
     /// Returns a character set containing the characters in Unicode General Categories L*, M*, and N*.
     public static var alphanumerics : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.alphanumerics() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.alphanumerics as NSCharacterSet)
     }
 
     /// Returns a character set containing individual Unicode characters that can also be represented as composed character sequences (such as for letters with accents), by the definition of “standard decomposition” in version 3.2 of the Unicode character encoding standard.
     public static var decomposables : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.decomposables() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.decomposables as NSCharacterSet)
     }
 
     /// Returns a character set containing values in the category of Non-Characters or that have not yet been defined in version 3.2 of the Unicode standard.
     public static var illegalCharacters : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.illegalCharacters() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.illegalCharacters as NSCharacterSet)
     }
 
     /// Returns a character set containing the characters in Unicode General Category P*.
     public static var punctuation : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.punctuation() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.punctuation as NSCharacterSet)
     }
 
     /// Returns a character set containing the characters in Unicode General Category Lt.
     public static var capitalizedLetters : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.capitalizedLetters() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.capitalizedLetters as NSCharacterSet)
     }
 
     /// Returns a character set containing the characters in Unicode General Category S*.
     public static var symbols : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.symbols() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.symbols as NSCharacterSet)
     }
 
     /// Returns a character set containing the newline characters (`U+000A ~ U+000D`, `U+0085`, `U+2028`, and `U+2029`).
     public static var newlines : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.newlines() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.newlines as NSCharacterSet)
     }
 
     // MARK: Static functions, from NSURL
 
     /// Returns the character set for characters allowed in a user URL subcomponent.
     public static var urlUserAllowed : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.urlUserAllowed() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.urlUserAllowed as NSCharacterSet)
     }
 
     /// Returns the character set for characters allowed in a password URL subcomponent.
     public static var urlPasswordAllowed : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.urlPasswordAllowed() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.urlPasswordAllowed as NSCharacterSet)
     }
 
     /// Returns the character set for characters allowed in a host URL subcomponent.
     public static var urlHostAllowed : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.urlHostAllowed() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.urlHostAllowed as NSCharacterSet)
     }
 
     /// Returns the character set for characters allowed in a path URL component.
     public static var urlPathAllowed : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.urlPathAllowed() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.urlPathAllowed as NSCharacterSet)
     }
 
     /// Returns the character set for characters allowed in a query URL component.
     public static var urlQueryAllowed : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.urlQueryAllowed() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.urlQueryAllowed as NSCharacterSet)
     }
 
     /// Returns the character set for characters allowed in a fragment URL component.
     public static var urlFragmentAllowed : CharacterSet {
-        return CharacterSet(reference: NSCharacterSet.urlFragmentAllowed() as NSCharacterSet)
+        return CharacterSet(reference: NSCharacterSet.urlFragmentAllowed as NSCharacterSet)
     }
 
     // MARK: Immutable functions

stdlib/public/SDK/Foundation/Foundation.swift

@@ -905,7 +905,7 @@ extension NSRange {
 public
 func NSLocalizedString(_ key: String,
                        tableName: String? = nil,
-                       bundle: Bundle = Bundle.main(),
+                       bundle: Bundle = Bundle.main,
                        value: String = "",
                        comment: String) -> String {
   return bundle.localizedString(forKey: key, value:value, table:tableName)
@@ -1031,7 +1031,7 @@ extension NSString {
     _ format: NSString, _ args: CVarArg...
   ) -> Self {
     return withVaList(args) {
-      self.init(format: format as String, locale: Locale.current(), arguments: $0)
+      self.init(format: format as String, locale: Locale.current, arguments: $0)
     }
   }
 

stdlib/public/SDK/Foundation/NSStringAPI.swift

@@ -143,26 +143,26 @@ extension String {
   //===--- Class Methods --------------------------------------------------===//
   //===--------------------------------------------------------------------===//
 
-  // + (const NSStringEncoding *)availableStringEncodings
+  // @property (class) const NSStringEncoding *availableStringEncodings;
 
   /// Returns an Array of the encodings string objects support
   /// in the application's environment.
-  public static func availableStringEncodings() -> [Encoding] {
+  public static var availableStringEncodings: [Encoding] {
     var result = [Encoding]()
-    var p = NSString.availableStringEncodings()
+    var p = NSString.availableStringEncodings
     while p.pointee != 0 {
       result.append(Encoding(rawValue: p.pointee))
       p += 1
     }
     return result
   }
 
-  // + (NSStringEncoding)defaultCStringEncoding
+  // @property (class) NSStringEncoding defaultCStringEncoding;
 
   /// Returns the C-string encoding assumed for any method accepting
   /// a C string as an argument.
-  public static func defaultCStringEncoding() -> Encoding {
-    return Encoding(rawValue: NSString.defaultCStringEncoding())
+  public static var defaultCStringEncoding: Encoding {
+    return Encoding(rawValue: NSString.defaultCStringEncoding)
   }
 
   // + (NSString *)localizedNameOfStringEncoding:(NSStringEncoding)encoding
@@ -182,7 +182,7 @@ extension String {
   public static func localizedStringWithFormat(
     _ format: String, _ arguments: CVarArg...
   ) -> String {
-    return String(format: format, locale: Locale.current(),
+    return String(format: format, locale: Locale.current,
       arguments: arguments)
   }
 
@@ -1678,10 +1678,10 @@ extension String {
   ///
   ///     self.rangeOf(
   ///       other, options: .CaseInsensitiveSearch,
-  ///       locale: Locale.current()) != nil
+  ///       locale: Locale.current) != nil
   public func localizedCaseInsensitiveContains(_ other: String) -> Bool {
     let r = self.range(
-      of: other, options: .caseInsensitive, locale: Locale.current()
+      of: other, options: .caseInsensitive, locale: Locale.current
     ) != nil
     if #available(OSX 10.10, iOS 8.0, *) {
       _sanityCheck(r == _ns.localizedCaseInsensitiveContains(other))