From d29951db4b6f9c4a1596a1c489149aca2ca8d120 Mon Sep 17 00:00:00 2001
From: Tom Lokhorst <tom@lokhorst.eu>
Date: Tue, 22 Mar 2016 08:52:45 +0100
Subject: [PATCH] Update to Swift 2.2
---
Library/Core/ReuseIdentifierProtocol.swift | 2 +-
Library/Core/StoryboardResource.swift | 2 +-
Library/Core/StoryboardSegueIdentifierProtocol.swift | 6 +++---
Library/Core/StoryboardViewControllerResource.swift | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Library/Core/ReuseIdentifierProtocol.swift b/Library/Core/ReuseIdentifierProtocol.swift
index f86a1cc..e32db59 100644
--- 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
index 4d897a3..ae96351 100644
--- 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
index df48c6e..0d026b0 100644
--- 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
index 2b1a42f..3cb45ef 100644
--- 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 {