moved to swift 5

exyte · Mar 26, 2019 · bb3cb69 · bb3cb69
1 parent 5152395
commit bb3cb69
Show file tree

Hide file tree

Showing 25 changed files with 98 additions and 91 deletions.
diff --git a/Dependencies/SWXMLHash/SWXMLHash.swift b/Dependencies/SWXMLHash/SWXMLHash.swift
@@ -548,7 +548,7 @@ public enum XMLIndexer {
     /// All child elements from the currently indexed level
     public var children: [XMLIndexer] {
         var list = [XMLIndexer]()
-        for elem in all.flatMap({ $0.element }) {
+        for elem in all.compactMap({ $0.element }) {
             for elem in elem.xmlChildren {
                 list.append(XMLIndexer(elem))
             }
@@ -817,7 +817,7 @@ public class XMLElement: XMLContent {
     var index: Int
 
     var xmlChildren: [XMLElement] {
-        return children.flatMap { $0 as? XMLElement }
+        return children.compactMap { $0 as? XMLElement }
     }
 
     /**

diff --git a/Macaw.podspec b/Macaw.podspec
@@ -29,7 +29,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = "9.0"
   s.osx.deployment_target = "10.12"
   s.requires_arc = true
-  s.swift_version = "4.2"
+  s.swift_version = "5.0"
 
   s.source_files = [
      'Source/**/*.swift'

diff --git a/Macaw.xcodeproj/project.pbxproj b/Macaw.xcodeproj/project.pbxproj
@@ -1706,7 +1706,7 @@
 			};
 			buildConfigurationList = 57FCD2661D76EA4600CC0FB6 /* Build configuration list for PBXProject "Macaw" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -1996,7 +1996,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if which swiftlint >/dev/null; then\n    swiftlint autocorrect --format\n    swiftlint\nelse\n    echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
+			shellScript = "if which swiftlint >/dev/null; then\n    swiftlint autocorrect --format\n    swiftlint\nelse\n    echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -2331,7 +2331,7 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = macosx;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 			};
 			name = Debug;
@@ -2356,7 +2356,7 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = macosx;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 			};
 			name = Release;
@@ -2503,7 +2503,7 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 			};
 			name = Debug;
@@ -2528,7 +2528,7 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 			};
 			name = Release;
@@ -2550,7 +2550,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				VALID_ARCHS = "x86_64 i386";
 			};
@@ -2573,7 +2573,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				VALID_ARCHS = "x86_64 i386";
 			};

diff --git a/Source/animation/AnimationImpl.swift b/Source/animation/AnimationImpl.swift
@@ -133,8 +133,9 @@ class BasicAnimation: Animation {
 
 // MARK: - Hashable
 extension BasicAnimation: Hashable {
-    public var hashValue: Int {
-        return ID.hashValue
+
+    func hash(into hasher: inout Hasher) {
+        hasher.combine(ID)
     }
 
     public static func == (lhs: BasicAnimation, rhs: BasicAnimation) -> Bool {

diff --git a/Source/animation/types/AnimationSequence.swift b/Source/animation/types/AnimationSequence.swift
@@ -82,7 +82,7 @@ internal class AnimationSequence: BasicAnimation {
 }
 
 public extension Sequence where Iterator.Element: Animation {
-    public func sequence(delay: Double = 0.0) -> Animation {
+    func sequence(delay: Double = 0.0) -> Animation {
 
         var sequence = [BasicAnimation]()
         self.forEach { animation in

diff --git a/Source/animation/types/CombineAnimation.swift b/Source/animation/types/CombineAnimation.swift
@@ -82,7 +82,7 @@ internal class CombineAnimation: BasicAnimation {
 }
 
 public extension Sequence where Iterator.Element: Animation {
-    public func combine(delay: Double = 0.0, node: Node? = .none, toNodes: [Node] = []) -> Animation {
+    func combine(delay: Double = 0.0, node: Node? = .none, toNodes: [Node] = []) -> Animation {
 
         var toCombine = [BasicAnimation]()
         self.forEach { animation in

diff --git a/Source/animation/types/ContentsAnimation.swift b/Source/animation/types/ContentsAnimation.swift
@@ -40,32 +40,32 @@ internal class ContentsAnimation: AnimationImpl<[Node]> {
 
 public extension AnimatableVariable where T: ContentsInterpolation {
 
-    public func animation(_ f: @escaping (Double) -> [Node]) -> Animation {
+    func animation(_ f: @escaping (Double) -> [Node]) -> Animation {
         let group = node! as! Group
         return ContentsAnimation(animatedGroup: group, valueFunc: f, animationDuration: 1.0, delay: 0.0, autostart: false)
     }
 
-    public func animation(_ f: @escaping ((Double) -> [Node]), during: Double = 1.0, delay: Double = 0.0) -> Animation {
+    func animation(_ f: @escaping ((Double) -> [Node]), during: Double = 1.0, delay: Double = 0.0) -> Animation {
         let group = node! as! Group
         return ContentsAnimation(animatedGroup: group, valueFunc: f, animationDuration: during, delay: delay, autostart: false)
     }
 
-    public func animation(during: Double = 1.0, delay: Double = 0.0, _ f: @escaping ((Double) -> [Node])) -> Animation {
+    func animation(during: Double = 1.0, delay: Double = 0.0, _ f: @escaping ((Double) -> [Node])) -> Animation {
         let group = node! as! Group
         return ContentsAnimation(animatedGroup: group, valueFunc: f, animationDuration: during, delay: delay, autostart: false)
     }
 
-    public func animate(_ f: @escaping (Double) -> [Node]) {
+    func animate(_ f: @escaping (Double) -> [Node]) {
         let group = node! as! Group
         _ = ContentsAnimation(animatedGroup: group, valueFunc: f, animationDuration: 1.0, delay: 0.0, autostart: true)
     }
 
-    public func animate(_ f: @escaping ((Double) -> [Node]), during: Double = 1.0, delay: Double = 0.0) {
+    func animate(_ f: @escaping ((Double) -> [Node]), during: Double = 1.0, delay: Double = 0.0) {
         let group = node! as! Group
         _ = ContentsAnimation(animatedGroup: group, valueFunc: f, animationDuration: during, delay: delay, autostart: true)
     }
 
-    public func animate(during: Double = 1.0, delay: Double = 0.0, _ f: @escaping ((Double) -> [Node])) {
+    func animate(during: Double = 1.0, delay: Double = 0.0, _ f: @escaping ((Double) -> [Node])) {
         let group = node! as! Group
         _ = ContentsAnimation(animatedGroup: group, valueFunc: f, animationDuration: during, delay: delay, autostart: true)
     }

diff --git a/Source/animation/types/MorphingAnimation.swift b/Source/animation/types/MorphingAnimation.swift
@@ -38,19 +38,19 @@ class MorphingAnimation: AnimationImpl<Locus> {
 public typealias MorphingAnimationDescription = AnimationDescription<Locus>
 
 public extension AnimatableVariable where T: LocusInterpolation {
-    public func animate(_ desc: MorphingAnimationDescription) {
+    func animate(_ desc: MorphingAnimationDescription) {
         _ = MorphingAnimation(animatedNode: node as! Shape, valueFunc: desc.valueFunc, animationDuration: desc.duration, delay: desc.delay, autostart: true)
     }
 
-    public func animation(_ desc: MorphingAnimationDescription) -> Animation {
+    func animation(_ desc: MorphingAnimationDescription) -> Animation {
         return MorphingAnimation(animatedNode: node as! Shape, valueFunc: desc.valueFunc, animationDuration: desc.duration, delay: desc.delay, autostart: false)
     }
 
-    public func animate(from: Locus? = nil, to: Locus, during: Double = 1.0, delay: Double = 0.0) {
+    func animate(from: Locus? = nil, to: Locus, during: Double = 1.0, delay: Double = 0.0) {
         self.animate(((from ?? (node as! Shape).form) >> to).t(during, delay: delay))
     }
 
-    public func animation(from: Locus? = nil, to: Locus, during: Double = 1.0, delay: Double = 0.0) -> Animation {
+    func animation(from: Locus? = nil, to: Locus, during: Double = 1.0, delay: Double = 0.0) -> Animation {
         if let safeFrom = from {
             return self.animation((safeFrom >> to).t(during, delay: delay))
         }
@@ -67,7 +67,7 @@ public extension AnimatableVariable where T: LocusInterpolation {
         return MorphingAnimation(animatedNode: self.node as! Shape, factory: factory, animationDuration: during, delay: delay)
     }
 
-    public func animation(_ f: @escaping (Double) -> Locus, during: Double, delay: Double = 0.0) -> Animation {
+    func animation(_ f: @escaping (Double) -> Locus, during: Double, delay: Double = 0.0) -> Animation {
         return MorphingAnimation(animatedNode: node as! Shape, valueFunc: f, animationDuration: during, delay: delay)
     }
 
@@ -76,7 +76,7 @@ public extension AnimatableVariable where T: LocusInterpolation {
 // MARK: - Group
 
 public extension AnimatableVariable where T: ContentsInterpolation {
-    public func animation(from: Group? = nil, to: [Node], during: Double = 1.0, delay: Double = 0.0) -> Animation {
+    func animation(from: Group? = nil, to: [Node], during: Double = 1.0, delay: Double = 0.0) -> Animation {
         var fromNode = node as! Group
         if let passedFromNode = from {
             fromNode = passedFromNode
@@ -85,7 +85,7 @@ public extension AnimatableVariable where T: ContentsInterpolation {
         return CombineAnimation(animations: [], during: during, node: fromNode, toNodes: to)
     }
 
-    public func animate(from: Group? = nil, to: [Node], during: Double = 1.0, delay: Double = 0.0) {
+    func animate(from: Group? = nil, to: [Node], during: Double = 1.0, delay: Double = 0.0) {
         animation(from: from, to: to, during: during, delay: delay).play()
     }
 }
diff --git a/Source/animation/types/OpacityAnimation.swift b/Source/animation/types/OpacityAnimation.swift
@@ -49,19 +49,19 @@ internal class OpacityAnimation: AnimationImpl<Double> {
 public typealias OpacityAnimationDescription = AnimationDescription<Double>
 
 public extension AnimatableVariable where T: DoubleInterpolation {
-    public func animate(_ desc: OpacityAnimationDescription) {
+    func animate(_ desc: OpacityAnimationDescription) {
         _ = OpacityAnimation(animatedNode: node!, valueFunc: desc.valueFunc, animationDuration: desc.duration, delay: desc.delay, autostart: true)
     }
 
-    public func animation(_ desc: OpacityAnimationDescription) -> Animation {
+    func animation(_ desc: OpacityAnimationDescription) -> Animation {
         return OpacityAnimation(animatedNode: node!, valueFunc: desc.valueFunc, animationDuration: desc.duration, delay: desc.delay, autostart: false)
     }
 
-    public func animate(from: Double? = nil, to: Double, during: Double = 1.0, delay: Double = 0.0) {
+    func animate(from: Double? = nil, to: Double, during: Double = 1.0, delay: Double = 0.0) {
         self.animate(((from ?? node!.opacity) >> to).t(during, delay: delay))
     }
 
-    public func animation(from: Double? = nil, to: Double, during: Double = 1.0, delay: Double = 0.0) -> Animation {
+    func animation(from: Double? = nil, to: Double, during: Double = 1.0, delay: Double = 0.0) -> Animation {
         if let safeFrom = from {
             return self.animation((safeFrom >> to).t(during, delay: delay))
         }
@@ -71,7 +71,7 @@ public extension AnimatableVariable where T: DoubleInterpolation {
         return OpacityAnimation(animatedNode: self.node!, factory: factory, animationDuration: during, delay: delay)
     }
 
-    public func animation(_ f: @escaping ((Double) -> Double), during: Double = 1.0, delay: Double = 0.0) -> Animation {
+    func animation(_ f: @escaping ((Double) -> Double), during: Double = 1.0, delay: Double = 0.0) -> Animation {
         return OpacityAnimation(animatedNode: node!, valueFunc: f, animationDuration: during, delay: delay)
     }
 

diff --git a/Source/animation/types/ShapeAnimation.swift b/Source/animation/types/ShapeAnimation.swift
@@ -69,7 +69,7 @@ class ShapeAnimation: AnimationImpl<Shape> {
 }
 
 public extension AnimatableVariable {
-    public func animate<T: Stroke>(from: T? = nil, to: T, during: Double = 1.0, delay: Double = 0.0) {
+    func animate<T: Stroke>(from: T? = nil, to: T, during: Double = 1.0, delay: Double = 0.0) {
         let shape = node as! Shape
 
         var safeFrom = from
@@ -89,7 +89,7 @@ public extension AnimatableVariable {
         _ = ShapeAnimation(animatedNode: shape, finalValue: finalShape, animationDuration: during, delay: delay, autostart: true)
     }
 
-    public func animation<T: Stroke>(from: T? = nil, to: T, during: Double = 1.0, delay: Double = 0.0) -> Animation {
+    func animation<T: Stroke>(from: T? = nil, to: T, during: Double = 1.0, delay: Double = 0.0) -> Animation {
         let shape = node as! Shape
 
         var safeFrom = from
@@ -111,7 +111,7 @@ public extension AnimatableVariable {
 }
 
 public extension AnimatableVariable {
-    public func animate<T: Fill>(from: T? = nil, to: T, during: Double = 1.0, delay: Double = 0.0) {
+    func animate<T: Fill>(from: T? = nil, to: T, during: Double = 1.0, delay: Double = 0.0) {
         let shape = node as! Shape
 
         var safeFrom = from
@@ -131,7 +131,7 @@ public extension AnimatableVariable {
         _ = ShapeAnimation(animatedNode: shape, finalValue: finalShape, animationDuration: during, delay: delay, autostart: true)
     }
 
-    public func animation<T: Fill>(from: T? = nil, to: T, during: Double = 1.0, delay: Double = 0.0) -> Animation {
+    func animation<T: Fill>(from: T? = nil, to: T, during: Double = 1.0, delay: Double = 0.0) -> Animation {
         let shape = node as! Shape
 
         var safeFrom = from

diff --git a/Source/animation/types/TransformAnimation.swift b/Source/animation/types/TransformAnimation.swift
@@ -65,29 +65,29 @@ internal class TransformAnimation: AnimationImpl<Transform> {
 public typealias TransformAnimationDescription = AnimationDescription<Transform>
 
 public extension AnimatableVariable where T: TransformInterpolation {
-    public func animate(_ desc: TransformAnimationDescription) {
+    func animate(_ desc: TransformAnimationDescription) {
         _ = TransformAnimation(animatedNode: node!, valueFunc: desc.valueFunc, animationDuration: desc.duration, delay: desc.delay, autostart: true)
     }
 
-    public func animation(_ desc: TransformAnimationDescription) -> Animation {
+    func animation(_ desc: TransformAnimationDescription) -> Animation {
         return TransformAnimation(animatedNode: node!, valueFunc: desc.valueFunc, animationDuration: desc.duration, delay: desc.delay, autostart: false)
     }
 
-    public func animate(from: Transform? = nil, to: Transform, during: Double = 1.0, delay: Double = 0.0) {
+    func animate(from: Transform? = nil, to: Transform, during: Double = 1.0, delay: Double = 0.0) {
         self.animate(((from ?? node!.place) >> to).t(during, delay: delay))
     }
 
-    public func animate(angle: Double, x: Double? = .none, y: Double? = .none, during: Double = 1.0, delay: Double = 0.0) {
+    func animate(angle: Double, x: Double? = .none, y: Double? = .none, during: Double = 1.0, delay: Double = 0.0) {
         let animation = self.animation(angle: angle, x: x, y: y, during: during, delay: delay)
         animation.play()
     }
 
-    public func animate(along path: Path, during: Double = 1.0, delay: Double = 0.0) {
+    func animate(along path: Path, during: Double = 1.0, delay: Double = 0.0) {
         let animation = self.animation(along: path, during: during, delay: delay)
         animation.play()
     }
 
-    public func animation(from: Transform? = nil, to: Transform, during: Double = 1.0, delay: Double = 0.0) -> Animation {
+    func animation(from: Transform? = nil, to: Transform, during: Double = 1.0, delay: Double = 0.0) -> Animation {
         if let safeFrom = from {
             return self.animation((safeFrom >> to).t(during, delay: delay))
         }
@@ -98,11 +98,11 @@ public extension AnimatableVariable where T: TransformInterpolation {
         return TransformAnimation(animatedNode: self.node!, factory: factory, animationDuration: during, delay: delay)
     }
 
-    public func animation(_ f: @escaping ((Double) -> Transform), during: Double = 1.0, delay: Double = 0.0) -> Animation {
+    func animation(_ f: @escaping ((Double) -> Transform), during: Double = 1.0, delay: Double = 0.0) -> Animation {
         return TransformAnimation(animatedNode: node!, valueFunc: f, animationDuration: during, delay: delay)
     }
 
-    public func animation(angle: Double, x: Double? = .none, y: Double? = .none, during: Double = 1.0, delay: Double = 0.0) -> Animation {
+    func animation(angle: Double, x: Double? = .none, y: Double? = .none, during: Double = 1.0, delay: Double = 0.0) -> Animation {
         let bounds = node!.bounds!
 
         let factory = { () -> (Double) -> Transform in { t in
@@ -130,7 +130,7 @@ public extension AnimatableVariable where T: TransformInterpolation {
         return TransformAnimation(animatedNode: self.node!, factory: factory, animationDuration: during, delay: delay)
     }
 
-    public func animation(along path: Path, during: Double = 1.0, delay: Double = 0.0) -> Animation {
+    func animation(along path: Path, during: Double = 1.0, delay: Double = 0.0) -> Animation {
 
         let factory = { () -> (Double) -> Transform in { (t: Double) in Transform.identity }
         }

diff --git a/Source/animation/types/animation_generators/Cache/NodeHashable.swift b/Source/animation/types/animation_generators/Cache/NodeHashable.swift
@@ -1,8 +1,8 @@
 // TODO: Implement better hash
 
 extension Node: Hashable {
-    public var hashValue: Int {
-        return Unmanaged.passUnretained(self).toOpaque().hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(Unmanaged.passUnretained(self).toOpaque())
     }
 }
 
@@ -11,8 +11,8 @@ public func == (lhs: Node, rhs: Node) -> Bool {
 }
 
 extension NodeRenderer: Hashable {
-    public var hashValue: Int {
-        return Unmanaged.passUnretained(self).toOpaque().hashValue
+    func hash(into hasher: inout Hasher) {
+        hasher.combine(Unmanaged.passUnretained(self).toOpaque())
     }
 }
 

diff --git a/Source/animation/types/animation_generators/Cache/TransformHashable.swift b/Source/animation/types/animation_generators/Cache/TransformHashable.swift
@@ -1,11 +1,11 @@
 extension Transform: Hashable {
-    public var hashValue: Int {
-        return m11.hashValue ^
-            m12.hashValue ^
-            m21.hashValue ^
-            m22.hashValue ^
-            dx.hashValue ^
-            dy.hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(m11)
+        hasher.combine(m12)
+        hasher.combine(m21)
+        hasher.combine(m22)
+        hasher.combine(dx)
+        hasher.combine(dy)
     }
 }
 

diff --git a/Source/bindings/Variable.swift b/Source/bindings/Variable.swift
@@ -37,7 +37,7 @@ open class Variable<T> {
         let handler = ChangeHandler<T>(f)
         handlers.append(handler)
         return Disposable { [weak self, unowned handler] in
-            guard let index = self?.handlers.index(of: handler) else {
+            guard let index = self?.handlers.firstIndex(of: handler) else {
                 return
             }