Skip to content

Simplify Networking into a Swift package - Sources only #15737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jun 18, 2025
+2,021 −4,896
Merged

Simplify Networking into a Swift package - Sources only #15737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fba376c
AINFRA-470 - Make Networking into a Swift package - Sources only
mokagio Jun 12, 2025
ba2beae
Add `@testable import NetworkingCore` to all Networking tests
mokagio Jun 12, 2025
d939a7c
Add necessary `@testable import NetworkingCore` to YosemiteTests
mokagio Jun 12, 2025
c6c44bf
Remove unused method from `Loader`
mokagio Jun 12, 2025
a04ef3a
Convert Responses in Networking tests to a synced folder
mokagio Jun 12, 2025
1419b3e
Remove a commented import
mokagio Jun 12, 2025
99fb51a
Remove dead references to Networking.framework
mokagio Jun 13, 2025
ceb66ef
Remove Networking scheme from Networking project
mokagio Jun 13, 2025
1c2f4e6
Update architecture docs Networking reference
mokagio Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .swiftlint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ excluded:
- DerivedData
- fastlane
- Modules/.build
- Modules/DerivedData
- Pods
- Scripts
# Automattic's CI caching setup may generate this in the project folder
Expand Down
10 changes: 4 additions & 6 deletions Fakes/Fakes.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
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 */; };
26CA6D3625F6C93C00B01F48 /* Networking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26CA6D3525F6C93C00B01F48 /* Networking.framework */; };
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 */; };
3F37E1232DEEAC7200D8BF2B /* WooFoundationCore.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F37E1222DEEAC7200D8BF2B /* WooFoundationCore.generated.swift */; };
3F38F3742DFA9E0800E0FE41 /* NetworkingCore.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F38F3732DFA9E0800E0FE41 /* NetworkingCore.generated.swift */; };
Copy link
Contributor Author

@mokagio mokagio Jun 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Splitting Networking in two requires adding the new NetworkingCore to the Fakes framework.

/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
Expand All @@ -41,12 +41,11 @@
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>"; };
26CA6D3325F6C92100B01F48 /* Networking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Networking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Copy link
Contributor

@joshheald joshheald Jun 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these just duplicate declarations? I see it's still in the project.

Copy link
Contributor Author

@mokagio mokagio Jun 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see it on my end:

image

(In the screenshot, Xcode gives the link to a PR, but you can see my local is on trunk)

These Networking.framework references represented the target dependency. Here's how they looked like:

image

26CA6D3525F6C93C00B01F48 /* Networking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Networking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
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>"; };
3F38F3732DFA9E0800E0FE41 /* NetworkingCore.generated.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkingCore.generated.swift; sourceTree = "<group>"; };
3FA7DA002D547F2600CE5611 /* Fakes.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Fakes.xcconfig; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand All @@ -57,7 +56,6 @@
files = (
3F2B4AC22DDC30B200E5E49C /* XcodeTarget_Fakes in Frameworks */,
26EEDC8D26FE1C1C00D5BA0E /* Yosemite.framework in Frameworks */,
26CA6D3625F6C93C00B01F48 /* Networking.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -95,6 +93,7 @@
26CA6D2D25F6C8FB00B01F48 /* Fake.swift */,
02B5147D2825532A00750B71 /* Hardware.generated.swift */,
26EEDC8E26FE1C7B00D5BA0E /* Networking.generated.swift */,
3F38F3732DFA9E0800E0FE41 /* NetworkingCore.generated.swift */,
26EEDC8F26FE1C7B00D5BA0E /* Yosemite.generated.swift */,
20AD34D02B0CD9AF00F38F44 /* WooFoundation.generated.swift */,
3F37E1222DEEAC7200D8BF2B /* WooFoundationCore.generated.swift */,
Expand All @@ -110,8 +109,6 @@
isa = PBXGroup;
children = (
26EEDC8C26FE1C1C00D5BA0E /* Yosemite.framework */,
26CA6D3525F6C93C00B01F48 /* Networking.framework */,
26CA6D3325F6C92100B01F48 /* Networking.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -207,6 +204,7 @@
20AD34D12B0CD9AF00F38F44 /* WooFoundation.generated.swift in Sources */,
26106B3D25FA4F6C0000DF30 /* ProductFactory.swift in Sources */,
26EEDC9126FE1C7B00D5BA0E /* Yosemite.generated.swift in Sources */,
3F38F3742DFA9E0800E0FE41 /* NetworkingCore.generated.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Loading