Merge pull request #31 from macoscope/xcode-7.3

update to Xcode 7.3

Author: narfdotpl

Cartfile.private

@@ -1,2 +1,2 @@
-github "Quick/Nimble" == 3.0.0
-github "Quick/Quick" == 0.8.0
+github "Quick/Nimble" "master"
+github "Quick/Quick" "master"

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "Quick/Nimble" "v3.0.0"
-github "Quick/Quick" "v0.8.0"
+github "Quick/Nimble" "0877214872b31ac393be4d8a4563b7c87b2e91e9"
+github "Quick/Quick" "d30f9e93402b6fcc7013c86afeb77da4c38e9f27"

HISTORY.md

@@ -1,6 +1,6 @@
 ## [0.3.0][] • work in progress
 
-- Updated to Swift 2.1 (Xcode 7.1).
+- Updated to Swift 2.2 (Xcode 7.3).
 
 - Made references to class-based subjects weak.  This helps to remove
   subject-machine reference cycles, but it also means you have to keep a

README.md

@@ -12,7 +12,7 @@ for clarity and maintainability.  Can create diagrams:
 ![example digraph](example-digraph.png)
 
 - Version 0.3.0-work-in-progress (following [Semantic Versioning][])
-- Developed and tested under Swift 2.1 (Xcode 7.1)
+- Developed and tested under Swift 2.2 (Xcode 7.3)
 - Published under the [MIT License](LICENSE)
 - [Carthage][] compatible
 - [CocoaPods][] compatible

StateMachine/GraphableStateMachineSchema.swift

@@ -84,7 +84,7 @@ public struct GraphableStateMachineSchema<A: DOTLabelable, B: DOTLabelable, C>:
     ///
     ///   [DOT]: http://en.wikipedia.org/wiki/DOT_%28graph_description_language%29
     ///   [Graphviz]: http://www.graphviz.org/
-    public func saveDOTDigraphIfRunningInSimulator(filepathRelativeToCurrentFile filepathRelativeToCurrentFile: String, file: String = __FILE__) throws {
+    public func saveDOTDigraphIfRunningInSimulator(filepathRelativeToCurrentFile filepathRelativeToCurrentFile: String, file: String = #file) throws {
         if TARGET_IPHONE_SIMULATOR == 1 {
             let filepath = ((file as NSString).stringByDeletingLastPathComponent as NSString).stringByAppendingPathComponent(filepathRelativeToCurrentFile)
             try DOTDigraph.writeToFile(filepath, atomically: true, encoding: NSUTF8StringEncoding)

StateMachine/StateMachine.swift

@@ -19,9 +19,9 @@
 /// transition.  The transition block is optional and it gets passed
 /// the `Subject` object as an argument.
 public protocol StateMachineSchemaType {
-    typealias State
-    typealias Event
-    typealias Subject
+    associatedtype State
+    associatedtype Event
+    associatedtype Subject
 
     var initialState: State { get }
     var transitionLogic: (State, Event) -> (State, (Subject -> ())?)? { get }