Skip to content
This repository was archived by the owner on Sep 15, 2025. It is now read-only.

Commit b65746d

Browse files
committed
Move WordPressComRESTAPIInterfacing.h to WordPressKit folder
The SPM-compatible folder structure was giving me trouble when trying to validate the `podspec`. At first, I thought it was simply because `WordPressComRESTAPIInterfacing.h` was not in a path known to CocoaPods. But even after updating the `podspec` to: ```diff @@ -18,9 +18,10 @@ Pod::Spec.new do |s| s.swift_version = '5.0' s.source = { git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', tag: s.version.to_s } - s.source_files = 'WordPressKit/**/*.{h,m,swift}' + + s.source_files = 'WordPressKit/**/*.{h,m,swift}', 'Sources/**/*.{h,m,swift}' + s.public_header_files = 'Sources/**/include/*.h', 'WordPressKit/**/.h', 'WordPressKit/WordPressKit.h' s.private_header_files = 'WordPressKit/Private/*.h' - s.header_dir = 'WordPressKit' s.dependency 'NSObject-SafeExpectations', '~> 0.0.4' s.dependency 'wpxmlrpc', '~> 0.10' ``` I still got errors: ``` - ERROR | xcodebuild: /var/folders/dq/cdqxvx3s5ps75564rpmb_dc00000gn/T/CocoaPods-Lint-20240321-63072-nntpgw-WordPressKit/DerivedData/App/Build/Products/Release-iphonesimulator/WordPressKit/WordPressKit.framework/Headers/WordPressKit.h:10:9: error: 'WordPressKit/ServiceRemoteWordPressComREST.h' file not found ``` In the proof of concept from #738, the SPM folder structure is compatible with CocoaPods. As such, I decided to defer moving the files to when I can do it in one go.
1 parent de1c24c commit b65746d

File tree

2 files changed

+1
-25
lines changed

2 files changed

+1
-25
lines changed

WordPressKit.xcodeproj/project.pbxproj

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,30 +1560,6 @@
15601560
path = Plans;
15611561
sourceTree = "<group>";
15621562
};
1563-
3FFCC0532BABC75F0051D229 /* Sources */ = {
1564-
isa = PBXGroup;
1565-
children = (
1566-
3FFCC0542BABC7680051D229 /* APIInterface */,
1567-
);
1568-
path = Sources;
1569-
sourceTree = "<group>";
1570-
};
1571-
3FFCC0542BABC7680051D229 /* APIInterface */ = {
1572-
isa = PBXGroup;
1573-
children = (
1574-
3FFCC0562BABC7D20051D229 /* include */,
1575-
);
1576-
path = APIInterface;
1577-
sourceTree = "<group>";
1578-
};
1579-
3FFCC0562BABC7D20051D229 /* include */ = {
1580-
isa = PBXGroup;
1581-
children = (
1582-
3FFCC0552BABC78B0051D229 /* WordPressComRESTAPIInterfacing.h */,
1583-
);
1584-
path = include;
1585-
sourceTree = "<group>";
1586-
};
15871563
404057C3221B30140060250C /* Time Interval */ = {
15881564
isa = PBXGroup;
15891565
children = (
@@ -1965,7 +1941,6 @@
19651941
9368C7711EC5EF1B0092CE8E = {
19661942
isa = PBXGroup;
19671943
children = (
1968-
3FFCC0532BABC75F0051D229 /* Sources */,
19691944
FFE247CD20CB1245002DF3A2 /* LICENSE */,
19701945
FFE247CC20CB118A002DF3A2 /* README.md */,
19711946
0C3A2A412A2E7BA500FD91D6 /* CHANGELOG.md */,
@@ -2553,6 +2528,7 @@
25532528
93BD27731EE7388E002BB00B /* WordPressAPI */ = {
25542529
isa = PBXGroup;
25552530
children = (
2531+
3FFCC0552BABC78B0051D229 /* WordPressComRESTAPIInterfacing.h */,
25562532
4A05E7952B2FCB6400C25E3B /* NonceRetrieval.swift */,
25572533
4A05E7992B2FDC3200C25E3B /* WordPressOrgRestApi.swift */,
25582534
93BD27741EE73944002BB00B /* HTTPAuthenticationAlertController.swift */,
File renamed without changes.

0 commit comments

Comments
 (0)