Simplify Yosemite into a Swift package - Sources only

Fakes/Fakes.xcodeproj/project.pbxproj

@@ -12,7 +12,6 @@
 		26106B3D25FA4F6C0000DF30 /* ProductFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26106B3C25FA4F6C0000DF30 /* ProductFactory.swift */; };
 		26CA6D2625F6C87800B01F48 /* Fakes.h in Headers */ = {isa = PBXBuildFile; fileRef = 26CA6D2425F6C87800B01F48 /* Fakes.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		26CA6D2F25F6C8FC00B01F48 /* Fake.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26CA6D2D25F6C8FB00B01F48 /* Fake.swift */; };
-		26EEDC8D26FE1C1C00D5BA0E /* Yosemite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26EEDC8C26FE1C1C00D5BA0E /* Yosemite.framework */; };
 		26EEDC9026FE1C7B00D5BA0E /* Networking.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EEDC8E26FE1C7B00D5BA0E /* Networking.generated.swift */; };
 		26EEDC9126FE1C7B00D5BA0E /* Yosemite.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EEDC8F26FE1C7B00D5BA0E /* Yosemite.generated.swift */; };
 		3F2B4AC22DDC30B200E5E49C /* XcodeTarget_Fakes in Frameworks */ = {isa = PBXBuildFile; productRef = 3F2B4AC12DDC30B200E5E49C /* XcodeTarget_Fakes */; };
@@ -41,7 +40,6 @@
 		26CA6D2425F6C87800B01F48 /* Fakes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Fakes.h; sourceTree = "<group>"; };
 		26CA6D2525F6C87800B01F48 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		26CA6D2D25F6C8FB00B01F48 /* Fake.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Fake.swift; sourceTree = "<group>"; };
-		26EEDC8C26FE1C1C00D5BA0E /* Yosemite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Yosemite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		26EEDC8E26FE1C7B00D5BA0E /* Networking.generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Networking.generated.swift; sourceTree = "<group>"; };
 		26EEDC8F26FE1C7B00D5BA0E /* Yosemite.generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Yosemite.generated.swift; sourceTree = "<group>"; };
 		3F37E1222DEEAC7200D8BF2B /* WooFoundationCore.generated.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WooFoundationCore.generated.swift; sourceTree = "<group>"; };
@@ -55,7 +53,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				3F2B4AC22DDC30B200E5E49C /* XcodeTarget_Fakes in Frameworks */,
-				26EEDC8D26FE1C1C00D5BA0E /* Yosemite.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -108,7 +105,6 @@
 		26CA6D3225F6C92100B01F48 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				26EEDC8C26FE1C1C00D5BA0E /* Yosemite.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";

Yosemite/Yosemite.xcodeproj/xcshareddata/xcschemes/Yosemite.xcscheme → Modules/.swiftpm/xcode/xcshareddata/xcschemes/Yosemite.xcscheme

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1620"
-   version = "1.3">
+   LastUpgradeVersion = "1640"
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -14,10 +15,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B5C9DDF42087FEC0006B910A"
-               BuildableName = "Yosemite.framework"
+               BlueprintIdentifier = "Yosemite"
+               BuildableName = "Yosemite"
                BlueprintName = "Yosemite"
-               ReferencedContainer = "container:Yosemite.xcodeproj">
+               ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -26,28 +27,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B5C9DDF42087FEC0006B910A"
-            BuildableName = "Yosemite.framework"
-            BlueprintName = "Yosemite"
-            ReferencedContainer = "container:Yosemite.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B5C9DDFD2087FEC0006B910A"
-               BuildableName = "YosemiteTests.xctest"
-               BlueprintName = "YosemiteTests"
-               ReferencedContainer = "container:Yosemite.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -59,15 +40,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B5C9DDF42087FEC0006B910A"
-            BuildableName = "Yosemite.framework"
-            BlueprintName = "Yosemite"
-            ReferencedContainer = "container:Yosemite.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -78,10 +50,10 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B5C9DDF42087FEC0006B910A"
-            BuildableName = "Yosemite.framework"
+            BlueprintIdentifier = "Yosemite"
+            BuildableName = "Yosemite"
             BlueprintName = "Yosemite"
-            ReferencedContainer = "container:Yosemite.xcodeproj">
+            ReferencedContainer = "container:">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

Modules/Package.swift

@@ -59,6 +59,10 @@ let package = Package(
             name: "WPMediaPicker",
             targets: ["WPMediaPicker"]
         ),
+        .library(
+            name: "Yosemite",
+            targets: ["Yosemite"]
+        ),
     ],
     dependencies: [
         .package(url: "https://github.com/Alamofire/Alamofire", from: "5.2.0"),
@@ -181,6 +185,23 @@ let package = Package(
             name: "WPMediaPicker",
             resources: [.process("Resources")]
         ),
+        .target(
+            name: "Yosemite",
+            dependencies: [
+                "Codegen",
+                "Hardware",
+                "Networking",
+                "Storage",
+                "WooFoundation",
+                "WordPressShared",
+                .product(name: "Alamofire", package: "Alamofire"),
+                .product(name: "Aztec", package: "AztecEditor-iOS"),
+                .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
+                .product(name: "KeychainAccess", package: "KeychainAccess"),
+                .product(name: "StripeTerminal", package: "stripe-terminal-ios"),
+                .product(name: "WordPressEditor", package: "AztecEditor-iOS"),
+            ]
+        ),
         .testTarget(
             name: "ExperimentsTests",
             dependencies: [
@@ -239,7 +260,6 @@ enum XcodeTargetNames {
     static let wooCommerceWatchApp = "Woo Watch App"
     static let wordPressAuthenticator = "WordPressAuthenticator"
     static let wordPressAuthenticatorTests = "WordPressAuthenticatorTests"
-    static let yosemite = "Yosemite"
     static let yosemiteTests = "YosemiteTests"
 }
 
@@ -260,7 +280,6 @@ enum XcodeSupport {
             XcodeTargetNames.wooCommerceWatchApp,
             XcodeTargetNames.wordPressAuthenticator,
             XcodeTargetNames.wordPressAuthenticatorTests,
-            XcodeTargetNames.yosemite,
             XcodeTargetNames.yosemiteTests
         ].map { .supportingProduct(forXcodeTarget: $0) }
     }
@@ -273,6 +292,7 @@ enum XcodeSupport {
                     "Codegen",
                     "Hardware",
                     "Networking",
+                    "Yosemite"
                 ]
             ),
             .xcodeTarget(
@@ -297,6 +317,7 @@ enum XcodeSupport {
                 dependencies: [
                     "Networking",
                     "WooFoundation",
+                    "Yosemite",
                     .product(name: "KeychainAccess", package: "KeychainAccess"),
                 ]
             ),
@@ -335,6 +356,7 @@ enum XcodeSupport {
                     "WordPressShared",
                     "WordPressUI",
                     "WPMediaPicker",
+                    "Yosemite",
                     .product(name: "Alamofire", package: "Alamofire"),
                     .product(name: "Algorithms", package: "swift-algorithms"),
                     .product(name: "AutomatticAbout", package: "AutomatticAbout-swift"),
@@ -416,31 +438,14 @@ enum XcodeSupport {
                     XcodeTargetNames.wordPressAuthenticator.asDependency,
                 ]
             ),
-            .xcodeTarget(
-                XcodeTargetNames.yosemite,
-                dependencies: [
-                    "Codegen",
-                    "Hardware",
-                    "Networking",
-                    "Storage",
-                    "WooFoundation",
-                    "WordPressShared",
-                    .product(name: "Alamofire", package: "Alamofire"),
-                    .product(name: "Aztec", package: "AztecEditor-iOS"),
-                    .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
-                    .product(name: "KeychainAccess", package: "KeychainAccess"),
-                    .product(name: "StripeTerminal", package: "stripe-terminal-ios"),
-                    .product(name: "WordPressEditor", package: "AztecEditor-iOS"),
-                ]
-            ),
             .xcodeTarget(
                 XcodeTargetNames.yosemiteTests,
                 dependencies: [
                     "Codegen",
                     "TestKit",
                     "WooFoundation",
                     "WordPressShared",
-                    XcodeTargetNames.yosemite.asDependency
+                    "Yosemite"
                 ]
             )
         ]

Modules/Sources/Codegen/Sourcery/Copiable/Yosemite-Copiable.sourcery.yaml

@@ -1,7 +1,8 @@
-project: 
-    file: ../../../../../Yosemite/Yosemite.xcodeproj
-    target: 
-        name: Yosemite
+sources:
+    include:
+        - ../../../../../Modules/Sources/Yosemite/
 templates:
     - Models+Copiable.swifttemplate
-output: ../../../../../Yosemite/Yosemite/Model/Copiable/
+output: ../../../../../Modules/Sources/Yosemite/Model/Copiable/
+args:
+    moduleName: Yosemite

Modules/Sources/Codegen/Sourcery/Fakes/Yosemite-Fakes.yaml

@@ -1,8 +1,8 @@
-project:
-    file: ../../../../../Yosemite/Yosemite.xcodeproj
-    target:
-        name: Yosemite
+sources:
+    include:
+        - ../../../../../Modules/Sources/Yosemite/
 templates:
     - Fakes.swifttemplate
 output: ../../../../../Fakes/Fakes/Yosemite.generated.swift
-
+args:
+    moduleName: Yosemite

Yosemite/Yosemite/Actions/CardPresentPaymentAction.swift → Modules/Sources/Yosemite/Actions/CardPresentPaymentAction.swift

@@ -2,6 +2,7 @@
 //
 
 import Combine
+import Foundation
 
 public enum CardPresentPaymentAction: Action {
     /// Sets the store to use a given payment gateway

Yosemite/Yosemite/Actions/NotificationCountAction.swift → Modules/Sources/Yosemite/Actions/NotificationCountAction.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Networking
 import Storage
 
 // MARK: - NotificationCountAction: Defines all of the Actions supported by the NotificationCountStore.

Yosemite/Yosemite/Actions/ShippingLabelAction.swift → Modules/Sources/Yosemite/Actions/ShippingLabelAction.swift

@@ -1,3 +1,4 @@
+import Foundation
 import Networking
 
 public enum ShippingLabelAction: Action {

Yosemite/Yosemite/Actions/WooShippingAction.swift → Modules/Sources/Yosemite/Actions/WooShippingAction.swift

@@ -1,3 +1,4 @@
+import Foundation
 import Networking
 
 public enum WooShippingAction: Action {

Yosemite/Yosemite/Model/Copiable/Models+Copiable.generated.swift → Modules/Sources/Yosemite/Model/Copiable/Models+Copiable.generated.swift

@@ -95,9 +95,9 @@ extension Yosemite.POSSimpleProduct {
 
 extension Yosemite.ProductReviewFromNoteParcel {
     public func copy(
-        note: CopiableProp<Yosemite.Note> = .copy,
-        review: CopiableProp<Yosemite.ProductReview> = .copy,
-        product: CopiableProp<Yosemite.Product> = .copy
+        note: CopiableProp<Note> = .copy,
+        review: CopiableProp<ProductReview> = .copy,
+        product: CopiableProp<Networking.Product> = .copy
     ) -> Yosemite.ProductReviewFromNoteParcel {
         let note = note ?? self.note
         let review = review ?? self.review

Yosemite/Yosemite/Model/Enums/CardPresentPaymentsOnboardingState.swift → Modules/Sources/Yosemite/Model/Enums/CardPresentPaymentsOnboardingState.swift

@@ -1,3 +1,4 @@
+import Foundation
 import WooFoundation
 
 /// Represents the possible states for onboarding to In-Person payments

Yosemite/Yosemite/Model/Payments/PaymentIntent+ReceiptParameters.swift → Modules/Sources/Yosemite/Model/Payments/PaymentIntent+ReceiptParameters.swift

@@ -1,3 +1,4 @@
+import Foundation
 import Hardware
 import WooFoundation
 

Yosemite/Yosemite/PListStorage/SiteNotificationCountFileContents.swift → Modules/Sources/Yosemite/PListStorage/SiteNotificationCountFileContents.swift

@@ -1,3 +1,5 @@
+import Networking
+
 extension Note.Kind: Codable {}
 
 /// The type of notification count for the site

Yosemite/Yosemite/PointOfSale/Coupons/POSCoupon.swift → Modules/Sources/Yosemite/PointOfSale/Coupons/POSCoupon.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 public struct POSCoupon: Equatable, Hashable {
     public let id: UUID
     public let code: String

Yosemite/Yosemite/PointOfSale/Items/POSSimpleProduct.swift → Modules/Sources/Yosemite/PointOfSale/Items/POSSimpleProduct.swift

@@ -1,3 +1,4 @@
+import Foundation
 import WooFoundation
 import Codegen
 import Networking

Yosemite/Yosemite/PointOfSale/Items/PointOfSaleItemServiceProtocol.swift → Modules/Sources/Yosemite/PointOfSale/Items/PointOfSaleItemServiceProtocol.swift

@@ -1,3 +1,4 @@
+import Foundation
 import struct Networking.PagedItems
 
 public enum POSItem: Equatable, Identifiable, Hashable {

Yosemite/Yosemite/SnapshotsProvider/FetchResultSnapshotsProvider.swift → Modules/Sources/Yosemite/SnapshotsProvider/FetchResultSnapshotsProvider.swift

@@ -1,6 +1,8 @@
+import Foundation
 import Storage
 import CoreData
 import Combine
+import UIKit
 
 /// The mutable (`Storage` model) type that is used by `FetchResultSnapshotsProvider`.
 public typealias FetchResultSnapshotsProviderMutableType = NSManagedObject & ReadOnlyConvertible

Yosemite/Yosemite/Stores/AnnouncementsStore.swift → Modules/Sources/Yosemite/Stores/AnnouncementsStore.swift

@@ -1,3 +1,4 @@
+import Foundation
 import Networking
 import Storage
 

Yosemite/Yosemite/Stores/AppSettingsStore.swift → Modules/Sources/Yosemite/Stores/AppSettingsStore.swift

@@ -1,3 +1,4 @@
+import Foundation
 import Storage
 import Networking
 

Yosemite/Yosemite/Stores/CardPresentPaymentStore.swift → Modules/Sources/Yosemite/Stores/CardPresentPaymentStore.swift

@@ -1,3 +1,4 @@
+import Foundation
 import Storage
 import Hardware
 import Networking

Yosemite/Yosemite/Stores/Helpers/CouponStoreMethods.swift → Modules/Sources/Yosemite/Stores/Helpers/CouponStoreMethods.swift

@@ -1,3 +1,4 @@
+import Foundation
 import Networking
 import Storage
 

Yosemite/Yosemite/Stores/JustInTimeMessageStore.swift → Modules/Sources/Yosemite/Stores/JustInTimeMessageStore.swift

@@ -1,6 +1,7 @@
 import Foundation
 import Storage
 import Networking
+import UIKit
 import WooFoundation
 
 // MARK: - JustInTimeMessageStore

Yosemite/Yosemite/Stores/NotificationCountStore.swift → Modules/Sources/Yosemite/Stores/NotificationCountStore.swift

@@ -1,3 +1,4 @@
+import Foundation
 import Storage
 import Networking
 import WooFoundation

Yosemite/Yosemite/Stores/Order/BundledProductConfiguration.swift → Modules/Sources/Yosemite/Stores/Order/BundledProductConfiguration.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 /// Configuration of a bundled order item from the configuration UI. It contains necessary information to save the configuration remotely.
 public struct BundledProductConfiguration: Equatable {
     public enum ProductOrVariation: Equatable {

Yosemite/Yosemite/Stores/Order/OrderSyncProductInput.swift → Modules/Sources/Yosemite/Stores/Order/OrderSyncProductInput.swift

@@ -1,3 +1,4 @@
+import Foundation
 import Networking
 
 public protocol OrderSyncProductTypeProtocol: Hashable {

Yosemite/Yosemite/Stores/Order/OrdersUpsertUseCase.swift → Modules/Sources/Yosemite/Stores/Order/OrdersUpsertUseCase.swift

@@ -1,3 +1,4 @@
+import Foundation
 import Storage
 import Networking