Move all remaining frameworks to SwiftPM modules #15678

mokagio · 2025-05-27T19:23:19Z

Description

Moves the following frameworks and their tests to Swift packages in Modules/:

Networking
Storage
Hardware
Fakes
UITestsFoundation

The only framework that hasn't been moved is WordPressAuthenticator because of circular Obective-C-Swift dependencies. Addressing that is out of scope.

Steps to reproduce

Testing information

Screenshots

I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

dangermattic · 2025-05-27T19:24:05Z

	2 Warnings
⚠️	View files have been modified, but no screenshot or video is included in the pull request. Consider adding some for clarity.
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.

	1 Message
📖	This PR is still a Draft: some checks will be skipped.

Generated by 🚫 Danger

wpmobilebot · 2025-05-27T19:33:11Z

📲 You can test the changes from this Pull Request in WooCommerce iOS Prototype by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce iOS Prototype
	Build Number	`30381`
	Version	`PR #15678`
	Bundle ID	`com.automattic.alpha.woocommerce`
	Commit	`47efd82`
	Installation URL	0to5qpueqt4jg

Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

mokagio · 2025-06-07T04:29:44Z

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

-project:
-    file: ../../../../../Hardware/Hardware.xcodeproj
-    target:
-        name: Hardware
+sources:
+    include:
+        - ../../../../../Modules/Sources/Hardware/


See #15707 for the motivation of these and all the other changes to the Sourcery configuration files.

mokagio · 2025-06-07T04:31:05Z

Modules/Sources/Fakes/Networking.generated.swift

-            gravatarUrl: .fake()
-        )
-    }
-}


All the types removed from here went into NetworkingCore.

mokagio · 2025-06-10T20:17:17Z

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

+               BlueprintIdentifier = "Hardware"
+               BuildableName = "Hardware"
+               BlueprintName = "Hardware"
+               ReferencedContainer = "container:">


A bit frustrating the diff considers this the Storage scheme being moved and update to Hardware, rather than it being the Hardware scheme being moved.

Or maybe something got lost in creating the schemes for the modules and that's why the diff can't pair them 🤔

mokagio · 2025-06-10T20:27:07Z

Modules/Sources/NetworkingCore/Validators/PlaceholderDataValidator.swift

+    public func validate(data: Data) throws {
+        // no-op
+    }
+}


This looks like a new file, but existed already. I guess the new init and the various public are too much for the diff engine.

woocommerce-ios/Networking/Sources/Core/Validators/PlaceholderDataValidator.swift

Lines 1 to 9 in ae05dab

import Foundation

/// Placeholder implementation for `ResponseDataValidator`.

///

final class PlaceholderDataValidator: ResponseDataValidator {

func validate(data: Data) throws {

// no-op

}

}

mokagio · 2025-06-10T20:33:16Z

Modules/Tests/StorageTests/Tools/FileStorageTests.swift

@@ -10,7 +10,7 @@ final class FileStorageTests: XCTestCase {
    override func setUp() {
        super.setUp()
        subject = PListFileStorage()
-        fileURL = Bundle(for: FileStorageTests.self)
+        fileURL = Bundle.module


Uses .module instead of .storage because in this case we want to load from the test module, not the Storage module under test.

mokagio · 2025-06-10T20:34:47Z

WooCommerce/WooCommerceTests/Constants.swift

+    /// Default Expectation Timeout
+    ///
+    static let expectationTimeout = TimeInterval(10)
+}


Was referenced from Yosemite. Duplicated it for clarity.

mokagio · 2025-06-10T20:47:30Z

Modules/Sources/Networking/Extensions/URLRequest+Request.swift

+    public func responseDataValidator() -> ResponseDataValidator {
+        PlaceholderDataValidator()
+    }
+}


Looks like a new file but is a modification of an existing one:

woocommerce-ios/Networking/Sources/Extended/Extensions/URLRequest+Request.swift

Lines 1 to 8 in ae05dab

import Foundation

/// Makes URLRequest conform to Request.

extension URLRequest: Request {

func responseDataValidator() -> ResponseDataValidator {

PlaceholderDataValidator()

}

}

…esConfigurationViewModel`.

Tests fail because of Fakes, which hasn't been migrated yet.

This is required to make the watchOS app compile with the new setup. Before, the code relied on `canImport(Aztec)`, but that check always passes in SwiftPM.

Tests fail because of the dependency on Fakes

It was simpler than iterating build after build to identify the ones that needed it.

mokagio force-pushed the temp-branch-for-swiftpm-migration branch 5 times, most recently from edf38c1 to be91cf8 Compare June 2, 2025 02:44

This was referenced Jun 3, 2025

AINFRA-674 - Update Codegen for WooFoundation and Networking #15707

Merged

Simplify Experiments into a Swift package #15622

Merged

mokagio force-pushed the temp-branch-for-swiftpm-migration branch 4 times, most recently from b0bc779 to 8fb55fd Compare June 7, 2025 03:54

mokagio changed the title ~~WIP PR to run CI on modular migration~~ Move all remaining frameworks to SwiftPM modules Jun 7, 2025

mokagio commented Jun 7, 2025

View reviewed changes

mokagio force-pushed the temp-branch-for-swiftpm-migration branch from 8fb55fd to dad29d7 Compare June 9, 2025 21:28

mokagio added this to the 22.7 milestone Jun 9, 2025

mokagio added the category: tooling Anything that involves building & maintaining the project, including scripts, `Fastfile`, etc. label Jun 9, 2025

mokagio force-pushed the temp-branch-for-swiftpm-migration branch 3 times, most recently from 95edd0f to 5036ef3 Compare June 10, 2025 06:35

mokagio mentioned this pull request Jun 10, 2025

Skip tests in code rather than in test plan for Networking #15725

Merged

1 task

mokagio force-pushed the temp-branch-for-swiftpm-migration branch from 5036ef3 to 95e7c48 Compare June 10, 2025 20:05

mokagio commented Jun 10, 2025

View reviewed changes

mokagio force-pushed the temp-branch-for-swiftpm-migration branch from 95e7c48 to 5c36aba Compare June 10, 2025 20:52

mokagio force-pushed the temp-branch-for-swiftpm-migration branch 2 times, most recently from 4c41378 to 4229c39 Compare June 12, 2025 03:01

jaclync and others added 12 commits June 12, 2025 15:12

Remove unused POSEligibilityCheckerProtocol use case in `BetaFeatur…

d4f3694

…esConfigurationViewModel`.

Simplify Networking into a Swift package in Modules - Tests fail

5663ddf

Tests fail because of Fakes, which hasn't been migrated yet.

Point Aztec to version that export UIKit-less HTMLParser

6fa9c77

This is required to make the watchOS app compile with the new setup. Before, the code relied on `canImport(Aztec)`, but that check always passes in SwiftPM.

AINFRA-469 - Simplify Storage into a Swift package

79db508

AINFRA-510 - Simplify Hardware into a Swift module

e972647

AINFRA-468 - Simplify Yosemite into a Swift package - Tests fail

1f2d8b2

Tests fail because of the dependency on Fakes

AINFRA-473 - Simply Fakes into a Swift package

ad0fa93

Brute force @testable import NetworkingCore in all Networking tests

9f8fe6d

It was simpler than iterating build after build to identify the ones that needed it.

Track Package.resolved change—however unsure of source

91b9a49

AINFRA-672 - Simplify UITestsFoundation into a Swift package

066f361

Make missing NetworkingCore elements fakeable

84c83b9

Remove an unnecessary import

47efd82

mokagio force-pushed the temp-branch-for-swiftpm-migration branch from 4229c39 to 47efd82 Compare June 12, 2025 05:13

This was referenced Jun 17, 2025

Simplify Storage into a Swift package - Sources only #15742

Merged

Simplify Hardware into a Swift package - Sources only #15744

Merged

Simplify Yosemite into a Swift package - Sources only #15755

Merged

Simplify Fakes into a Swift package #15772

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Move all remaining frameworks to SwiftPM modules #15678

Move all remaining frameworks to SwiftPM modules #15678

Uh oh!

mokagio commented May 27, 2025 •

edited

Loading

Uh oh!

dangermattic commented May 27, 2025 •

edited

Loading

Uh oh!

wpmobilebot commented May 27, 2025 •

edited

Loading

Uh oh!

mokagio Jun 7, 2025

Uh oh!

mokagio Jun 7, 2025

Uh oh!

mokagio Jun 10, 2025

Uh oh!

mokagio Jun 10, 2025 •

edited

Loading

Uh oh!

mokagio Jun 10, 2025

Uh oh!

mokagio Jun 10, 2025

Uh oh!

mokagio Jun 10, 2025

Uh oh!

Uh oh!

	import Foundation

	/// Placeholder implementation for `ResponseDataValidator`.
	///
	final class PlaceholderDataValidator: ResponseDataValidator {
	func validate(data: Data) throws {
	// no-op
	}
	}

	import Foundation

	/// Makes URLRequest conform to Request.
	extension URLRequest: Request {
	func responseDataValidator() -> ResponseDataValidator {
	PlaceholderDataValidator()
	}
	}

Move all remaining frameworks to SwiftPM modules #15678

Are you sure you want to change the base?

Move all remaining frameworks to SwiftPM modules #15678

Uh oh!

Conversation

mokagio commented May 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Steps to reproduce

Testing information

Screenshots

Uh oh!

dangermattic commented May 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented May 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mokagio Jun 7, 2025

Choose a reason for hiding this comment

Uh oh!

mokagio Jun 7, 2025

Choose a reason for hiding this comment

Uh oh!

mokagio Jun 10, 2025

Choose a reason for hiding this comment

Uh oh!

mokagio Jun 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mokagio Jun 10, 2025

Choose a reason for hiding this comment

Uh oh!

mokagio Jun 10, 2025

Choose a reason for hiding this comment

Uh oh!

mokagio Jun 10, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mokagio commented May 27, 2025 •

edited

Loading

dangermattic commented May 27, 2025 •

edited

Loading

wpmobilebot commented May 27, 2025 •

edited

Loading

mokagio Jun 10, 2025 •

edited

Loading