Merge pull request #5 from mac-cain13/feature/swift-2.2

mac-cain13 · mac-cain13 · commit 0c7f8754747a · 2016-03-22T20:36:17.000+01:00
Update to Swift 2.2
diff --git a/Library/Core/ReuseIdentifierProtocol.swift b/Library/Core/ReuseIdentifierProtocol.swift
@@ -11,7 +11,7 @@ import Foundation
 /// Reuse identifier protocol
 public protocol ReuseIdentifierType: IdentifierType {
   /// Type of this reuseable
-  typealias ReusableType
+  associatedtype ReusableType
 }
 
 /// Reuse identifier
diff --git a/Library/Core/StoryboardResource.swift b/Library/Core/StoryboardResource.swift
@@ -20,5 +20,5 @@ public protocol StoryboardResourceType {
 public protocol StoryboardResourceWithInitialControllerType: StoryboardResourceType {
 
   /// Type of the inital controller
-  typealias InitialController
+  associatedtype InitialController
 }
diff --git a/Library/Core/StoryboardSegueIdentifierProtocol.swift b/Library/Core/StoryboardSegueIdentifierProtocol.swift
@@ -11,13 +11,13 @@ import Foundation
 /// Segue identifier protocol
 public protocol StoryboardSegueIdentifierType: IdentifierType {
   /// Type of the segue itself
-  typealias SegueType
+  associatedtype SegueType
 
   /// Type of the source view controller
-  typealias SourceType
+  associatedtype SourceType
 
   /// Type of the destination view controller
-  typealias DestinationType
+  associatedtype DestinationType
 }
 
 /// Segue identifier
diff --git a/Library/Core/StoryboardViewControllerResource.swift b/Library/Core/StoryboardViewControllerResource.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 public protocol StoryboardViewControllerResourceType: IdentifierType {
-  typealias ViewControllerType
+  associatedtype ViewControllerType
 }
 
 public struct StoryboardViewControllerResource<ViewController>: StoryboardViewControllerResourceType {

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import Foundation`
`11`	`11`	`/// Reuse identifier protocol`
`12`	`12`	`public protocol ReuseIdentifierType: IdentifierType {`
`13`	`13`	`/// Type of this reuseable`
`14`		`- typealias ReusableType`
	`14`	`+ associatedtype ReusableType`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`/// Reuse identifier`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@ public protocol StoryboardResourceType {`
`20`	`20`	`public protocol StoryboardResourceWithInitialControllerType: StoryboardResourceType {`
`21`	`21`
`22`	`22`	`/// Type of the inital controller`
`23`		`- typealias InitialController`
	`23`	`+ associatedtype InitialController`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`import Foundation`
`10`	`10`
`11`	`11`	`public protocol StoryboardViewControllerResourceType: IdentifierType {`
`12`		`- typealias ViewControllerType`
	`12`	`+ associatedtype ViewControllerType`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public struct StoryboardViewControllerResource<ViewController>: StoryboardViewControllerResourceType {`