[WEB-749] ReactiveExtensions and ReactiveSwift to SPM (#1745)

* after adding a package.swift file to ReactiveExtensions, imported through SPM, included ReactiveSwift as a dependency. Almost build except for a few import ReactiveExtensions (could not find) build errors.

* project building with Foundation and UIKit imports

* Imported ReactiveSwift via SPM to correct linker issues.

* removed unneeded dependencies from Library-iOS and KickstarterFramework-iOS

Because KsApi includes ReactiveSwift and ReactiveExtensions, and Library includes KsApi and KickstarterFramework-iOS includes Library-iOS, there is no need to include RE and RS in either Library-iOS or KickstarterFramework-iOS.

* formatting

* Found that including RE and RS in Library-iOS and only RE in KF-iOS required for on device build.

* Removed unneeded ReactiveExtensions-TestHelpers from KsApi

Cartfile

@@ -1,7 +1,3 @@
 ### Internal
 
-github "kickstarter/Kickstarter-ReactiveExtensions" "e3f7786b5bcc7b99c14b9fd313302bb59d9c3fe9"
-
 ### 3rd Party
-
-github "ReactiveCocoa/ReactiveSwift" == 6.5.0

Cartfile.resolved

@@ -1,2 +1 @@
-github "ReactiveCocoa/ReactiveSwift" "6.5.0"
-github "kickstarter/Kickstarter-ReactiveExtensions" "e3f7786b5bcc7b99c14b9fd313302bb59d9c3fe9"
+

Carthage-xcfilelist/app-input-files.xcfilelist

@@ -1,4 +1 @@
 # Carthage input files
-
-$(SRCROOT)/Carthage/Build/iOS/ReactiveExtensions.framework
-$(SRCROOT)/Carthage/Build/iOS/ReactiveSwift.framework

Carthage-xcfilelist/app-output-files.xcfilelist

@@ -1,4 +1 @@
 # Carthage output files
-
-$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/ReactiveExtensions.framework
-$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/ReactiveSwift.framework

Carthage-xcfilelist/kickstarter-framework-input-files.xcfilelist

@@ -1,4 +1 @@
 # Carthage input files
-
-$(SRCROOT)/Carthage/Build/iOS/ReactiveExtensions.framework
-$(SRCROOT)/Carthage/Build/iOS/ReactiveSwift.framework

Carthage-xcfilelist/kickstarter-framework-output-files.xcfilelist

@@ -1,4 +1 @@
 # Carthage output files
-
-$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/ReactiveExtensions.framework
-$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/ReactiveSwift.framework

Carthage-xcfilelist/ksapi-input-files.xcfilelist

@@ -1,4 +1 @@
 # Carthage input files
-
-$(SRCROOT)/Carthage/Build/iOS/ReactiveExtensions.framework
-$(SRCROOT)/Carthage/Build/iOS/ReactiveSwift.framework

Carthage-xcfilelist/ksapi-output-files.xcfilelist

@@ -1,4 +1 @@
 # Carthage output files
-
-$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/ReactiveExtensions.framework
-$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/ReactiveSwift.framework

Carthage-xcfilelist/library-input-files.xcfilelist

@@ -1,4 +1 @@
 # Carthage input files
-
-$(SRCROOT)/Carthage/Build/iOS/ReactiveExtensions.framework
-$(SRCROOT)/Carthage/Build/iOS/ReactiveSwift.framework

Carthage-xcfilelist/library-output-files.xcfilelist

@@ -1,4 +1 @@
 # Carthage output files
-
-$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/ReactiveExtensions.framework
-$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/ReactiveSwift.framework

Kickstarter-iOS/Features/Help/ViewModel/HelpWebViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import Library
 import Prelude
 import ReactiveSwift

Kickstarter.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -180,6 +180,15 @@
         "revision" : "b0cec69c19a13088864b52ad1745397f587daec7"
       }
     },
+    {
+      "identity" : "kickstarter-reactiveextensions",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/kickstarter/Kickstarter-ReactiveExtensions",
+      "state" : {
+        "branch" : "feature/swift-package",
+        "revision" : "34276be97fa5acae36e714ad65f8ecb733c0566b"
+      }
+    },
     {
       "identity" : "kingfisher",
       "kind" : "remoteSourceControl",
@@ -243,6 +252,15 @@
         "version" : "1.16.3"
       }
     },
+    {
+      "identity" : "reactiveswift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ReactiveCocoa/ReactiveSwift",
+      "state" : {
+        "revision" : "e03cda84105ba707de039b757e2b2de868c65a3e",
+        "version" : "6.5.0"
+      }
+    },
     {
       "identity" : "sdwebimage",
       "kind" : "remoteSourceControl",

KsApi/models/Project.swift

@@ -1,4 +1,4 @@
-
+import Foundation
 import Prelude
 import ReactiveSwift
 

Library/ViewModels/ActivitySampleBackingCellViewModel.swift

@@ -2,6 +2,7 @@ import KsApi
 import Prelude
 import ReactiveExtensions
 import ReactiveSwift
+import UIKit
 
 public protocol ActivitySampleBackingCellViewModelInputs {
   /// Call to configure cell with activity value.

Library/ViewModels/ActivitySampleFollowCellViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveExtensions

Library/ViewModels/ActivitySampleProjectCellViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveExtensions

Library/ViewModels/AddNewCardViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveExtensions

Library/ViewModels/BetaToolsViewModel.swift

@@ -1,8 +1,8 @@
-import Foundation
 import KsApi
 import Prelude
 import ReactiveExtensions
 import ReactiveSwift
+import UIKit
 
 public enum BetaToolsRow: Int, CaseIterable {
   case debugConfigFeatureFlags

Library/ViewModels/CommentCellViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveSwift

Library/ViewModels/CommentRepliesViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveExtensions

Library/ViewModels/CommentsViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveExtensions

Library/ViewModels/DashboardFundingCellViewModel.swift

@@ -2,6 +2,7 @@ import KsApi
 import Prelude
 import ReactiveExtensions
 import ReactiveSwift
+import UIKit
 
 public struct FundingGraphData {
   public let project: Project

Library/ViewModels/DashboardReferrerRowStackViewViewModel.swift

@@ -2,6 +2,7 @@ import KsApi
 import Prelude
 import ReactiveExtensions
 import ReactiveSwift
+import UIKit
 
 public protocol DashboardReferrerRowStackViewViewModelInputs {
   /// Call to configure cell with referrer data.

Library/ViewModels/DashboardVideoCellViewModel.swift

@@ -2,6 +2,7 @@ import KsApi
 import Prelude
 import ReactiveExtensions
 import ReactiveSwift
+import UIKit
 
 public protocol DashboardVideoCellViewModelInputs {
   /// Call to configure cell with video stats.

Library/ViewModels/DiscoveryNavigationHeaderViewModel.swift

@@ -2,6 +2,7 @@ import KsApi
 import Prelude
 import ReactiveExtensions
 import ReactiveSwift
+import UIKit
 
 public protocol DiscoveryNavigationHeaderViewModelInputs {
   /// Call to configure with Discovery params.

Library/ViewModels/DiscoveryPageViewModel.swift

@@ -2,6 +2,7 @@ import KsApi
 import Prelude
 import ReactiveExtensions
 import ReactiveSwift
+import UIKit
 
 public protocol DiscoveryPageViewModelInputs {
   /// Call when the Config has been updated in the AppEnvironment

Library/ViewModels/DiscoveryViewModel.swift

@@ -2,6 +2,7 @@ import KsApi
 import Prelude
 import ReactiveExtensions
 import ReactiveSwift
+import UIKit
 
 public protocol DiscoveryViewModelInputs {
   /// Call when Recommendations setting changes on Settings > Account > Privacy > Recommendations.

Library/ViewModels/ErroredBackingViewViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveSwift

Library/ViewModels/FacebookConfirmationViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import ReactiveExtensions
 import ReactiveSwift

Library/ViewModels/FindFriendsFriendFollowCellViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveExtensions

Library/ViewModels/LoginViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveExtensions

Library/ViewModels/ManagePledgePaymentMethodViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveExtensions

Library/ViewModels/MessageCellViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import ReactiveSwift
 

Library/ViewModels/MessageCellViewModelTests.swift

@@ -1,3 +1,4 @@
+import Foundation
 @testable import KsApi
 import Library
 import ReactiveExtensions_TestHelpers

Library/ViewModels/MessageThreadCellViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveExtensions

Library/ViewModels/MessageThreadCellViewModelTests.swift

@@ -1,3 +1,4 @@
+import Foundation
 @testable import KsApi
 import Library
 import Prelude

Library/ViewModels/PledgeAmountViewModel.swift

@@ -1,8 +1,8 @@
-import Foundation
 import KsApi
 import Prelude
 import ReactiveExtensions
 import ReactiveSwift
+import UIKit
 
 public typealias PledgeAmountData = (amount: Double, min: Double, max: Double, isValid: Bool)
 

Library/ViewModels/PledgeViewCTAContainerViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveExtensions

Library/ViewModels/ProjectActivityBackingCellViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveExtensions

Library/ViewModels/ProjectActivityCommentCellViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveExtensions

Library/ViewModels/ProjectActivityLaunchCellViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveExtensions

Library/ViewModels/ProjectActivitySuccessCellViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveExtensions

Library/ViewModels/ProjectEnvironmentalCommitmentDisclaimerCellViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveSwift

Library/ViewModels/ProjectPageViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveSwift

Library/ViewModels/ProjectRisksDisclaimerCellViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveSwift

Library/ViewModels/RootCommentCellViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveSwift

Library/ViewModels/ThanksViewModel.swift

@@ -2,6 +2,7 @@ import KsApi
 import Prelude
 import ReactiveExtensions
 import ReactiveSwift
+import UIKit
 
 public typealias ThanksPageData = (
   project: Project,

Library/ViewModels/TwoFactorViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveExtensions

Library/ViewModels/WatchProjectViewModel.swift

@@ -1,3 +1,4 @@
+import Foundation
 import KsApi
 import Prelude
 import ReactiveSwift