Automigration to swift 3

serejahh · serejahh · commit f1a54f2363ec · 2016-09-26T10:09:08.000+03:00
diff --git a/MenuExample.xcodeproj/project.pbxproj b/MenuExample.xcodeproj/project.pbxproj
@@ -414,7 +414,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.yalantis.ios.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = MenuExample;
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -427,7 +427,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.yalantis.ios.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = MenuExample;
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
diff --git a/MenuExample/Controller/MenuViewController.swift b/MenuExample/Controller/MenuViewController.swift
@@ -8,26 +8,26 @@ import UIKit
 import SideMenu
 
 protocol MenuViewControllerDelegate: class {
-    func menu(menu: MenuViewController, didSelectItemAtIndex index: Int, atPoint point: CGPoint)
-    func menuDidCancel(menu: MenuViewController)
+    func menu(_ menu: MenuViewController, didSelectItemAtIndex index: Int, atPoint point: CGPoint)
+    func menuDidCancel(_ menu: MenuViewController)
 }
 
 class MenuViewController: UITableViewController {
     weak var delegate: MenuViewControllerDelegate?
     var selectedItem = 0
     
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
-        let indexPath = NSIndexPath(forRow: selectedItem, inSection: 0)
-        tableView.selectRowAtIndexPath(indexPath, animated: false, scrollPosition: .None)
+        let indexPath = IndexPath(row: selectedItem, section: 0)
+        tableView.selectRow(at: indexPath, animated: false, scrollPosition: .none)
     }
     
 }
 
 extension MenuViewController {
     @IBAction
-    private func dismissMenu() {
+    fileprivate func dismissMenu() {
         delegate?.menuDidCancel(self)
     }
 }
@@ -41,14 +41,14 @@ extension  MenuViewController: Menu {
 
 // MARK: - UITableViewDelegate
 extension MenuViewController {
-    override func tableView(tableView: UITableView, willSelectRowAtIndexPath indexPath: NSIndexPath) -> NSIndexPath? {
+    override func tableView(_ tableView: UITableView, willSelectRowAt indexPath: IndexPath) -> IndexPath? {
         return indexPath == tableView.indexPathForSelectedRow ? nil : indexPath
     }
 
-    override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
-        let rect = tableView.rectForRowAtIndexPath(indexPath)
-        var point = CGPointMake(rect.midX, rect.midY)
-        point = tableView.convertPoint(point, toView: nil)
-        delegate?.menu(self, didSelectItemAtIndex: indexPath.row, atPoint:point)
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        let rect = tableView.rectForRow(at: indexPath)
+        var point = CGPoint(x: rect.midX, y: rect.midY)
+        point = tableView.convert(point, to: nil)
+        delegate?.menu(self, didSelectItemAtIndex: (indexPath as NSIndexPath).row, atPoint:point)
     }
 }
diff --git a/MenuExample/Controller/ViewController.swift b/MenuExample/Controller/ViewController.swift
@@ -8,25 +8,25 @@ import UIKit
 import SideMenu
 
 class ViewController: UIViewController {
-    private var selectedIndex = 0
-    private var transitionPoint: CGPoint!
-    private var contentType: ContentType = .Music
-    private var navigator: UINavigationController!
-    lazy private var menuAnimator : MenuTransitionAnimator! = MenuTransitionAnimator(mode: .Presentation, shouldPassEventsOutsideMenu: false) { [unowned self] in
-        self.dismissViewControllerAnimated(true, completion: nil)
+    fileprivate var selectedIndex = 0
+    fileprivate var transitionPoint: CGPoint!
+    fileprivate var contentType: ContentType = .Music
+    fileprivate var navigator: UINavigationController!
+    lazy fileprivate var menuAnimator : MenuTransitionAnimator! = MenuTransitionAnimator(mode: .presentation, shouldPassEventsOutsideMenu: false) { [unowned self] in
+        self.dismiss(animated: true, completion: nil)
     }
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
-        switch (segue.identifier, segue.destinationViewController) {
-            case (.Some("presentMenu"), let menu as MenuViewController):
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        switch (segue.identifier, segue.destination) {
+            case (.some("presentMenu"), let menu as MenuViewController):
                 menu.selectedItem = selectedIndex
                 menu.delegate = self
                 menu.transitioningDelegate = self
-                menu.modalPresentationStyle = .Custom
-            case (.Some("embedNavigator"), let navigator as UINavigationController):
+                menu.modalPresentationStyle = .custom
+            case (.some("embedNavigator"), let navigator as UINavigationController):
                 self.navigator = navigator
                 self.navigator.delegate = self
             default:
-                super.prepareForSegue(segue, sender: sender)
+                super.prepare(for: segue, sender: sender)
         }
     }
 }
@@ -37,23 +37,23 @@ extension ViewController: MenuViewControllerDelegate {
         transitionPoint = point
         selectedIndex = index
 
-        let content = storyboard!.instantiateViewControllerWithIdentifier("Content") as! ContentViewController
+        let content = storyboard!.instantiateViewController(withIdentifier: "Content") as! ContentViewController
         content.type = contentType
         self.navigator.setViewControllers([content], animated: true)
         
-        dispatch_async(dispatch_get_main_queue()) {
-            self.dismissViewControllerAnimated(true, completion: nil)
+        DispatchQueue.main.async {
+            self.dismiss(animated: true, completion: nil)
         }
     }
 
     func menuDidCancel(_: MenuViewController) {
-        dismissViewControllerAnimated(true, completion: nil)
+        dismiss(animated: true, completion: nil)
     }
 }
 
 extension ViewController: UINavigationControllerDelegate {
-    func navigationController(_: UINavigationController, animationControllerForOperation _: UINavigationControllerOperation,
-        fromViewController _: UIViewController, toViewController _: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+    func navigationController(_: UINavigationController, animationControllerFor _: UINavigationControllerOperation,
+        from _: UIViewController, to _: UIViewController) -> UIViewControllerAnimatedTransitioning? {
 
         if let transitionPoint = transitionPoint {
             return CircularRevealTransitionAnimator(center: transitionPoint)
@@ -63,13 +63,13 @@ extension ViewController: UINavigationControllerDelegate {
 }
 
 extension ViewController: UIViewControllerTransitioningDelegate {
-    func animationControllerForPresentedController(presented: UIViewController, presentingController _: UIViewController,
-        sourceController _: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+    func animationController(forPresented presented: UIViewController, presenting _: UIViewController,
+        source _: UIViewController) -> UIViewControllerAnimatedTransitioning? {
             return menuAnimator
     }
     
-    func animationControllerForDismissedController(dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        return MenuTransitionAnimator(mode: .Dismissal)
+    func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+        return MenuTransitionAnimator(mode: .dismissal)
     }
 
 }
diff --git a/MenuExample/Misc/AnimationDelegate.swift b/MenuExample/Misc/AnimationDelegate.swift
@@ -7,9 +7,9 @@
 import QuartzCore
 
 class AnimationDelegate: NSObject, CAAnimationDelegate {
-    private let completion: () -> Void
+    fileprivate let completion: () -> Void
 
-    init(completion: () -> Void) {
+    init(completion: @escaping () -> Void) {
         self.completion = completion
     }
 
diff --git a/MenuExample/Misc/CircularRevealAnimator.swift b/MenuExample/Misc/CircularRevealAnimator.swift
@@ -6,17 +6,17 @@
 
 import QuartzCore
 
-private func SquareAroundCircle(center: CGPoint, radius: CGFloat) -> CGRect {
+private func SquareAroundCircle(_ center: CGPoint, radius: CGFloat) -> CGRect {
     assert(0 <= radius, "radius must be a positive value")
-    return CGRectInset(CGRect(origin: center, size: CGSizeZero), -radius, -radius)
+    return CGRect(origin: center, size: CGSize.zero).insetBy(dx: -radius, dy: -radius)
 }
 
 class CircularRevealAnimator {
     var completion: () -> Void = {}
 
-    private let layer: CALayer
-    private let mask: CAShapeLayer
-    private let animation: CABasicAnimation
+    fileprivate let layer: CALayer
+    fileprivate let mask: CAShapeLayer
+    fileprivate let animation: CABasicAnimation
 
     var duration: CFTimeInterval {
         get { return animation.duration }
@@ -29,8 +29,8 @@ class CircularRevealAnimator {
     }
 
     init(layer: CALayer, center: CGPoint, startRadius: CGFloat, endRadius: CGFloat) {
-        let startPath = CGPathCreateWithEllipseInRect(SquareAroundCircle(center, radius: startRadius), nil)
-        let endPath = CGPathCreateWithEllipseInRect(SquareAroundCircle(center, radius: endRadius), nil)
+        let startPath = CGPath(ellipseIn: SquareAroundCircle(center, radius: startRadius), transform: nil)
+        let endPath = CGPath(ellipseIn: SquareAroundCircle(center, radius: endRadius), transform: nil)
 
         self.layer = layer
 
@@ -50,6 +50,6 @@ class CircularRevealAnimator {
     func start() {
         layer.mask = mask
         mask.frame = layer.bounds
-        mask.addAnimation(animation, forKey: "reveal")
+        mask.add(animation, forKey: "reveal")
     }
-}
+}
diff --git a/MenuExample/Misc/CircularRevealTransitionAnimator.swift b/MenuExample/Misc/CircularRevealTransitionAnimator.swift
@@ -7,25 +7,25 @@
 import UIKit
 
 class CircularRevealTransitionAnimator: NSObject {
-    private let duration = 0.5
-    private let center: CGPoint
+    fileprivate let duration = 0.5
+    fileprivate let center: CGPoint
 
     init(center: CGPoint) {
         self.center = center
     }
 }
 
 extension CircularRevealTransitionAnimator: UIViewControllerAnimatedTransitioning {
-    func animateTransition(context: UIViewControllerContextTransitioning) {
-        let frame = context.finalFrameForViewController(context.viewControllerForKey(UITransitionContextToViewControllerKey)!)
+    func animateTransition(using context: UIViewControllerContextTransitioning) {
+        let frame = context.finalFrame(for: context.viewController(forKey: UITransitionContextViewControllerKey.to)!)
 
-        let source = context.viewForKey(UITransitionContextFromViewKey)!
-        let target = context.viewForKey(UITransitionContextToViewKey)!
+        let source = context.view(forKey: UITransitionContextViewKey.from)!
+        let target = context.view(forKey: UITransitionContextViewKey.to)!
 
         target.frame = frame
-        context.containerView().insertSubview(target, aboveSubview: source)
+        context.containerView.insertSubview(target, aboveSubview: source)
 
-        let center = target.convertPoint(self.center, fromView: nil)
+        let center = target.convert(self.center, from: nil)
         let radius: CGFloat = {
             let x = max(center.x, frame.width - center.x)
             let y = max(center.y, frame.height - center.y)
@@ -34,15 +34,15 @@ extension CircularRevealTransitionAnimator: UIViewControllerAnimatedTransitionin
 
         let animator = CircularRevealAnimator(layer: target.layer, center: center, startRadius: 0, endRadius: radius)
         animator.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseIn)
-        animator.duration = transitionDuration(context)
+        animator.duration = transitionDuration(using: context)
         animator.completion = {
             source.removeFromSuperview()
             context.completeTransition(true)
         }
         animator.start()
     }
 
-    func transitionDuration(transitionContext: UIViewControllerContextTransitioning?) -> NSTimeInterval {
+    func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
         return duration
     }
 }
diff --git a/SideMenu.xcodeproj/project.pbxproj b/SideMenu.xcodeproj/project.pbxproj
@@ -258,7 +258,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -276,7 +276,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
diff --git a/SideMenu/MenuItemsAnimator.swift b/SideMenu/MenuItemsAnimator.swift
@@ -6,7 +6,7 @@
 
 import UIKit
 
-private func TransformForRotatingLayer(layer: CALayer, angle: CGFloat) -> CATransform3D {
+private func TransformForRotatingLayer(_ layer: CALayer, angle: CGFloat) -> CATransform3D {
     let offset = layer.bounds.width / 2
 
     var transform = CATransform3DIdentity
@@ -21,9 +21,9 @@ class MenuItemsAnimator {
     var completion: () -> Void = {}
     var duration: CFTimeInterval = 0
 
-    private let layers: [CALayer]
-    private let startAngle: CGFloat
-    private let endAngle: CGFloat
+    fileprivate let layers: [CALayer]
+    fileprivate let startAngle: CGFloat
+    fileprivate let endAngle: CGFloat
 
     init(views: [UIView], startAngle: CGFloat, endAngle: CGFloat) {
         self.layers = views.map { $0.layer }
@@ -34,17 +34,17 @@ class MenuItemsAnimator {
     func start() {
         let count = Double(layers.count)
         let duration = self.duration * count / (4 * count - 3)
-        for (index, layer) in layers.enumerate() {
+        for (index, layer) in layers.enumerated() {
             layer.transform = TransformForRotatingLayer(layer, angle: startAngle)
 
             let delay = 3 * duration * Double(index) / count
-            UIView.animateWithDuration(duration, delay: delay, options: .CurveEaseIn, animations: {
+            UIView.animate(withDuration: duration, delay: delay, options: .curveEaseIn, animations: {
                 layer.transform = TransformForRotatingLayer(layer, angle: self.endAngle)
             }, completion: nil)
         }
 
-        let delay = dispatch_time(DISPATCH_TIME_NOW, Int64(self.duration * Double(NSEC_PER_SEC)))
-        dispatch_after(delay, dispatch_get_main_queue()) {
+        let delay = DispatchTime.now() + Double(Int64(self.duration * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC)
+        DispatchQueue.main.asyncAfter(deadline: delay) {
             self.completion()
         }
     }
diff --git a/SideMenu/MenuTransitionAnimator.swift b/SideMenu/MenuTransitionAnimator.swift

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@`
`7`	`7`	`import QuartzCore`
`8`	`8`
`9`	`9`	`class AnimationDelegate: NSObject, CAAnimationDelegate {`
`10`		`- private let completion: () -> Void`
	`10`	`+ fileprivate let completion: () -> Void`
`11`	`11`
`12`		`- init(completion: () -> Void) {`
	`12`	`+ init(completion: @escaping () -> Void) {`
`13`	`13`	`self.completion = completion`
`14`	`14`	`}`
`15`	`15`