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

Update to Swift 2.2
mac-cain13 · Mar 22, 2016 · 0c7f875 · 0c7f875
2 parents dbfa02d + d29951d
commit 0c7f875
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
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 {