Skip to content

Commit 47fb8f4

Browse files
committed
Move Modules package reference from workspace to project
1 parent 2559688 commit 47fb8f4

File tree

5 files changed

+34
-40
lines changed

5 files changed

+34
-40
lines changed

.gitignore

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,6 @@ WordPress/InfoPlist-internal.h
125125
# and assume no local copy would have generated the Pods.
126126
Pods/
127127

128-
# Modules — Where the Swift packages that make up the modular app live
129-
#
130-
# Ignore the Package.resolved file. The packages source of truth is the
131-
# resolved file generated by the Xcode workspace.
132-
Modules/Package.resolved
133-
134128
# While we depend on gutenberg-mobile, we download its XCFrameworks in
135129
# WordPress/Frameworks
136130
WordPress/Frameworks/*.xcframework

WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved renamed to Modules/Package.resolved

Lines changed: 28 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Modules/Package.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ let package = Package(
4848
.package(url: "https://github.com/wordpress-mobile/MediaEditor-iOS", branch: "task/spm-support"),
4949
.package(url: "https://github.com/wordpress-mobile/NSObject-SafeExpectations", from: "0.0.6"),
5050
.package(url: "https://github.com/wordpress-mobile/NSURL-IDN", revision: "b34794c9a3f32312e1593d4a3d120572afa0d010"),
51-
.package(url: "https://github.com/wordpress-mobile/WordPressKit-iOS", branch: "wpios-edition"),
51+
.package(
52+
url: "https://github.com/wordpress-mobile/WordPressKit-iOS",
53+
revision: "5bc08764d2025e21685816065f611e884c8672d1" // see wpios-edition branch
54+
),
5255
.package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"),
5356
// We can't use wordpress-rs branches nor commits here. Only tags work.
5457
.package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20250411"),

WordPress.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

WordPress/WordPress.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -804,6 +804,7 @@
804804
3F9DD3F62CC214BF00DF1760 /* Common.debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.debug.xcconfig; sourceTree = "<group>"; };
805805
3F9DD3F72CC2188400DF1760 /* Common.alpha.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.alpha.xcconfig; sourceTree = "<group>"; };
806806
3FA640652670CEFE0064401E /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
807+
3FD4B20E2DCC468200781DFA /* Modules */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Modules; path = ../Modules; sourceTree = SOURCE_ROOT; };
807808
406A0EEF224D39C50016AD6A /* Flags.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Flags.xcassets; sourceTree = "<group>"; };
808809
433840C622C2BA5B00CB13F8 /* AppImages.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = AppImages.xcassets; path = Resources/AppImages.xcassets; sourceTree = "<group>"; };
809810
4A690C142BA790BC00A8E0C5 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
@@ -1606,6 +1607,7 @@
16061607
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
16071608
isa = PBXGroup;
16081609
children = (
1610+
3FD4B20E2DCC468200781DFA /* Modules */,
16091611
0C5C46FB2D98395300F2CD55 /* Sources */,
16101612
0C5A19CB2D9B07E700C25301 /* Tests */,
16111613
F14B5F6F208E648200439554 /* config */,

0 commit comments

Comments
 (0)