Add SPM support (#125)

* Add SPM support

* Remove tvOS and macOS

* Fix SPM test

Author: M0rtyMerr

.circleci/config.yml

@@ -28,6 +28,9 @@ jobs:
       - run:
           name: Run Tests (Swift 5)
           command: set -o pipefail && xcodebuild test SWIFT_VERSION=5.0 -scheme 'RxFlow' -project 'RxFlow.xcodeproj' -sdk iphonesimulator -destination "name=iPhone X" | xcpretty -c -r html --output $XCODE_TEST_REPORTS/iOS_Swift5.html
+      - run:
+          name: Run Tests SPM
+          command: swift test
       - store_artifacts:
           path: /tmp/xcode-test-results
 workflows:

.gitignore

@@ -70,3 +70,7 @@ fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
+
+.idea
+Package.resolved
+.swiftpm

Package.swift

@@ -0,0 +1,19 @@
+// swift-tools-version:5.0
+
+import PackageDescription
+
+let package = Package(
+    name: "RxFlow",
+    platforms: [.iOS(.v9)],
+    products: [
+        .library(name: "RxFlow", targets: ["RxFlow"]),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.0.0")),
+    ],
+    targets: [
+        .target(name: "RxFlow", dependencies: ["RxSwift", "RxCocoa"], path: "RxFlow"),
+        .testTarget(name: "RxFlowTests", dependencies: ["RxFlow", "RxBlocking", "RxTest"], path: "RxFlowTests"),
+    ],
+    swiftLanguageVersions: [.v5]
+)

RxFlow/Extensions/Rx+Pausable.swift

@@ -7,6 +7,7 @@
 //
 
 import RxSwift
+import Foundation
 
 // this code had been inspired by the project: https://github.com/RxSwiftCommunity/RxSwiftExt
 // Its License can be found here: ../DependenciesLicenses/RxSwiftCommunity-RxSwiftExt-License

RxFlow/Extensions/UIViewController+Presentable.swift

@@ -6,7 +6,10 @@
 //  Copyright (c) RxSwiftCommunity. All rights reserved.
 //
 
+#if canImport(UIKit)
 import UIKit.UIViewController
 import RxSwift
 
 extension UIViewController: Presentable {}
+
+#endif

RxFlow/Extensions/UIViewController+Rx.swift

@@ -8,7 +8,7 @@
 
 // this code had been inspired by the project: https://github.com/devxoul/RxViewController
 // Its License can be found here: ../DependenciesLicenses/devxoul-RxViewController-License
-
+#if canImport(UIKit)
 import UIKit.UIViewController
 import RxSwift
 import RxCocoa
@@ -39,3 +39,5 @@ extension Reactive where Base: UIViewController {
         return initialState.concat(Observable<Bool>.merge(viewDidAppearObservable, viewDidDisappearObservable))
     }
 }
+
+#endif

RxFlow/Extensions/UIWindow+Presentable.swift

@@ -6,7 +6,10 @@
 //  Copyright (c) RxSwiftCommunity. All rights reserved.
 //
 
+#if canImport(UIKit)
 import UIKit.UIWindow
 import RxSwift
 
 extension UIWindow: Presentable {}
+
+#endif

RxFlow/Extensions/UIWindow+Rx.swift

@@ -6,6 +6,7 @@
 //  Copyright (c) RxSwiftCommunity. All rights reserved.
 //
 
+#if canImport(UIKit)
 import UIKit
 import RxSwift
 
@@ -17,3 +18,5 @@ extension Reactive where Base: UIWindow {
     }
 
 }
+
+#endif

RxFlow/Flow.swift

@@ -6,6 +6,8 @@
 //  Copyright (c) RxSwiftCommunity. All rights reserved.
 //
 
+#if canImport(UIKit)
+
 import RxSwift
 import RxCocoa
 import UIKit
@@ -233,3 +235,5 @@ public class Flows {
             })
     }
 }
+
+#endif

RxFlow/FlowContributor.swift

@@ -6,6 +6,8 @@
 //  Copyright (c) RxSwiftCommunity. All rights reserved.
 //
 
+#if canImport(UIKit)
+
 /// A FlowContributor describes the next thing that will contribute to a Flow.
 ///
 /// - contribute: the given stepper will emit steps (according to lifecycle of the given presentable) that will contribute to the current Flow
@@ -54,3 +56,5 @@ public enum FlowContributors {
     @available(*, deprecated, message: "You should use .one(flowContributor: .forwardToParentFlow(withStep: Step))")
     case triggerParentFlow (withStep: Step)
 }
+
+#endif

RxFlow/FlowCoordinator.swift

@@ -5,6 +5,9 @@
 //  Created by Thibault Wittemberg on 2018-12-19.
 //  Copyright © 2018 RxSwiftCommunity. All rights reserved.
 //
+
+#if canImport(UIKit)
+import Foundation
 import RxSwift
 import RxCocoa
 
@@ -203,3 +206,5 @@ private class PresentableAndStepper {
         self.stepper = stepper
     }
 }
+
+#endif

RxFlow/Presentable.swift

@@ -6,8 +6,9 @@
 //  Copyright (c) RxSwiftCommunity. All rights reserved.
 //
 
-import UIKit.UIViewController
+#if canImport(UIKit)
 
+import UIKit.UIViewController
 import RxSwift
 
 /// An abstraction of what can be presented to the screen. For now, UIViewControllers and Flows are Presentable
@@ -59,3 +60,5 @@ extension Presentable where Self: UIWindow {
         return Single.never()
     }
 }
+
+#endif

RxFlow/Synchronizable.swift

@@ -9,6 +9,9 @@
 // this code had been inspired by the project: https://github.com/RxSwiftCommunity/NSObject-Rx
 // Its License can be found here: ../DependenciesLicenses/RxSwiftCommunity-NSObject-Rx-License
 
+#if canImport(ObjectiveC)
+import ObjectiveC
+
 /// Provides a function to prevent concurrent block execution
 public protocol Synchronizable {}
 
@@ -20,3 +23,5 @@ extension Synchronizable {
         return result
     }
 }
+
+#endif

RxFlowTests/Flow+PresentableTests.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2019 RxSwiftCommunity. All rights reserved.
 //
 
+#if canImport(UIKit)
+
 @testable import RxFlow
 import XCTest
 import RxBlocking
@@ -67,3 +69,5 @@ final class Flow_PresentableTests: XCTestCase {
         XCTAssertEqual(observer.events.count, 2)
     }
 }
+
+#endif

RxFlowTests/FlowContributorTests.swift

@@ -6,6 +6,7 @@
 //  Copyright © 2019 RxSwiftCommunity. All rights reserved.
 //
 
+#if canImport(UIKit)
 @testable import RxFlow
 import RxRelay
 import RxSwift
@@ -35,3 +36,4 @@ final class FlowContributorTests: XCTestCase {
         }
     }
 }
+#endif

RxFlowTests/FlowCoordinatorTests.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2019 RxSwiftCommunity. All rights reserved.
 //
 
+#if canImport(UIKit)
+
 @testable import RxFlow
 import XCTest
 import RxBlocking
@@ -80,3 +82,5 @@ final class FlowCoordinatorTests: XCTestCase {
         XCTAssertEqual(actualSteps, [.multiple, .one, .two])
     }
 }
+
+#endif

RxFlowTests/SyncronizableTests.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2018 RxSwiftCommunity. All rights reserved.
 //
 
+#if os(iOS) || os(macOS)
+
 import XCTest
 @testable import RxFlow
 
@@ -71,3 +73,5 @@ final class SyncronizableTests: XCTestCase {
 
     }
 }
+
+#endif

RxFlowTests/TestData/TestUIViewController.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2018 RxSwiftCommunity. All rights reserved.
 //
 
+#if canImport(UIKit)
+
 import UIKit
 import Reusable
 
@@ -14,3 +16,5 @@ final class TestUIViewController: UIViewController, StoryboardBased {
         super.viewDidLoad()
     }
 }
+
+#endif

RxFlowTests/UIViewController+PresentableTests.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2018 RxSwiftCommunity. All rights reserved.
 //
 
+#if canImport(UIKit)
+
 @testable import RxFlow
 import XCTest
 import RxBlocking
@@ -55,3 +57,5 @@ final class UIViewController_PresentableTests: XCTestCase {
         XCTAssertEqual(observer.events.count, 2)
     }
 }
+
+#endif