AINFRA-469 - Simplify Storage into a Swift package - Sources only

Author: mokagio

Storage/Storage.xcodeproj/xcshareddata/xcschemes/Storage.xcscheme renamed to Modules/.swiftpm/xcode/xcshareddata/xcschemes/Storage.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 = "B54CA59820A4BBA500F38CD1"
-               BuildableName = "Storage.framework"
+               BlueprintIdentifier = "Storage"
+               BuildableName = "Storage"
                BlueprintName = "Storage"
-               ReferencedContainer = "container:Storage.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 = "B54CA59820A4BBA500F38CD1"
-            BuildableName = "Storage.framework"
-            BlueprintName = "Storage"
-            ReferencedContainer = "container:Storage.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B54CA5A120A4BBA600F38CD1"
-               BuildableName = "StorageTests.xctest"
-               BlueprintName = "StorageTests"
-               ReferencedContainer = "container:Storage.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 = "B54CA59820A4BBA500F38CD1"
-            BuildableName = "Storage.framework"
-            BlueprintName = "Storage"
-            ReferencedContainer = "container:Storage.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -78,10 +50,10 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B54CA59820A4BBA500F38CD1"
-            BuildableName = "Storage.framework"
+            BlueprintIdentifier = "Storage"
+            BuildableName = "Storage"
             BlueprintName = "Storage"
-            ReferencedContainer = "container:Storage.xcodeproj">
+            ReferencedContainer = "container:">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

Modules/Package.swift

@@ -27,6 +27,10 @@ let package = Package(
             name: "Networking",
             targets: ["Networking"]
         ),
+        .library(
+            name: "Storage",
+            targets: ["Storage"]
+        ),
         .library(
             name: "TestKit",
             targets: ["TestKit"]
@@ -118,6 +122,15 @@ let package = Package(
                 .product(name: "KeychainAccess", package: "KeychainAccess"),
             ]
         ),
+        .target(
+            name: "Storage",
+            dependencies: [
+                "Codegen",
+                "WooFoundation"
+            ],
+            exclude: ["Model/Migrations.md"],
+            resources: [.process("Resources")]
+        ),
         .target(
             name: "TestKit",
             dependencies: ["Difference", "Nimble"]
@@ -204,7 +217,6 @@ enum XcodeTargetNames {
     static let hardwareTests = "HardwareTests"
     static let networkingTests = "NetworkingTests"
     static let notificationExtension = "NotificationExtension"
-    static let storage = "Storage"
     static let storageTests = "StorageTests"
     static let storeWidgetsExtension = "StoreWidgetsExtension"
     static let uiTestsFoundation = "UITestsFoundation"
@@ -227,7 +239,6 @@ enum XcodeSupport {
             XcodeTargetNames.hardwareTests,
             XcodeTargetNames.networkingTests,
             XcodeTargetNames.notificationExtension,
-            XcodeTargetNames.storage,
             XcodeTargetNames.storageTests,
             XcodeTargetNames.storeWidgetsExtension,
             XcodeTargetNames.uiTestsFoundation,
@@ -283,13 +294,12 @@ enum XcodeSupport {
                     .product(name: "KeychainAccess", package: "KeychainAccess"),
                 ]
             ),
-            .xcodeTarget(
-                XcodeTargetNames.storage,
-                dependencies: ["Codegen", "WooFoundation"]
-            ),
             .xcodeTarget(
                 XcodeTargetNames.storageTests,
-                dependencies: ["TestKit", XcodeTargetNames.storage.asDependency]
+                dependencies: [
+                    "Storage",
+                    "TestKit"
+                ]
             ),
             .xcodeTarget(
                 XcodeTargetNames.storeWidgetsExtension,
@@ -313,6 +323,7 @@ enum XcodeSupport {
                     "Codegen",
                     "Experiments",
                     "Networking",
+                    "Storage",
                     "WooFoundation",
                     "WordPressShared",
                     "WordPressUI",
@@ -403,6 +414,7 @@ enum XcodeSupport {
                 dependencies: [
                     "Codegen",
                     "Networking",
+                    "Storage",
                     "WooFoundation",
                     "WordPressShared",
                     .product(name: "Alamofire", package: "Alamofire"),

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

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

Modules/Sources/Storage/Bundle+Storage.swift

@@ -0,0 +1,15 @@
+import Foundation
+
+extension Bundle {
+    static var storage: 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_Storage.bundle") {
+            return bundle
+        }
+#endif
+        return Bundle.module
+
+    }
+}

Storage/Storage/CoreData/CoreDataIterativeMigrator+MigrationStep.swift renamed to Modules/Sources/Storage/CoreData/CoreDataIterativeMigrator+MigrationStep.swift

@@ -146,7 +146,7 @@ private extension CoreDataIterativeMigrator {
     }
 
     func model(for metadata: [String: Any]) throws -> NSManagedObjectModel {
-        let bundle = Bundle(for: CoreDataManager.self)
+        let bundle = Bundle.storage
         guard let sourceModel = NSManagedObjectModel.mergedModel(from: [bundle], forStoreMetadata: metadata) else {
             let description = "Failed to find source model for metadata: \(metadata)"
             throw NSError(domain: "IterativeMigrator", code: 100, userInfo: [NSLocalizedDescriptionKey: description])

Storage/Storage/CoreData/CoreDataIterativeMigrator.swift renamed to Modules/Sources/Storage/CoreData/CoreDataIterativeMigrator.swift

@@ -1,5 +1,6 @@
 import Foundation
 import CoreData
+import UIKit
 import WooFoundation
 
 
@@ -36,7 +37,7 @@ public final class CoreDataManager: StorageManagerType {
             if let modelsInventory {
                 inventory = modelsInventory
             } else {
-                inventory = try .from(packageName: name, bundle: Bundle(for: type(of: self)))
+                inventory = try .from(packageName: name, bundle: .storage)
             }
         } catch {
             // We'll throw a fatalError() because we can't really proceed without a