updated for Swift 4.2

a1f023fd · Daniel Dahan · 296684b3 · a1f023fd · a1f023fd · a1f023fd
Commit a1f023fd authored Jul 25, 2018 by Daniel Dahan
12 changed files
--- a/Motion.xcodeproj/project.pbxproj
+++ b/Motion.xcodeproj/project.pbxproj
@@ -42,7 +42,6 @@
 		96E409701F24F7370015A2B5 /* Motion+UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E409491F24F7370015A2B5 /* Motion+UIKit.swift */; };
 		96E409711F24F7370015A2B5 /* Motion+UIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E4094A1F24F7370015A2B5 /* Motion+UIView.swift */; };
 		96E409721F24F7370015A2B5 /* Motion+UIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E4094B1F24F7370015A2B5 /* Motion+UIViewController.swift */; };
-		96E409731F24F7370015A2B5 /* MotionAnimationFillMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E4094C1F24F7370015A2B5 /* MotionAnimationFillMode.swift */; };
 		96E409741F24F7370015A2B5 /* Motion.h in Headers */ = {isa = PBXBuildFile; fileRef = 96E4094F1F24F7370015A2B5 /* Motion.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		96E409761F24F7370015A2B5 /* MotionAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E409511F24F7370015A2B5 /* MotionAnimation.swift */; };
 		96E409771F24F7370015A2B5 /* MotionAnimationState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E409521F24F7370015A2B5 /* MotionAnimationState.swift */; };
@@ -72,7 +71,6 @@
 		96E409941F24F7570015A2B5 /* Motion+UIKit.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96E409491F24F7370015A2B5 /* Motion+UIKit.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		96E409951F24F7570015A2B5 /* Motion+UIView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96E4094A1F24F7370015A2B5 /* Motion+UIView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		96E409961F24F7570015A2B5 /* Motion+UIViewController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96E4094B1F24F7370015A2B5 /* Motion+UIViewController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
-		96E409971F24F7570015A2B5 /* MotionAnimationFillMode.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96E4094C1F24F7370015A2B5 /* MotionAnimationFillMode.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		96E4099B1F24F7570015A2B5 /* MotionAnimation.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96E409511F24F7370015A2B5 /* MotionAnimation.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		96E4099C1F24F7570015A2B5 /* MotionAnimationState.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96E409521F24F7370015A2B5 /* MotionAnimationState.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		96E4099D1F24F7570015A2B5 /* MotionCAAnimation.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96E409531F24F7370015A2B5 /* MotionCAAnimation.swift */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -119,7 +117,6 @@
 		96E409491F24F7370015A2B5 /* Motion+UIKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Motion+UIKit.swift"; sourceTree = "<group>"; };
 		96E4094A1F24F7370015A2B5 /* Motion+UIView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Motion+UIView.swift"; sourceTree = "<group>"; };
 		96E4094B1F24F7370015A2B5 /* Motion+UIViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Motion+UIViewController.swift"; sourceTree = "<group>"; };
-		96E4094C1F24F7370015A2B5 /* MotionAnimationFillMode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimationFillMode.swift; sourceTree = "<group>"; };
 		96E4094F1F24F7370015A2B5 /* Motion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Motion.h; sourceTree = "<group>"; };
 		96E409511F24F7370015A2B5 /* MotionAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimation.swift; sourceTree = "<group>"; };
 		96E409521F24F7370015A2B5 /* MotionAnimationState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimationState.swift; sourceTree = "<group>"; };
@@ -223,7 +220,6 @@
 				96E409491F24F7370015A2B5 /* Motion+UIKit.swift */,
 				96E4094A1F24F7370015A2B5 /* Motion+UIView.swift */,
 				96E4094B1F24F7370015A2B5 /* Motion+UIViewController.swift */,
-				96E4094C1F24F7370015A2B5 /* MotionAnimationFillMode.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -262,7 +258,6 @@
 				96E409941F24F7570015A2B5 /* Motion+UIKit.swift in Headers */,
 				96E409951F24F7570015A2B5 /* Motion+UIView.swift in Headers */,
 				96E409961F24F7570015A2B5 /* Motion+UIViewController.swift in Headers */,
-				96E409971F24F7570015A2B5 /* MotionAnimationFillMode.swift in Headers */,
 				96E4099B1F24F7570015A2B5 /* MotionAnimation.swift in Headers */,
 				96E4099C1F24F7570015A2B5 /* MotionAnimationState.swift in Headers */,
 				96E4099D1F24F7570015A2B5 /* MotionCAAnimation.swift in Headers */,
@@ -322,7 +317,7 @@
 				TargetAttributes = {
 					96C98DD01E424AB000B22906 = {
 						CreatedOnToolsVersion = 8.2.1;
-						LastSwiftMigration = 0830;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -349,7 +344,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				96E409731F24F7370015A2B5 /* MotionAnimationFillMode.swift in Sources */,
 				96E409791F24F7370015A2B5 /* MotionContext.swift in Sources */,
 				965FE96B1FDDA4EA0098BDD0 /* MotionCorePreprocessor.swift in Sources */,
 				965FE9631FDCCE030098BDD0 /* MotionTransition+Complete.swift in Sources */,
@@ -534,7 +528,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -555,7 +549,7 @@
 				PRODUCT_NAME = Motion;
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

--- a/Motion.xcodeproj/xcshareddata/xcschemes/Motion iOS.xcscheme
+++ b/Motion.xcodeproj/xcshareddata/xcschemes/Motion iOS.xcscheme
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1000"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"

--- a/Sources/Animator/MotionCoreAnimationViewContext.swift
+++ b/Sources/Animator/MotionCoreAnimationViewContext.swift
@@ -257,7 +257,7 @@ fileprivate extension MotionCoreAnimationViewContext {
      anim = a
    }
-    anim.fillMode = kCAFillModeBoth
+    anim.fillMode = CAMediaTimingFillMode.both
    anim.isRemovedOnCompletion = false
    anim.beginTime = beginTime

--- a/Sources/Extensions/Motion+CALayer.swift
+++ b/Sources/Extensions/Motion+CALayer.swift
@@ -322,7 +322,7 @@ fileprivate extension CALayer {
      }
      let g = Motion.animate(group: anims, duration: duration)
-      g.fillMode = MotionAnimationFillModeToValue(mode: .both)
+      g.fillMode = .both
      g.isRemovedOnCompletion = false
      g.timingFunction = ts.timingFunction
@@ -338,3 +338,8 @@ fileprivate extension CALayer {
    }
  }
 }
+// Helper function inserted by Swift 4.2 migrator.
+fileprivate func convertToCAMediaTimingFillMode(_ input: String) -> CAMediaTimingFillMode {
+	return CAMediaTimingFillMode(rawValue: input)
+}
--- a/Sources/Extensions/Motion+CAMediaTimingFunction.swift
+++ b/Sources/Extensions/Motion+CAMediaTimingFunction.swift
@@ -30,10 +30,10 @@ import UIKit
 public extension CAMediaTimingFunction {
  //  Default
-  static let linear = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
+  static let linear = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)
-  static let easeIn = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseIn)
+  static let easeIn = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeIn)
-  static let easeOut = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut)
+  static let easeOut = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
-  static let easeInOut = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
+  static let easeInOut = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)
  //  Material
  static let standard = CAMediaTimingFunction(controlPoints: 0.4, 0.0, 0.2, 1.0)

--- a/Sources/Extensions/Motion+UIViewController.swift
+++ b/Sources/Extensions/Motion+UIViewController.swift
@@ -233,7 +233,7 @@ extension UIViewController {
    var current: UIViewController? = self
    while nil == target && nil != current {
-      if let childViewControllers = (current as? UINavigationController)?.childViewControllers ?? current!.navigationController?.childViewControllers {
+      if let childViewControllers = (current as? UINavigationController)?.children ?? current!.navigationController?.children {
        for vc in childViewControllers.reversed() {
          if self != vc, withMatchBlock(vc) {
@@ -299,7 +299,7 @@ extension UIViewController {
    }
    if let nc = navigationController {
-      var v = nc.childViewControllers
+      var v = nc.children
      if !v.isEmpty {
        v.removeLast()

--- a/Sources/Extensions/MotionAnimationFillMode.swift
+++ b/Sources/Extensions/MotionAnimationFillMode.swift
-/*
- * The MIT License (MIT)
- *
- * Copyright (C) 2017, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.com>.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-import UIKit
-@objc(MotionAnimationFillMode)
-public enum MotionAnimationFillMode: Int {
-  case forwards
-  case backwards
-  case both
-  case removed
-}
-/**
- Converts the MotionAnimationFillMode enum value to a corresponding String.
- - Parameter mode: An MotionAnimationFillMode enum value.
- */
-public func MotionAnimationFillModeToValue(mode: MotionAnimationFillMode) -> String {
-  switch mode {
-  case .forwards:
-    return kCAFillModeForwards
-  case .backwards:
-    return kCAFillModeBackwards
-  case .both:
-    return kCAFillModeBoth
-  case .removed:
-    return kCAFillModeRemoved
-  }
-}
--- a/Sources/Info.plist
+++ b/Sources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.3</string>
+	<string>1.5.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

--- a/Sources/Transition/MotionProgressRunner.swift
+++ b/Sources/Transition/MotionProgressRunner.swift
@@ -72,12 +72,12 @@ class MotionProgressRunner {
    self.duration = duration
    displayLink = CADisplayLink(target: self, selector: #selector(displayUpdate(_:)))
-    displayLink!.add(to: RunLoop.main, forMode: RunLoopMode(rawValue: RunLoopMode.commonModes.rawValue))
+    displayLink!.add(to: RunLoop.main, forMode: RunLoop.Mode(rawValue: RunLoop.Mode.common.rawValue))
  }
  func stop() {
    displayLink?.isPaused = true
-    displayLink?.remove(from: RunLoop.main, forMode: RunLoopMode(rawValue: RunLoopMode.commonModes.rawValue))
+    displayLink?.remove(from: RunLoop.main, forMode: RunLoop.Mode(rawValue: RunLoop.Mode.common.rawValue))
    displayLink = nil
  }
 }
--- a/Sources/Transition/MotionTransition+UINavigationControllerDelegate.swift
+++ b/Sources/Transition/MotionTransition+UINavigationControllerDelegate.swift
@@ -29,7 +29,7 @@
 import UIKit
 extension MotionTransition: UINavigationControllerDelegate {
-  public func navigationController(_ navigationController: UINavigationController, animationControllerFor operation: UINavigationControllerOperation, from fromVC: UIViewController, to toVC: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+  public func navigationController(_ navigationController: UINavigationController, animationControllerFor operation: UINavigationController.Operation, from fromVC: UIViewController, to toVC: UIViewController) -> UIViewControllerAnimatedTransitioning? {
    guard !isTransitioning else {
      return nil
    }

--- a/Sources/Transition/MotionTransition+UITabBarControllerDelegate.swift
+++ b/Sources/Transition/MotionTransition+UITabBarControllerDelegate.swift
@@ -53,8 +53,8 @@ extension MotionTransition: UITabBarControllerDelegate {
    state = .notified
-    let fromVCIndex = tabBarController.childViewControllers.index(of: fromVC)!
+    let fromVCIndex = tabBarController.children.index(of: fromVC)!
-    let toVCIndex = tabBarController.childViewControllers.index(of: toVC)!
+    let toVCIndex = tabBarController.children.index(of: toVC)!
    isPresenting = toVCIndex > fromVCIndex
    fromViewController = fromViewController ?? fromVC

--- a/Sources/Transition/MotionTransition.swift
+++ b/Sources/Transition/MotionTransition.swift
@@ -207,7 +207,7 @@ extension Motion {
   */
  public class func animate(group animations: [CAAnimation], timingFunction: CAMediaTimingFunction = .easeInOut, duration: CFTimeInterval = 0.5) -> CAAnimationGroup {
    let group = CAAnimationGroup()
-    group.fillMode = MotionAnimationFillModeToValue(mode: .both)
+    group.fillMode = .both
    group.isRemovedOnCompletion = false
    group.animations = animations
    group.duration = duration
@@ -722,3 +722,8 @@ internal extension MotionTransition {
    }
  }
 }
+// Helper function inserted by Swift 4.2 migrator.
+fileprivate func convertToCAMediaTimingFillMode(_ input: String) -> CAMediaTimingFillMode {
+	return CAMediaTimingFillMode(rawValue: input)
+}