Simplify Hardware into a Swift package - Sources only

Hardware/Hardware.xcodeproj/xcshareddata/xcschemes/HardwareTests.xcscheme

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1640"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:HardwareTests/HardwareTests.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D88FDB0725DD216B00CB0DBD"
+               BuildableName = "HardwareTests.xctest"
+               BlueprintName = "HardwareTests"
+               ReferencedContainer = "container:Hardware.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Hardware/HardwareTests/HardwareTests.xctestplan

@@ -0,0 +1,24 @@
+{
+  "configurations" : [
+    {
+      "id" : "395D5794-483E-4BA1-9702-5094F9A31112",
+      "name" : "Test Scheme Action",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:Hardware.xcodeproj",
+        "identifier" : "D88FDB0725DD216B00CB0DBD",
+        "name" : "HardwareTests"
+      }
+    }
+  ],
+  "version" : 1
+}

Modules/.swiftpm/xcode/xcshareddata/xcschemes/Hardware.xcscheme

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1640"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "Hardware"
+               BuildableName = "Hardware"
+               BlueprintName = "Hardware"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "Hardware"
+            BuildableName = "Hardware"
+            BlueprintName = "Hardware"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Modules/Package.swift

@@ -19,6 +19,10 @@ let package = Package(
             name: "Experiments",
             targets: ["Experiments"]
         ),
+        .library(
+            name: "Hardware",
+            targets: ["Hardware"]
+        ),
         .library(
             name: "NetworkingCore",
             targets: ["NetworkingCore"]
@@ -99,6 +103,15 @@ let package = Package(
                 .product(name: "AutomatticTracks", package: "Automattic-Tracks-iOS"),
             ]
         ),
+        .target(
+            name: "Hardware",
+            dependencies: [
+                "Codegen",
+                .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
+                .product(name: "StripeTerminal", package: "stripe-terminal-ios")
+            ],
+            resources: [.process("Resources")]
+        ),
         .target(
             name: "Networking",
             dependencies: [
@@ -213,7 +226,6 @@ let package = Package(
 
 enum XcodeTargetNames {
     static let fakes = "Fakes"
-    static let hardware = "Hardware"
     static let hardwareTests = "HardwareTests"
     static let networkingTests = "NetworkingTests"
     static let notificationExtension = "NotificationExtension"
@@ -235,7 +247,6 @@ enum XcodeSupport {
     static var products: [Product] {
         [
             XcodeTargetNames.fakes,
-            XcodeTargetNames.hardware,
             XcodeTargetNames.hardwareTests,
             XcodeTargetNames.networkingTests,
             XcodeTargetNames.notificationExtension,
@@ -260,21 +271,16 @@ enum XcodeSupport {
                 XcodeTargetNames.fakes,
                 dependencies: [
                     "Codegen",
+                    "Hardware",
                     "Networking",
                 ]
             ),
             .xcodeTarget(
-                XcodeTargetNames.hardware,
+                XcodeTargetNames.hardwareTests,
                 dependencies: [
-                    "Codegen",
-                    .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
-                    .product(name: "StripeTerminal", package: "stripe-terminal-ios")
+                    "Hardware"
                 ]
             ),
-            .xcodeTarget(
-                XcodeTargetNames.hardwareTests,
-                dependencies: [XcodeTargetNames.hardware.asDependency]
-            ),
             .xcodeTarget(
                 XcodeTargetNames.networkingTests,
                 dependencies: [
@@ -322,6 +328,7 @@ enum XcodeSupport {
                 dependencies: [
                     "Codegen",
                     "Experiments",
+                    "Hardware",
                     "Networking",
                     "Storage",
                     "WooFoundation",
@@ -413,6 +420,7 @@ enum XcodeSupport {
                 XcodeTargetNames.yosemite,
                 dependencies: [
                     "Codegen",
+                    "Hardware",
                     "Networking",
                     "Storage",
                     "WooFoundation",

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

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

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

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

Modules/Sources/Hardware/Bundle+Hardware.swift

@@ -0,0 +1,15 @@
+import Foundation
+
+extension Bundle {
+    static var hardware: Bundle {
+#if DEBUG
+        // Workaround for https://forums.swift.org/t/swift-5-3-swiftpm-resources-in-tests-uses-wrong-bundle-path/37051
+        if let testBundlePath = ProcessInfo.processInfo.environment["XCTestBundlePath"],
+           let bundle = Bundle(path: "\(testBundlePath)/Modules_Hardware.bundle") {
+            return bundle
+        }
+#endif
+        return Bundle.module
+
+    }
+}

Hardware/Hardware/CardReader/CardBrand.swift → Modules/Sources/Hardware/CardReader/CardBrand.swift

@@ -1,4 +1,5 @@
 import Codegen
+import Foundation
 
 /// The various card brands for a card.
 @frozen public enum CardBrand: String, CaseIterable, Codable, GeneratedFakeable {
@@ -34,13 +35,9 @@ import Codegen
 }
 
 extension CardBrand {
-    // The initializer for Bundle only works with class types.
-    // We use this class as a shortcut to find the bundle for the CardBrand enum type
-    private class _Bundle {}
 
     private var iconURL: URL! {
-        Bundle(for: CardBrand._Bundle.self)
-            .url(forResource: iconName, withExtension: "svg")
+        Bundle.hardware.url(forResource: iconName, withExtension: "svg")
     }
 
     /// Icon that represents the brand in SVG format

Hardware/Hardware/CardReader/CardPresentTransactionDetails.swift → Modules/Sources/Hardware/CardReader/CardPresentTransactionDetails.swift

@@ -1,4 +1,5 @@
 import Codegen
+import Foundation
 
 /// An object representing details from a transaction using a card_present payment method.
 public struct CardPresentTransactionDetails: Codable, Equatable, GeneratedFakeable {

Hardware/Hardware/CardReader/CardReaderConfigProvider.swift → Modules/Sources/Hardware/CardReader/CardReaderConfigProvider.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 /// Abstraction provided by Hardware so that clients of this library
 /// can model a way to provide a connection token.
 /// It is meant to abstract an implementation of the [adapter pattern](https://en.wikipedia.org/wiki/Adapter_pattern)

Hardware/Hardware/CardReader/CardReaderService.swift → Modules/Sources/Hardware/CardReader/CardReaderService.swift

@@ -1,4 +1,5 @@
 import Combine
+import Foundation
 
 /// Abstracts the integration with a Card Reader
 public protocol CardReaderService {

Hardware/Hardware/CardReader/CardReaderServiceError.swift → Modules/Sources/Hardware/CardReader/CardReaderServiceError.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 /// Models errors thrown by the CardReaderService.
 /// It identifies the interaction with the card reader
 /// where the error was thrown.

Hardware/Hardware/CardReader/CurrencyCode.swift → Modules/Sources/Hardware/CardReader/CurrencyCode.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 /// A property wrapper to return a string as lowercased.
 /// This checks also that the currency code is one of the codes
 /// returned by Locale.isoCurrencyCodes. If it isn't, it will return an empty string

Hardware/Hardware/CardReader/Email.swift → Modules/Sources/Hardware/CardReader/Email.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 /// A property wrapper to validate that a property is a valid email
 /// Property Wrappers can not throw, so
 /// what this wrapper does is return a nil when trying to set an invalid

Hardware/Hardware/CardReader/PaymentIntent.swift → Modules/Sources/Hardware/CardReader/PaymentIntent.swift

@@ -1,4 +1,5 @@
 import Codegen
+import Foundation
 
 /// A PaymentIntent tracks the process of collecting a payment from your customer.
 /// We would create exactly one PaymentIntent for each order

Hardware/Hardware/CardReader/PaymentIntentParameters.swift → Modules/Sources/Hardware/CardReader/PaymentIntentParameters.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 /// Encapsulates the parameters needed to create a PaymentIntent
 /// The Stripe Terminal SDK provides support for several parameters
 /// i.e. metadata,onBehalfOf...

Hardware/Hardware/CardReader/StatementDescriptor.swift → Modules/Sources/Hardware/CardReader/StatementDescriptor.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 /// A property wrapper to return a string where:
 /// - The characters <>"' are replaced.
 /// - The maximum length of the string is 22 characters

Hardware/Hardware/CardReader/StripeCardReader/NoOpCardReaderService.swift → Modules/Sources/Hardware/CardReader/StripeCardReader/NoOpCardReaderService.swift

@@ -1,4 +1,6 @@
 import Combine
+import Foundation
+
 /// A no-op replacement for the adapter wrapping the Stripe Terminal SDK
 public struct NoOpCardReaderService: CardReaderService {
     // MARK: - Queries