Updates for Xcode 8 beta 5

Author: tomlokhorst

Library/Core/FileResource.swift

@@ -32,7 +32,7 @@ public extension FileResourceType {
    - returns: The full pathname for this resource or nil if the file could not be located.
    */
   func path() -> String? {
-    return bundle.pathForResource(self)
+    return bundle.path(forResource: self)
   }
 
   /**
@@ -41,7 +41,7 @@ public extension FileResourceType {
    - returns: The file URL for this resource or nil if the file could not be located.
    */
   func url() -> URL? {
-    return bundle.urlForResource(self)
+    return bundle.url(forResource: self)
   }
 }
 

Library/Core/StoryboardSegueIdentifierProtocol.swift

@@ -44,10 +44,10 @@ public struct StoryboardSegueIdentifier<Segue, Source, Destination>: StoryboardS
   }
 
   /// Create a new StoryboardSegue based on the identifier and source view controller
-  public func storyboardSegue(withSource sourceViewController: Source)
+  public func storyboardSegue(withSource source: Source)
     -> StoryboardSegue<Segue, Source, Destination>
   {
-    return StoryboardSegue(identifier: self, sourceViewController: sourceViewController)
+    return StoryboardSegue(identifier: self, source: source)
   }
 }
 
@@ -63,7 +63,7 @@ public struct TypedStoryboardSegueInfo<Segue, Source, Destination>: StoryboardSe
   public typealias DestinationType = Destination
 
   /// Segue destination view controller
-  public let destinationViewController: Destination
+  public let destination: Destination
 
   /// Segue identifier
   public let identifier: String
@@ -72,7 +72,7 @@ public struct TypedStoryboardSegueInfo<Segue, Source, Destination>: StoryboardSe
   public let segue: Segue
 
   /// Segue source view controller
-  public let sourceViewController: Source
+  public let source: Source
 }
 
 /// Segue with identifier and source view controller
@@ -81,15 +81,15 @@ public struct StoryboardSegue<Segue, Source, Destination> {
   public let identifier: StoryboardSegueIdentifier<Segue, Source, Destination>
 
   /// Segue source view controller
-  public let sourceViewController: Source
+  public let source: Source
 
   /**
    Create a new segue based on the identifier and source view controller
 
    - returns: A new StoryboardSegue
    */
-  public init(identifier: StoryboardSegueIdentifier<Segue, Source, Destination>, sourceViewController: Source) {
+  public init(identifier: StoryboardSegueIdentifier<Segue, Source, Destination>, source: Source) {
     self.identifier = identifier
-    self.sourceViewController = sourceViewController
+    self.source = source
   }
 }

Library/Core/Validatable.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 /// Error thrown during validation
-public struct ValidationError: ErrorProtocol, CustomStringConvertible {
+public struct ValidationError: Error, CustomStringConvertible {
   /// Human readable description
   public let description: String
 

Library/Foundation/Bundle+FileResource.swift

@@ -16,8 +16,8 @@ public extension Bundle {
 
    - returns: The file URL for the resource file (R.file.*) or nil if the file could not be located.
    */
-  public func urlForResource(_ resource: FileResourceType) -> URL? {
-    return urlForResource(resource.name, withExtension: resource.pathExtension)
+  public func url(forResource resource: FileResourceType) -> URL? {
+    return url(forResource: resource.name, withExtension: resource.pathExtension)
   }
 
   /**
@@ -27,7 +27,7 @@ public extension Bundle {
 
    - returns: The full pathname for the resource file (R.file.*) or nil if the file could not be located.
    */
-  public func pathForResource(_ resource: FileResourceType) -> String? {
-    return pathForResource(resource.name, ofType: resource.pathExtension)
+  public func path(forResource resource: FileResourceType) -> String? {
+    return path(forResource: resource.name, ofType: resource.pathExtension)
   }
 }

Library/UIKit/TypedStoryboardSegueInfo+UIStoryboardSegue.swift

@@ -18,16 +18,16 @@ extension TypedStoryboardSegueInfo {
   public init?<SegueIdentifier: StoryboardSegueIdentifierType where SegueIdentifier.SegueType == Segue, SegueIdentifier.SourceType == Source, SegueIdentifier.DestinationType == Destination>(segueIdentifier: SegueIdentifier, segue: UIStoryboardSegue)
   {
     guard let identifier = segue.identifier,
-      let sourceViewController = segue.sourceViewController as? SegueIdentifier.SourceType,
-      let destinationViewController = segue.destinationViewController as? SegueIdentifier.DestinationType,
+      let source = segue.source as? SegueIdentifier.SourceType,
+      let destination = segue.destination as? SegueIdentifier.DestinationType,
       let segue = segue as? SegueIdentifier.SegueType, identifier == segueIdentifier.identifier
     else {
       return nil
     }
 
     self.segue = segue
     self.identifier = identifier
-    self.sourceViewController = sourceViewController
-    self.destinationViewController = destinationViewController
+    self.source = source
+    self.destination = destination
   }
 }

Library/UIKit/UIViewController+StoryboardSegueIdentifierProtocol.swift

@@ -35,6 +35,6 @@ public extension StoryboardSegue where Source : UIViewController {
    - 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) {
-    sourceViewController.performSegue(withIdentifier: identifier.identifier, sender: sender)
+    source.performSegue(withIdentifier: identifier.identifier, sender: sender)
   }
 }