Fixed SPM builds (#3)

hhru · Mar 8, 2021 · ba16ec0 · ba16ec0
1 parent bb98002
commit ba16ec0
Show file tree

Hide file tree

Showing 68 changed files with 155 additions and 19 deletions.
diff --git a/Nivelir.xcodeproj/project.pbxproj b/Nivelir.xcodeproj/project.pbxproj
@@ -922,8 +922,8 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1130;
-				LastUpgradeCheck = 1130;
-				ORGANIZATIONNAME = "HeadHunter";
+				LastUpgradeCheck = 1240;
+				ORGANIZATIONNAME = HeadHunter;
 				TargetAttributes = {
 					C057F00D23CB8EEB00C2D895 = {
 						CreatedOnToolsVersion = 11.3;
@@ -1295,6 +1295,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1359,6 +1360,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;

diff --git a/Sources/Extensions/UIKit/UINavigationController+Extensions.swift b/Sources/Extensions/UIKit/UINavigationController+Extensions.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 extension UINavigationController {
@@ -14,3 +15,4 @@ extension UINavigationController {
         visibleViewController
     }
 }
+#endif
diff --git a/Sources/Extensions/UIKit/UITabBarController+Extensions.swift b/Sources/Extensions/UIKit/UITabBarController+Extensions.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 extension UITabBarController {
@@ -7,3 +8,4 @@ extension UITabBarController {
         set { selectedViewController = newValue }
     }
 }
+#endif
diff --git a/Sources/Extensions/UIKit/UIViewController+Extensions.swift b/Sources/Extensions/UIKit/UIViewController+Extensions.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 extension UIViewController {
@@ -18,3 +19,4 @@ extension UIViewController {
         tabBarController
     }
 }
+#endif
diff --git a/Sources/Extensions/UIKit/UIWindow+Extensions.swift b/Sources/Extensions/UIKit/UIWindow+Extensions.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 extension UIWindow {
@@ -6,3 +7,4 @@ extension UIWindow {
         rootViewController
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Generic/From/ScreenFromAction.swift b/Sources/Screen/Actions/Generic/From/ScreenFromAction.swift
@@ -49,6 +49,7 @@ extension ScreenRoute {
     }
 }
 
+#if canImport(UIKit)
 extension ScreenNavigator {
 
     public func navigate<Container: ScreenContainer>(
@@ -77,3 +78,4 @@ extension ScreenNavigator {
         )
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Generic/From/ScreenFromFirstAction.swift b/Sources/Screen/Actions/Generic/From/ScreenFromFirstAction.swift
@@ -23,7 +23,7 @@ public struct ScreenFromFirstAction<
                 return false
             }
 
-            return predicate(container)
+            return self.predicate.checkContainer(container)
         }
 
         guard let output = first as? Output else {
@@ -57,6 +57,7 @@ extension ScreenRoute {
     }
 }
 
+#if canImport(UIKit)
 extension ScreenNavigator {
 
     public func navigate<Container: ScreenContainer>(
@@ -85,3 +86,4 @@ extension ScreenNavigator {
         )
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Generic/From/ScreenFromPredicate.swift b/Sources/Screen/Actions/Generic/From/ScreenFromPredicate.swift
@@ -1,4 +1,8 @@
+#if canImport(UIKit)
 import UIKit
+#else
+import Foundation
+#endif
 
 public struct ScreenFromPredicate<Container: ScreenContainer> {
 
@@ -8,7 +12,7 @@ public struct ScreenFromPredicate<Container: ScreenContainer> {
         self.box = box
     }
 
-    internal func callAsFunction(_ container: Container) -> Bool {
+    internal func checkContainer(_ container: Container) -> Bool {
         box(container)
     }
 }
@@ -30,6 +34,7 @@ extension ScreenFromPredicate {
     }
 }
 
+#if canImport(UIKit)
 extension ScreenFromPredicate where Container == UIViewController {
 
     public static var modalContainer: Self {
@@ -62,3 +67,4 @@ extension ScreenFromPredicate where Container == UITabBarController {
         container(of: Container.self, key: key)
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Generic/From/ScreenFromTopAction.swift b/Sources/Screen/Actions/Generic/From/ScreenFromTopAction.swift
@@ -23,7 +23,7 @@ public struct ScreenFromTopAction<
                 return false
             }
 
-            return predicate(container)
+            return self.predicate.checkContainer(container)
         }
 
         guard let output = top as? Output else {
@@ -57,6 +57,7 @@ extension ScreenRoute {
     }
 }
 
+#if canImport(UIKit)
 extension ScreenNavigator {
 
     public func navigate<Container: ScreenContainer>(
@@ -85,3 +86,4 @@ extension ScreenNavigator {
         )
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Generic/ScreenJoinAction.swift b/Sources/Screen/Actions/Generic/ScreenJoinAction.swift
@@ -24,7 +24,7 @@ public struct ScreenJoinAction<
         first.perform(container: container, navigation: navigation) { result in
             switch result {
             case let .success(container):
-                second.perform(
+                self.second.perform(
                     container: container,
                     navigation: navigation,
                     completion: completion

diff --git a/Sources/Screen/Actions/Generic/ScreenNavigateToAction.swift b/Sources/Screen/Actions/Generic/ScreenNavigateToAction.swift
@@ -56,6 +56,7 @@ public struct ScreenNavigateToAction<Container: ScreenContainer>: ScreenAction {
     }
 }
 
+#if canImport(UIKit)
 extension ScreenNavigator {
 
     public func navigate(
@@ -78,3 +79,4 @@ extension ScreenNavigator {
         )
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Modal/ScreenDismissAction.swift b/Sources/Screen/Actions/Modal/ScreenDismissAction.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public struct ScreenDismissAction<Container: UIViewController>: ScreenAction {
@@ -33,3 +34,4 @@ extension ScreenRoute where Container: UIViewController {
         then(action: ScreenDismissAction<Container>(animated: animated))
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Modal/ScreenPresentAction.swift b/Sources/Screen/Actions/Modal/ScreenPresentAction.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public struct ScreenPresentAction<
@@ -58,3 +59,4 @@ extension ScreenRoute where Container: UIViewController {
         )
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Modal/ScreenPresentedAction.swift b/Sources/Screen/Actions/Modal/ScreenPresentedAction.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public struct ScreenPresentedAction<
@@ -62,3 +63,4 @@ extension ScreenRoute where Container: UIViewController {
         )
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Modal/ScreenPresentingAction.swift b/Sources/Screen/Actions/Modal/ScreenPresentingAction.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public struct ScreenPresentingAction<
@@ -62,3 +63,4 @@ extension ScreenRoute where Container: UIViewController {
         )
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Modal/ScreenStackAction.swift b/Sources/Screen/Actions/Modal/ScreenStackAction.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public struct ScreenStackAction<
@@ -62,3 +63,4 @@ extension ScreenRoute where Container: UIViewController {
         )
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Modal/ScreenTabsAction.swift b/Sources/Screen/Actions/Modal/ScreenTabsAction.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public struct ScreenTabsAction<
@@ -62,3 +63,4 @@ extension ScreenRoute where Container: UIViewController {
         )
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Stack/ScreenStackTopAction.swift b/Sources/Screen/Actions/Stack/ScreenStackTopAction.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public struct ScreenStackTopAction<
@@ -60,3 +61,4 @@ extension ScreenRoute where Container: UINavigationController {
         )
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Stack/ScreenStackVisibleAction.swift b/Sources/Screen/Actions/Stack/ScreenStackVisibleAction.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public struct ScreenStackVisibleAction<
@@ -60,3 +61,4 @@ extension ScreenRoute where Container: UINavigationController {
         )
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Stack/SetStack/Animations/ScreenStackAnimation.swift b/Sources/Screen/Actions/Stack/SetStack/Animations/ScreenStackAnimation.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public enum ScreenStackAnimation {
@@ -55,3 +56,4 @@ extension ScreenStackAnimation: Equatable {
         }
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Stack/SetStack/Animations/ScreenStackCustomAnimation.swift b/Sources/Screen/Actions/Stack/SetStack/Animations/ScreenStackCustomAnimation.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public protocol ScreenStackCustomAnimation {
@@ -20,3 +21,4 @@ extension ScreenStackCustomAnimation where Self: Equatable {
         return self == other
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Stack/SetStack/Animations/ScreenStackTransitionAnimation.swift b/Sources/Screen/Actions/Stack/SetStack/Animations/ScreenStackTransitionAnimation.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public struct ScreenStackTransitionAnimation: ScreenStackCustomAnimation, Equatable {
@@ -44,3 +45,4 @@ extension ScreenStackAnimation {
         ScreenStackTransitionAnimation.crossDissolve
     )
 }
+#endif
diff --git a/Sources/Screen/Actions/Stack/SetStack/Modifiers/PopTo/ScreenStackPopToModifier.swift b/Sources/Screen/Actions/Stack/SetStack/Modifiers/PopTo/ScreenStackPopToModifier.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public struct ScreenStackPopToModifier: ScreenStackModifier {
@@ -16,7 +17,7 @@ public struct ScreenStackPopToModifier: ScreenStackModifier {
         in stack: [UIViewController],
         navigation: ScreenNavigation
     ) throws -> [UIViewController] {
-        guard let stackIndex = predicate(stack) else {
+        guard let stackIndex = predicate.containerIndex(in: stack) else {
             throw ScreenContainerNotFoundError<UIViewController>(for: self)
         }
 
@@ -36,3 +37,4 @@ extension ScreenRoute where Container: UINavigationController {
         )
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Stack/SetStack/Modifiers/PopTo/ScreenStackPopToPredicate.swift b/Sources/Screen/Actions/Stack/SetStack/Modifiers/PopTo/ScreenStackPopToPredicate.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public struct ScreenStackPopToPredicate {
@@ -8,7 +9,7 @@ public struct ScreenStackPopToPredicate {
         self.box = box
     }
 
-    internal func callAsFunction(_ stack: [UIViewController]) -> Int? {
+    internal func containerIndex(in stack: [UIViewController]) -> Int? {
         box(stack)
     }
 }
@@ -29,3 +30,4 @@ extension ScreenStackPopToPredicate {
         }
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Stack/SetStack/Modifiers/ScreenStackClearModifier.swift b/Sources/Screen/Actions/Stack/SetStack/Modifiers/ScreenStackClearModifier.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public struct ScreenStackClearModifier: ScreenStackModifier {
@@ -25,3 +26,4 @@ extension ScreenRoute where Container: UINavigationController {
         )
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Stack/SetStack/Modifiers/ScreenStackModifier.swift b/Sources/Screen/Actions/Stack/SetStack/Modifiers/ScreenStackModifier.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public protocol ScreenStackModifier: CustomStringConvertible {
@@ -6,3 +7,4 @@ public protocol ScreenStackModifier: CustomStringConvertible {
         navigation: ScreenNavigation
     ) throws -> [UIViewController]
 }
+#endif
diff --git a/Sources/Screen/Actions/Stack/SetStack/Modifiers/ScreenStackPopModifier.swift b/Sources/Screen/Actions/Stack/SetStack/Modifiers/ScreenStackPopModifier.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public struct ScreenStackPopModifier: ScreenStackModifier {
@@ -29,3 +30,4 @@ extension ScreenRoute where Container: UINavigationController {
         )
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Stack/SetStack/Modifiers/ScreenStackPopToRootModifier.swift b/Sources/Screen/Actions/Stack/SetStack/Modifiers/ScreenStackPopToRootModifier.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public struct ScreenStackPopToRootModifier: ScreenStackModifier {
@@ -29,3 +30,4 @@ extension ScreenRoute where Container: UINavigationController {
         )
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Stack/SetStack/Modifiers/ScreenStackPushModifier.swift b/Sources/Screen/Actions/Stack/SetStack/Modifiers/ScreenStackPushModifier.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public struct ScreenStackPushModifier<
@@ -58,3 +59,4 @@ extension ScreenRoute where Container: UINavigationController {
         )
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Stack/SetStack/Modifiers/ScreenStackReplaceModifier.swift b/Sources/Screen/Actions/Stack/SetStack/Modifiers/ScreenStackReplaceModifier.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public struct ScreenStackReplaceModifier<
@@ -60,3 +61,4 @@ extension ScreenRoute where Container: UINavigationController {
         )
     }
 }
+#endif
diff --git a/Sources/Screen/Actions/Stack/SetStack/ScreenSetStackAction.swift b/Sources/Screen/Actions/Stack/SetStack/ScreenSetStackAction.swift
@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import UIKit
 
 public struct ScreenSetStackAction<Container: UINavigationController>: ScreenAction {
@@ -144,3 +145,4 @@ extension ScreenRoute where Container: UINavigationController {
         )
     }
 }
+#endif