Updates for Xcode 8 beta 6

Author: tomlokhorst

Diff for: Library/Core/Validatable.swift

@@ -35,11 +35,11 @@ extension Validatable {
     assert( theRealAssert() )
   }
 
-  private static func theRealAssert() -> Bool {
+  fileprivate static func theRealAssert() -> Bool {
     do {
       try validate()
     } catch {
-      assertionFailure("Validation of \(self.dynamicType) failed with error: \(error)")
+      assertionFailure("Validation of \(type(of: self)) failed with error: \(error)")
     }
 
     return true

Diff for: Library/UIKit/NibResource+UIKit.swift

@@ -18,7 +18,7 @@ public extension NibResourceType {
 
    - returns: An array containing the top-level objects from the NIB
    */
-  public func instantiate(withOwner ownerOrNil: AnyObject?, options optionsOrNil: [NSObject : AnyObject]? = [:]) -> [AnyObject] {
+  public func instantiate(withOwner ownerOrNil: Any?, options optionsOrNil: [AnyHashable : Any]? = [:]) -> [Any] {
     return UINib(resource: self).instantiate(withOwner: ownerOrNil, options: optionsOrNil)
   }
 }

Diff for: Library/UIKit/TypedStoryboardSegueInfo+UIStoryboardSegue.swift

@@ -15,7 +15,8 @@ extension TypedStoryboardSegueInfo {
 
    - returns: A newly initialized TypedStoryboardSegueInfo object or nil.
   */
-  public init?<SegueIdentifier: StoryboardSegueIdentifierType where SegueIdentifier.SegueType == Segue, SegueIdentifier.SourceType == Source, SegueIdentifier.DestinationType == Destination>(segueIdentifier: SegueIdentifier, segue: UIStoryboardSegue)
+  public init?<SegueIdentifier: StoryboardSegueIdentifierType>(segueIdentifier: SegueIdentifier, segue: UIStoryboardSegue)
+    where SegueIdentifier.SegueType == Segue, SegueIdentifier.SourceType == Source, SegueIdentifier.DestinationType == Destination
   {
     guard let identifier = segue.identifier,
       let source = segue.source as? SegueIdentifier.SourceType,

Diff for: Library/UIKit/UICollectionView+ReuseIdentifierProtocol.swift

@@ -18,7 +18,9 @@ public extension UICollectionView {
 
    - returns: A subclass of UICollectionReusableView or nil if the cast fails.
   */
-  public func dequeueReusableCell<Identifier: ReuseIdentifierType where Identifier.ReusableType: UICollectionReusableView>(withReuseIdentifier identifier: Identifier, for indexPath: IndexPath) -> Identifier.ReusableType? {
+  public func dequeueReusableCell<Identifier: ReuseIdentifierType>(withReuseIdentifier identifier: Identifier, for indexPath: IndexPath) -> Identifier.ReusableType?
+    where Identifier.ReusableType: UICollectionReusableView
+  {
     return dequeueReusableCell(withReuseIdentifier: identifier.identifier, for: indexPath) as? Identifier.ReusableType
   }
 
@@ -31,7 +33,9 @@ public extension UICollectionView {
 
    - returns: A subclass of UICollectionReusableView or nil if the cast fails.
   */
-  public func dequeueReusableSupplementaryView<Identifier: ReuseIdentifierType where Identifier.ReusableType: UICollectionReusableView>(ofKind elementKind: String, withReuseIdentifier identifier: Identifier, for indexPath: IndexPath) -> Identifier.ReusableType? {
+  public func dequeueReusableSupplementaryView<Identifier: ReuseIdentifierType>(ofKind elementKind: String, withReuseIdentifier identifier: Identifier, for indexPath: IndexPath) -> Identifier.ReusableType?
+    where Identifier.ReusableType: UICollectionReusableView
+  {
     return dequeueReusableSupplementaryView(ofKind: elementKind, withReuseIdentifier: identifier.identifier, for: indexPath) as? Identifier.ReusableType
   }
 
@@ -40,7 +44,9 @@ public extension UICollectionView {
 
    - parameter nibResources: An array of nib resources (R.nib.*) each containing a object of type UICollectionViewCell that has a reuse identifier
    */
-  public func register<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionViewCell>(_ nibResources: [Resource]) {
+  public func register<Resource: NibResourceType>(_ nibResources: [Resource])
+    where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionViewCell
+  {
     nibResources.forEach(register)
   }
 
@@ -49,7 +55,9 @@ public extension UICollectionView {
 
    - parameter nibResource: A nib resource (R.nib.*) containing a object of type UICollectionViewCell that has a reuse identifier
    */
-  public func register<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionViewCell>(_ nibResource: Resource) {
+  public func register<Resource: NibResourceType>(_ nibResource: Resource)
+    where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionViewCell
+  {
     register(UINib(resource: nibResource), forCellWithReuseIdentifier: nibResource.identifier)
   }
 
@@ -58,7 +66,9 @@ public extension UICollectionView {
 
    - parameter nibResources: An array of nib resources (R.nib.*) each containing a object of type UICollectionReusableView. that has a reuse identifier
    */
-  public func register<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionReusableView>(_ nibResources: [Resource], forSupplementaryViewOfKind kind: String) {
+  public func register<Resource: NibResourceType>(_ nibResources: [Resource], forSupplementaryViewOfKind kind: String)
+    where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionReusableView
+  {
     nibResources.forEach { self.register($0, forSupplementaryViewOfKind: kind) }
   }
 
@@ -67,7 +77,9 @@ public extension UICollectionView {
 
    - parameter nibResource: A nib resource (R.nib.*) containing a object of type UICollectionReusableView. that has a reuse identifier
    */
-  public func register<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionReusableView>(_ nibResource: Resource, forSupplementaryViewOfKind kind: String) {
+  public func register<Resource: NibResourceType>(_ nibResource: Resource, forSupplementaryViewOfKind kind: String)
+    where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionReusableView
+  {
     register(UINib(resource: nibResource), forSupplementaryViewOfKind: kind, withReuseIdentifier: nibResource.identifier)
   }
 }

Diff for: Library/UIKit/UITableView+ReuseIdentifierProtocol.swift

@@ -20,7 +20,9 @@ public extension UITableView {
 
    - precondition: You must register a class or nib file using the registerNib: or registerClass:forCellReuseIdentifier: method before calling this method.
   */
-  public func dequeueReusableCell<Identifier: ReuseIdentifierType where Identifier.ReusableType: UITableViewCell>(withIdentifier identifier: Identifier, for indexPath: IndexPath) -> Identifier.ReusableType? {
+  public func dequeueReusableCell<Identifier: ReuseIdentifierType>(withIdentifier identifier: Identifier, for indexPath: IndexPath) -> Identifier.ReusableType?
+    where Identifier.ReusableType: UITableViewCell
+  {
     return dequeueReusableCell(withIdentifier: identifier.identifier, for: indexPath) as? Identifier.ReusableType
   }
 
@@ -33,7 +35,9 @@ public extension UITableView {
 
    - precondition: You must register a class or nib file using the registerNib: or registerClass:forCellReuseIdentifier: method before calling this method.
    */
-  public func dequeueReusableCell<Identifier: ReuseIdentifierType where Identifier.ReusableType: UITableViewCell>(withIdentifier identifier: Identifier) -> Identifier.ReusableType? {
+  public func dequeueReusableCell<Identifier: ReuseIdentifierType>(withIdentifier identifier: Identifier) -> Identifier.ReusableType?
+    where Identifier.ReusableType: UITableViewCell
+  {
     return dequeueReusableCell(withIdentifier: identifier.identifier) as? Identifier.ReusableType
   }
 
@@ -44,7 +48,9 @@ public extension UITableView {
 
    - returns: A UITableViewHeaderFooterView object with the associated identifier or nil if no such object exists in the reusable view queue or if it couldn't be cast correctly.
    */
-  public func dequeueReusableHeaderFooterView<Identifier: ReuseIdentifierType where Identifier.ReusableType: UITableViewHeaderFooterView>(withIdentifier identifier: Identifier) -> Identifier.ReusableType? {
+  public func dequeueReusableHeaderFooterView<Identifier: ReuseIdentifierType>(withIdentifier identifier: Identifier) -> Identifier.ReusableType?
+    where Identifier.ReusableType: UITableViewHeaderFooterView
+  {
     return dequeueReusableHeaderFooterView(withIdentifier: identifier.identifier) as? Identifier.ReusableType
   }
 
@@ -53,7 +59,7 @@ public extension UITableView {
 
    - parameter nibResources: Array of nib resources (R.nib.*) each containing a table view cell that has a reuse identifier
    */
-  public func register<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UITableViewCell>(_ nibResources: [Resource]) {
+  public func register<Resource: NibResourceType>(_ nibResources: [Resource]) where Resource: ReuseIdentifierType, Resource.ReusableType: UITableViewCell {
     nibResources.forEach(register)
   }
 
@@ -62,7 +68,7 @@ public extension UITableView {
 
    - parameter nibResource: A nib resource (R.nib.*) containing a table view cell that has a reuse identifier
   */
-  public func register<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UITableViewCell>(_ nibResource: Resource) {
+  public func register<Resource: NibResourceType>(_ nibResource: Resource) where Resource: ReuseIdentifierType, Resource.ReusableType: UITableViewCell {
     register(UINib(resource: nibResource), forCellReuseIdentifier: nibResource.identifier)
   }
 
@@ -71,7 +77,7 @@ public extension UITableView {
 
    - parameter nibResource: A nib resource (R.nib.*) containing a view that has a reuse identifier
    */
-  public func registerHeaderFooterView<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UIView>(_ nibResource: Resource) {
+  public func registerHeaderFooterView<Resource: NibResourceType>(_ nibResource: Resource) where Resource: ReuseIdentifierType, Resource.ReusableType: UIView {
     register(UINib(resource: nibResource), forHeaderFooterViewReuseIdentifier: nibResource.identifier)
   }
 }

Diff for: Library/UIKit/UIViewController+StoryboardSegueIdentifierProtocol.swift

@@ -10,10 +10,10 @@ import Foundation
 import UIKit
 
 public protocol SeguePerformerType {
-  func performSegue(withIdentifier identifier: String, sender: AnyObject?)
+  func performSegue(withIdentifier identifier: String, sender: Any?)
 }
 
-extension UIViewController: SeguePerformerType { }
+extension UIViewController: SeguePerformerType {}
 
 public extension SeguePerformerType {
   /**
@@ -22,9 +22,7 @@ public extension SeguePerformerType {
    - parameter sender: The object that you want to use to initiate the segue. This object is made available for informational purposes during the actual segue.
    - SeeAlso: Library for typed block based segues: [tomlokhorst/SegueManager](https://github.com/tomlokhorst/SegueManager)
    */
-  public func performSegue<Segue, Destination>(
-    withIdentifier identifier: StoryboardSegueIdentifier<Segue, Self, Destination>,
-    sender: AnyObject?) {
+  public func performSegue<Segue, Destination>(withIdentifier identifier: StoryboardSegueIdentifier<Segue, Self, Destination>, sender: Any?) {
     performSegue(withIdentifier: identifier.identifier, sender: sender)
   }
 }
@@ -34,7 +32,7 @@ public extension StoryboardSegue where Source : UIViewController {
    Performs this segue on the source view controller
    - parameter sender: The object that you want to use to initiate the segue. This object is made available for informational purposes during the actual segue.
    */
-  public func performSegue(sender: AnyObject? = nil) {
+  public func performSegue(sender: Any? = nil) {
     source.performSegue(withIdentifier: identifier.identifier, sender: sender)
   }
 }