Action typealias removed to avoid name collisions

Author: sinarionn

AppRouter.podspec

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "AppRouter"
-  s.version      = "3.0.0"
+  s.version      = "3.0.1"
   s.summary      = "UIViewController creation, navigation, utility methods for easy routing"
 
   s.homepage     = "https://github.com/MLSDev/AppRouter"

CHANGELOG.md

@@ -2,13 +2,19 @@
 
 All notable changes to this project will be documented in this file.
 
+## [3.0.1](https://github.com/MLSDev/AppRouter/releases/tag/3.0.1)
+
+Typealias Action = () -> () was removed to avoid collisions with "Action" framework class names
+
+
 ## [3.0.0](https://github.com/MLSDev/AppRouter/releases/tag/3.0.0)
 
 WARNING: From now on Presenters source provider will use storyboard initial controller by default instead of one with class name as StoryboardID.
 Make sure you check all code with default instantiations or with .presenter().fromStoryboard("name")
 
 All life circle observers was moved into Reactive namespace and can be accessed by calling instance.rx.onViewDidLoad() or Type.rx.onViewDidLoad()   
 
+
 ## [2.0.1](https://github.com/MLSDev/AppRouter/releases/tag/2.0.1)
 
 Small visibility problems fixed

Plists/AppRouter.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.0</string>
+	<string>3.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Sources/Core/AppRouter+navigations.swift

@@ -6,7 +6,7 @@ extension AppRouter {
     ///
     /// - parameter animated: defines if popping should be animated
     /// - parameter completion: called after successful popping
-    public class func popFromTopNavigation(animated: Bool = true, completion: Action? = nil) {
+    public class func popFromTopNavigation(animated: Bool = true, completion: Func<Void, Void>? = nil) {
         _ = topViewController()?.navigationController?.popViewController(animated: animated, completion: completion)
     }
 }
@@ -19,7 +19,7 @@ extension UIViewController {
     /// - parameter completion: Called after transition ends successfully.
     /// - returns: [UIViewCotnroller]? - returns the popped controllers
     @discardableResult
-    public func pop(animated: Bool = true, completion: Action? = nil) -> [UIViewController]? {
+    public func pop(animated: Bool = true, completion: Func<Void, Void>? = nil) -> [UIViewController]? {
         guard let stack = navigationController?.viewControllers , stack.count > 1 else {
             AppRouter.print("#[AppRouter] can't pop \"\(String(describing: self))\" when only one controller in navigation stack!")
             return nil
@@ -45,7 +45,7 @@ extension UIViewController {
     /// - parameter completion: Called after transition ends successfully
     /// - returns: returns true if able to close
     @discardableResult
-    public func close(animated: Bool = true, completion: Action? = nil) -> Bool {
+    public func close(animated: Bool = true, completion: Func<Void, Void>? = nil) -> Bool {
         if canPop() {
             _ = pop(animated: animated, completion: completion)
         } else if isModal {
@@ -103,7 +103,7 @@ extension UINavigationController {
     /// - parameter viewController: controller to be pushed
     /// - parameter animated: Set this value to true to animate the transition
     /// - parameter completion: Called after transition ends successfully
-    public func pushViewController(_ viewController: UIViewController, animated: Bool, completion: Action?) {
+    public func pushViewController(_ viewController: UIViewController, animated: Bool, completion: Func<Void, Void>?) {
         guard !viewControllers.contains(viewController) else { return AppRouter.print("#[AppRouter] can't push \"\(String(describing: type(of: viewController)))\", already in navigation stack!") }
         pushViewController(viewController, animated: animated)
         _сoordinator(animated, completion: completion)
@@ -115,7 +115,7 @@ extension UINavigationController {
     /// - parameter completion: Called after transition ends successfully
     /// - returns: the popped controller
     @discardableResult
-    public func popViewController(animated: Bool, completion: Action?) -> UIViewController? {
+    public func popViewController(animated: Bool, completion: Func<Void, Void>?) -> UIViewController? {
         guard let popped = self.popViewController(animated: animated) else { return nil }
         _сoordinator(animated, completion: completion)
         return popped
@@ -128,7 +128,7 @@ extension UINavigationController {
     /// - parameter completion: Called after transition ends successfully
     /// - returns: [UIViewCotnroller]? - returns the popped controllers
     @discardableResult
-    public func popToViewController(_ viewController: UIViewController, animated: Bool, completion: Action?) -> [UIViewController]? {
+    public func popToViewController(_ viewController: UIViewController, animated: Bool, completion: Func<Void, Void>?) -> [UIViewController]? {
         guard let popped = popToViewController(viewController, animated: animated) else { return nil }
         _сoordinator(animated, completion: completion)
         return popped
@@ -141,7 +141,7 @@ extension UINavigationController {
     /// - parameter completion: Called after transition ends successfully
     /// - returns: [UIViewCotnroller]? - returns the popped controllers
     @discardableResult
-    public func popToViewController<T: UIViewController>(_ type: T.Type, animated: Bool, completion: Action?) -> [UIViewController]? {
+    public func popToViewController<T: UIViewController>(_ type: T.Type, animated: Bool, completion: Func<Void, Void>?) -> [UIViewController]? {
         guard let popped = popToViewController(type, animated: animated) else { return nil }
         _сoordinator(animated, completion: completion)
         return popped
@@ -153,13 +153,13 @@ extension UINavigationController {
     /// - parameter completion: Called after transition ends successfully
     /// - returns: [UIViewCotnroller]? - returns the popped controllers
     @discardableResult
-    public func popToRootViewController(animated: Bool, completion: Action?) -> [UIViewController]? {
+    public func popToRootViewController(animated: Bool, completion: Func<Void, Void>?) -> [UIViewController]? {
         guard let popped = self.popToRootViewController(animated: animated) else { return nil }
         _сoordinator(animated, completion: completion)
         return popped
     }
 
-    fileprivate func _сoordinator(_ animated: Bool, completion: Action?) {
+    fileprivate func _сoordinator(_ animated: Bool, completion: Func<Void, Void>?) {
         if let coordinator = transitionCoordinator , animated {
             coordinator.animate(alongsideTransition: nil) { _ in
                 completion?()

Sources/Core/AppRouter+presenter.swift

@@ -100,7 +100,7 @@ open class ViewControllerPresentConfiguration<T: UIViewController> {
     /// - parameter completion: The block to execute after the view controller is pushed.
     /// - returns: returns instance provided by `source` provider
     @discardableResult
-    open func push(animated: Bool = true, completion: Action? = nil) -> T? {
+    open func push(animated: Bool = true, completion: Func<Void, Void>? = nil) -> T? {
         guard let sourceController = source.provideController(T.self), let parent = provideEmbeddedController(sourceController) else { debug("error constructing source controller"); return nil }
         configurator(sourceController)
         guard let targetController = target.provideController(UIViewController.self) else { debug("error fetching target controller"); return nil }
@@ -115,7 +115,7 @@ open class ViewControllerPresentConfiguration<T: UIViewController> {
     /// - parameter completion: The block to execute after the view controller is presented.
     /// - returns: returns instance provided by `source` provider
     @discardableResult
-    open func present(animated: Bool = true, completion: Action? = nil) -> T? {
+    open func present(animated: Bool = true, completion: Func<Void, Void>? = nil) -> T? {
         guard let sourceController = source.provideController(T.self), let parent = provideEmbeddedController(sourceController) else { debug("error constructing source controller"); return nil }
         configurator(sourceController)
         guard let targetController = target.provideController(UIViewController.self) else { debug("error fetching target controller"); return nil }

Sources/Core/AppRouter.swift

@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-public typealias Action = ()->()
 public typealias Func<T, U> = (T) -> U
 
 /// Namespacing class