Run Swift 3 conversion

tomlokhorst · tomlokhorst · commit fe1785e0a89e · 2016-08-05T12:50:11.000+02:00
diff --git a/Library/Core/FileResource.swift b/Library/Core/FileResource.swift
@@ -11,7 +11,7 @@ import Foundation
 public protocol FileResourceType {
 
   /// Bundle this file is in
-  var bundle: NSBundle { get }
+  var bundle: Bundle { get }
 
   /// Name of the file file on disk
   var name: String { get }
@@ -23,7 +23,7 @@ public protocol FileResourceType {
 public extension FileResourceType {
   /// Name of the file on disk with the pathExtension
   var fullName: String {
-    return [name, pathExtension].joinWithSeparator(".")
+    return [name, pathExtension].joined(separator: ".")
   }
 
   /**
@@ -40,22 +40,22 @@ public extension FileResourceType {
 
    - returns: The file URL for this resource or nil if the file could not be located.
    */
-  func url() -> NSURL? {
+  func url() -> URL? {
     return bundle.URLForResource(self)
   }
 }
 
 public struct FileResource: FileResourceType {
   /// Bundle this file is in
-  public let bundle: NSBundle
+  public let bundle: Bundle
 
   /// Name of the file on disk, without the pathExtension
   public let name: String
 
   /// Extension of the file on disk
   public let pathExtension: String
 
-  public init(bundle: NSBundle, name: String, pathExtension: String) {
+  public init(bundle: Bundle, name: String, pathExtension: String) {
     self.bundle = bundle
     self.name = name
     self.pathExtension = pathExtension
diff --git a/Library/Core/ImageResource.swift b/Library/Core/ImageResource.swift
@@ -11,7 +11,7 @@ import Foundation
 public protocol ImageResourceType {
 
   /// Bundle this image is in
-  var bundle: NSBundle { get }
+  var bundle: Bundle { get }
 
   /// Name of the image
   var name: String { get }
@@ -20,12 +20,12 @@ public protocol ImageResourceType {
 public struct ImageResource: ImageResourceType {
 
   /// Bundle this image is in
-  public let bundle: NSBundle
+  public let bundle: Bundle
 
   /// Name of the image
   public let name: String
 
-  public init(bundle: NSBundle, name: String) {
+  public init(bundle: Bundle, name: String) {
     self.bundle = bundle
     self.name = name
   }
diff --git a/Library/Core/NibResource.swift b/Library/Core/NibResource.swift
@@ -12,7 +12,7 @@ import Foundation
 public protocol NibResourceType {
 
   /// Bundle this nib is in or nil for main bundle
-  var bundle: NSBundle { get }
+  var bundle: Bundle { get }
 
   /// Name of the nib file on disk
   var name: String { get }
diff --git a/Library/Core/StoryboardResource.swift b/Library/Core/StoryboardResource.swift
@@ -11,7 +11,7 @@ import Foundation
 public protocol StoryboardResourceType {
 
   /// Bundle this storyboard is in
-  var bundle: NSBundle { get }
+  var bundle: Bundle { get }
 
   /// Name of the storyboard file on disk
   var name: String { get }
diff --git a/Library/Core/StoryboardSegueIdentifierProtocol.swift b/Library/Core/StoryboardSegueIdentifierProtocol.swift
@@ -44,7 +44,7 @@ public struct StoryboardSegueIdentifier<Segue, Source, Destination>: StoryboardS
   }
 
   /// Create a new StoryboardSegue based on the identifier and source view controller
-  public func storyboardSegueWithSource(sourceViewController: Source)
+  public func storyboardSegueWithSource(_ sourceViewController: Source)
     -> StoryboardSegue<Segue, Source, Destination>
   {
     return StoryboardSegue(identifier: self, sourceViewController: sourceViewController)
diff --git a/Library/Core/Validatable.swift b/Library/Core/Validatable.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 /// Error thrown during validation
-public struct ValidationError: ErrorType, CustomStringConvertible {
+public struct ValidationError: ErrorProtocol, CustomStringConvertible {
   /// Human readable description
   public let description: String
 
diff --git a/Library/Foundation/Bundle+FileResource.swift b/Library/Foundation/Bundle+FileResource.swift
@@ -1,5 +1,5 @@
 //
-//  NSBundle+FileResource.swift
+//  Bundle+FileResource.swift
 //  R.swift.Library
 //
 //  Created by Mathijs Kadijk on 10-01-16.
@@ -8,16 +8,16 @@
 
 import Foundation
 
-public extension NSBundle {
+public extension Bundle {
   /**
    Returns the file URL for the given resource (R.file.*).
 
    - parameter resource: The resource to get the file URL for (R.file.*).
 
    - returns: The file URL for the resource file (R.file.*) or nil if the file could not be located.
    */
-  public func URLForResource(resource: FileResourceType) -> NSURL? {
-    return URLForResource(resource.name, withExtension: resource.pathExtension)
+  public func URLForResource(_ resource: FileResourceType) -> URL? {
+    return urlForResource(resource.name, withExtension: resource.pathExtension)
   }
 
   /**
@@ -27,7 +27,7 @@ public extension NSBundle {
 
    - 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? {
+  public func pathForResource(_ resource: FileResourceType) -> String? {
     return pathForResource(resource.name, ofType: resource.pathExtension)
   }
 }
diff --git a/Library/Foundation/Data+FileResource.swift b/Library/Foundation/Data+FileResource.swift
@@ -1,5 +1,5 @@
 //
-//  NSData+FileResource.swift
+//  Data+FileResource.swift
 //  R.swift.Library
 //
 //  Created by Tom Lokhorst on 2016-03-11.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public extension NSData {
+public extension Data {
 
   /**
    Creates and returns NSData with the contents of the specified file resource (R.file.*).
@@ -17,8 +17,8 @@ public extension NSData {
 
    - returns: A NSData object with the contents of the specified file.
    */
-  public convenience init?(resource: FileResourceType) {
+  public init?(resource: FileResourceType) throws {
     guard let url = resource.url() else { return nil }
-    self.init(contentsOfURL: url)
+    try self.init(contentsOf: url)
   }
 }
diff --git a/Library/UIKit/NibResource+UIKit.swift b/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 instantiateWithOwner(ownerOrNil: AnyObject?, options optionsOrNil: [NSObject : AnyObject]? = nil) -> [AnyObject] {
-    return UINib(resource: self).instantiateWithOwner(ownerOrNil, options: optionsOrNil)
+  public func instantiateWithOwner(_ ownerOrNil: AnyObject?, options optionsOrNil: [NSObject : AnyObject]? = nil) -> [AnyObject] {
+    return UINib(resource: self).instantiate(withOwner: ownerOrNil, options: optionsOrNil)
   }
 }
diff --git a/Library/UIKit/TypedStoryboardSegueInfo+UIStoryboardSegue.swift b/Library/UIKit/TypedStoryboardSegueInfo+UIStoryboardSegue.swift
@@ -17,12 +17,11 @@ 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,
-      sourceViewController = segue.sourceViewController as? SegueIdentifier.SourceType,
-      destinationViewController = segue.destinationViewController as? SegueIdentifier.DestinationType,
-      segue = segue as? SegueIdentifier.SegueType
-      where identifier == segueIdentifier.identifier
-      else {
-        return nil
+      let sourceViewController = segue.sourceViewController as? SegueIdentifier.SourceType,
+      let destinationViewController = segue.destinationViewController as? SegueIdentifier.DestinationType,
+      let segue = segue as? SegueIdentifier.SegueType, identifier == segueIdentifier.identifier
+    else {
+      return nil
     }
 
     self.segue = segue
diff --git a/Library/UIKit/UICollectionView+ReuseIdentifierProtocol.swift b/Library/UIKit/UICollectionView+ReuseIdentifierProtocol.swift
@@ -18,8 +18,8 @@ public extension UICollectionView {
    
    - returns: A subclass of UICollectionReusableView or nil if the cast fails.
   */
-  public func dequeueReusableCellWithReuseIdentifier<Identifier: ReuseIdentifierType where Identifier.ReusableType: UICollectionReusableView>(identifier: Identifier, forIndexPath indexPath: NSIndexPath) -> Identifier.ReusableType? {
-    return dequeueReusableCellWithReuseIdentifier(identifier.identifier, forIndexPath: indexPath) as? Identifier.ReusableType
+  public func dequeueReusableCellWithReuseIdentifier<Identifier: ReuseIdentifierType where Identifier.ReusableType: UICollectionReusableView>(_ identifier: Identifier, forIndexPath indexPath: IndexPath) -> Identifier.ReusableType? {
+    return dequeueReusableCell(withReuseIdentifier: identifier.identifier, for: indexPath) as? Identifier.ReusableType
   }
 
   /**
@@ -31,16 +31,16 @@ public extension UICollectionView {
    
    - returns: A subclass of UICollectionReusableView or nil if the cast fails.
   */
-  public func dequeueReusableSupplementaryViewOfKind<Identifier: ReuseIdentifierType where Identifier.ReusableType: UICollectionReusableView>(elementKind: String, withReuseIdentifier identifier: Identifier, forIndexPath indexPath: NSIndexPath) -> Identifier.ReusableType? {
-    return dequeueReusableSupplementaryViewOfKind(elementKind, withReuseIdentifier: identifier.identifier, forIndexPath: indexPath) as? Identifier.ReusableType
+  public func dequeueReusableSupplementaryViewOfKind<Identifier: ReuseIdentifierType where Identifier.ReusableType: UICollectionReusableView>(_ elementKind: String, withReuseIdentifier identifier: Identifier, forIndexPath indexPath: IndexPath) -> Identifier.ReusableType? {
+    return dequeueReusableSupplementaryView(ofKind: elementKind, withReuseIdentifier: identifier.identifier, for: indexPath) as? Identifier.ReusableType
   }
 
   /**
    Register a serie of R.nib.* for use in creating new collection view cells.
 
    - parameter nibResources: An array of nib resources (R.nib.*) each containing a object of type UICollectionViewCell that has a reuse identifier
    */
-  public func registerNibs<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionViewCell>(nibResources: [Resource]) {
+  public func registerNibs<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionViewCell>(_ nibResources: [Resource]) {
     nibResources.forEach(registerNib)
   }
 
@@ -49,16 +49,16 @@ public extension UICollectionView {
 
    - parameter nibResource: A nib resource (R.nib.*) containing a object of type UICollectionViewCell that has a reuse identifier
    */
-  public func registerNib<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionViewCell>(nibResource: Resource) {
-    registerNib(UINib(resource: nibResource), forCellWithReuseIdentifier: nibResource.identifier)
+  public func registerNib<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionViewCell>(_ nibResource: Resource) {
+    register(UINib(resource: nibResource), forCellWithReuseIdentifier: nibResource.identifier)
   }
 
   /**
    Register a serie of R.nib.* for use in creating supplementary views for the collection view.
 
    - parameter nibResources: An array of nib resources (R.nib.*) each containing a object of type UICollectionReusableView. that has a reuse identifier
    */
-  public func registerNibs<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionReusableView>(nibResources: [Resource], forSupplementaryViewOfKind kind: String) {
+  public func registerNibs<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionReusableView>(_ nibResources: [Resource], forSupplementaryViewOfKind kind: String) {
     nibResources.forEach { self.registerNib($0, forSupplementaryViewOfKind: kind) }
   }
 
@@ -67,7 +67,7 @@ public extension UICollectionView {
 
    - parameter nibResource: A nib resource (R.nib.*) containing a object of type UICollectionReusableView. that has a reuse identifier
    */
-  public func registerNib<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionReusableView>(nibResource: Resource, forSupplementaryViewOfKind kind: String) {
-    registerNib(UINib(resource: nibResource), forSupplementaryViewOfKind: kind, withReuseIdentifier: nibResource.identifier)
+  public func registerNib<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UICollectionReusableView>(_ nibResource: Resource, forSupplementaryViewOfKind kind: String) {
+    register(UINib(resource: nibResource), forSupplementaryViewOfKind: kind, withReuseIdentifier: nibResource.identifier)
   }
 }
diff --git a/Library/UIKit/UIImage+ImageResource.swift b/Library/UIKit/UIImage+ImageResource.swift
@@ -18,6 +18,6 @@ public extension UIImage {
    - returns: An image that exactly or best matches the desired traits with the given resource (R.image.*), or nil if no suitable image was found.
   */
   public convenience init?(resource: ImageResourceType, compatibleWithTraitCollection traitCollection: UITraitCollection? = nil) {
-    self.init(named: resource.name, inBundle: resource.bundle, compatibleWithTraitCollection: traitCollection)
+    self.init(named: resource.name, in: resource.bundle, compatibleWith: traitCollection)
   }
 }
diff --git a/Library/UIKit/UIStoryboard+StoryboardViewControllerResource.swift b/Library/UIKit/UIStoryboard+StoryboardViewControllerResource.swift
@@ -17,7 +17,7 @@ public extension UIStoryboard {
 
    - returns: The view controller corresponding to the specified resource (R.storyboard.*.*). If no view controller is associated, this method throws an exception.
    */
-  public func instantiateViewController<ViewControllerResource: StoryboardViewControllerResourceType>(resource: ViewControllerResource) -> ViewControllerResource.ViewControllerType?  {
-    return instantiateViewControllerWithIdentifier(resource.identifier) as? ViewControllerResource.ViewControllerType
+  public func instantiateViewController<ViewControllerResource: StoryboardViewControllerResourceType>(_ resource: ViewControllerResource) -> ViewControllerResource.ViewControllerType?  {
+    return self.instantiateViewController(withIdentifier: resource.identifier) as? ViewControllerResource.ViewControllerType
   }
 }
diff --git a/Library/UIKit/UITableView+ReuseIdentifierProtocol.swift b/Library/UIKit/UITableView+ReuseIdentifierProtocol.swift
@@ -20,8 +20,8 @@ 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 dequeueReusableCellWithIdentifier<Identifier: ReuseIdentifierType where Identifier.ReusableType: UITableViewCell>(identifier: Identifier, forIndexPath indexPath: NSIndexPath) -> Identifier.ReusableType? {
-    return dequeueReusableCellWithIdentifier(identifier.identifier, forIndexPath: indexPath) as? Identifier.ReusableType
+  public func dequeueReusableCellWithIdentifier<Identifier: ReuseIdentifierType where Identifier.ReusableType: UITableViewCell>(_ identifier: Identifier, forIndexPath indexPath: IndexPath) -> Identifier.ReusableType? {
+    return dequeueReusableCell(withIdentifier: identifier.identifier, for: indexPath) as? Identifier.ReusableType
   }
 
   /**
@@ -33,8 +33,8 @@ 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 dequeueReusableCellWithIdentifier<Identifier: ReuseIdentifierType where Identifier.ReusableType: UITableViewCell>(identifier: Identifier) -> Identifier.ReusableType? {
-    return dequeueReusableCellWithIdentifier(identifier.identifier) as? Identifier.ReusableType
+  public func dequeueReusableCellWithIdentifier<Identifier: ReuseIdentifierType where Identifier.ReusableType: UITableViewCell>(_ identifier: Identifier) -> Identifier.ReusableType? {
+    return dequeueReusableCell(withIdentifier: identifier.identifier) as? Identifier.ReusableType
   }
 
   /**
@@ -44,16 +44,16 @@ 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 dequeueReusableHeaderFooterViewWithIdentifier<Identifier: ReuseIdentifierType where Identifier.ReusableType: UITableViewHeaderFooterView>(identifier: Identifier) -> Identifier.ReusableType? {
-    return dequeueReusableHeaderFooterViewWithIdentifier(identifier.identifier) as? Identifier.ReusableType
+  public func dequeueReusableHeaderFooterViewWithIdentifier<Identifier: ReuseIdentifierType where Identifier.ReusableType: UITableViewHeaderFooterView>(_ identifier: Identifier) -> Identifier.ReusableType? {
+    return dequeueReusableHeaderFooterView(withIdentifier: identifier.identifier) as? Identifier.ReusableType
   }
 
   /**
    Register an array of R.nib.*, each containing a cell, with the table view under it's contained identifier.
 
    - parameter nibResources: Array of nib resources (R.nib.*) each containing a table view cell that has a reuse identifier
    */
-  public func registerNibs<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UITableViewCell>(nibResources: [Resource]) {
+  public func registerNibs<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UITableViewCell>(_ nibResources: [Resource]) {
     nibResources.forEach(registerNib)
   }
 
@@ -62,16 +62,16 @@ public extension UITableView {
    
    - parameter nibResource: A nib resource (R.nib.*) containing a table view cell that has a reuse identifier
   */
-  public func registerNib<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UITableViewCell>(nibResource: Resource) {
-    registerNib(UINib(resource: nibResource), forCellReuseIdentifier: nibResource.identifier)
+  public func registerNib<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UITableViewCell>(_ nibResource: Resource) {
+    register(UINib(resource: nibResource), forCellReuseIdentifier: nibResource.identifier)
   }
 
   /**
    Register a R.nib.* containing a header or footer with the table view under it's contained identifier.
 
    - parameter nibResource: A nib resource (R.nib.*) containing a view that has a reuse identifier
    */
-  public func registerNibForHeaderFooterView<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UIView>(nibResource: Resource) {
-    registerNib(UINib(resource: nibResource), forHeaderFooterViewReuseIdentifier: nibResource.identifier)
+  public func registerNibForHeaderFooterView<Resource: NibResourceType where Resource: ReuseIdentifierType, Resource.ReusableType: UIView>(_ nibResource: Resource) {
+    register(UINib(resource: nibResource), forHeaderFooterViewReuseIdentifier: nibResource.identifier)
   }
 }
diff --git a/Library/UIKit/UIViewController+StoryboardSegueIdentifierProtocol.swift b/Library/UIKit/UIViewController+StoryboardSegueIdentifierProtocol.swift
@@ -10,7 +10,7 @@ import Foundation
 import UIKit
 
 public protocol SeguePerformerType {
-  func performSegueWithIdentifier(identifier: String, sender: AnyObject?)
+  func performSegueWithIdentifier(_ identifier: String, sender: AnyObject?)
 }
 
 extension UIViewController: SeguePerformerType { }
@@ -23,7 +23,7 @@ public extension SeguePerformerType {
    - SeeAlso: Library for typed block based segues: [tomlokhorst/SegueManager](https://github.com/tomlokhorst/SegueManager)
    */
   public func performSegueWithIdentifier<Segue, Destination>(
-    identifier: StoryboardSegueIdentifier<Segue, Self, Destination>,
+    _ identifier: StoryboardSegueIdentifier<Segue, Self, Destination>,
     sender: AnyObject?) {
     performSegueWithIdentifier(identifier.identifier, sender: sender)
   }
@@ -34,7 +34,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) {
-    sourceViewController.performSegueWithIdentifier(identifier.identifier, sender: sender)
+  public func performSegue(_ sender: AnyObject? = nil) {
+    sourceViewController.performSegue(withIdentifier: identifier.identifier, sender: sender)
   }
 }
diff --git a/LibraryTests/RswiftTests.swift b/LibraryTests/RswiftTests.swift
@@ -28,7 +28,7 @@ class RswiftTests: XCTestCase {
     
     func testPerformanceExample() {
         // This is an example of a performance test case.
-        self.measureBlock {
+        self.measure {
             // Put the code you want to measure the time of here.
         }
     }
diff --git a/R.swift.Library.xcodeproj/project.pbxproj b/R.swift.Library.xcodeproj/project.pbxproj

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public struct StoryboardSegueIdentifier<Segue, Source, Destination>: StoryboardS`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/// Create a new StoryboardSegue based on the identifier and source view controller`
`47`		`- public func storyboardSegueWithSource(sourceViewController: Source)`
	`47`	`+ public func storyboardSegueWithSource(_ sourceViewController: Source)`
`48`	`48`	`-> StoryboardSegue<Segue, Source, Destination>`
`49`	`49`	`{`
`50`	`50`	`return StoryboardSegue(identifier: self, sourceViewController: sourceViewController)`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public extension NibResourceType {`
`18`	`18`
`19`	`19`	`- returns: An array containing the top-level objects from the NIB`
`20`	`20`	`*/`
`21`		`- public func instantiateWithOwner(ownerOrNil: AnyObject?, options optionsOrNil: [NSObject : AnyObject]? = nil) -> [AnyObject] {`
`22`		`- return UINib(resource: self).instantiateWithOwner(ownerOrNil, options: optionsOrNil)`
	`21`	`+ public func instantiateWithOwner(_ ownerOrNil: AnyObject?, options optionsOrNil: [NSObject : AnyObject]? = nil) -> [AnyObject] {`
	`22`	`+ return UINib(resource: self).instantiate(withOwner: ownerOrNil, options: optionsOrNil)`
`23`	`23`	`}`
`24`	`24`	`}`