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

Commit efc947b

Browse files
committed
Update podspec for new folder structure
This required fixing the location of the `WPKitLogging*` files, which were public in the project but for some reason in the `Private/` folder and therefore considered private by CocoaPods (failing the bulid).
1 parent 2e928a9 commit efc947b

File tree

6 files changed

+19
-9
lines changed

6 files changed

+19
-9
lines changed

.rubocop.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ Naming/FileName:
1414
Metrics/BlockLength:
1515
Exclude:
1616
- 'fastlane/Fastfile'
17+
- 'WordPressKit.podspec'

WordPressKit.podspec

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ Pod::Spec.new do |s|
1818
s.swift_version = '5.0'
1919

2020
s.source = { git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', tag: s.version.to_s }
21-
s.source_files = 'WordPressKit/**/*.{h,m,swift}'
22-
s.private_header_files = 'WordPressKit/Private/*.h'
23-
s.header_dir = 'WordPressKit'
21+
s.source_files = 'Sources/**/*.{h,m,swift}'
22+
# When headers are not specified, then all headers are considered public.
23+
# The only thing left to do is to explicitly specify those that should be private.
24+
s.private_header_files = 'Sources/Private/*.h'
2425

2526
s.dependency 'NSObject-SafeExpectations', '~> 0.0.4'
2627
s.dependency 'wpxmlrpc', '~> 0.10'

WordPressKit.xcodeproj/project.pbxproj

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,9 +1300,9 @@
13001300
ABD95B8425DD6DA200735BEE /* comment-likes-success.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "comment-likes-success.json"; sourceTree = "<group>"; };
13011301
B5969E1920A49AC4005E9DF1 /* NSString+MD5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+MD5.h"; sourceTree = "<group>"; };
13021302
B5969E1A20A49AC4005E9DF1 /* NSString+MD5.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+MD5.m"; sourceTree = "<group>"; };
1303-
B5A4822A20AC6C0B009D95F6 /* WPKitLogging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WPKitLogging.swift; path = WordPressKit/WPKitLogging.swift; sourceTree = SOURCE_ROOT; };
1304-
B5A4822C20AC6C19009D95F6 /* WPKitLogging.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WPKitLogging.m; path = WordPressKit/WPKitLogging.m; sourceTree = SOURCE_ROOT; };
1305-
B5A4822D20AC6C1A009D95F6 /* WPKitLogging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WPKitLogging.h; path = WordPressKit/WPKitLogging.h; sourceTree = SOURCE_ROOT; };
1303+
B5A4822A20AC6C0B009D95F6 /* WPKitLogging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WPKitLogging.swift; path = Sources/Logging/WPKitLogging.swift; sourceTree = SOURCE_ROOT; };
1304+
B5A4822C20AC6C19009D95F6 /* WPKitLogging.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WPKitLogging.m; path = Sources/Logging/WPKitLogging.m; sourceTree = SOURCE_ROOT; };
1305+
B5A4822D20AC6C1A009D95F6 /* WPKitLogging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WPKitLogging.h; path = Sources/Logging/WPKitLogging.h; sourceTree = SOURCE_ROOT; };
13061306
B76472D20711B6BE2ACDC332 /* Pods-WordPressKitTests.release-internal.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressKitTests.release-internal.xcconfig"; path = "Pods/Target Support Files/Pods-WordPressKitTests/Pods-WordPressKitTests.release-internal.xcconfig"; sourceTree = "<group>"; };
13071307
BA0637EC2492382200AF8419 /* PluginStateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PluginStateTests.swift; sourceTree = "<group>"; };
13081308
BA2A78F924A486D300BB6F53 /* SitePluginTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SitePluginTests.swift; sourceTree = "<group>"; };
@@ -1970,6 +1970,7 @@
19701970
children = (
19711971
3FE2E9352BB10D92002CA2E1 /* WordPressAPI */,
19721972
B5A4821F20AC6B5C009D95F6 /* Private */,
1973+
3FE2E9452BB11BA7002CA2E1 /* Logging */,
19731974
3FE2E93F2BB11038002CA2E1 /* Models */,
19741975
3FE2E9402BB11075002CA2E1 /* Services */,
19751976
3FE2E9412BB110B3002CA2E1 /* Utility */,
@@ -1992,6 +1993,16 @@
19921993
path = Tests;
19931994
sourceTree = "<group>";
19941995
};
1996+
3FE2E9452BB11BA7002CA2E1 /* Logging */ = {
1997+
isa = PBXGroup;
1998+
children = (
1999+
B5A4822A20AC6C0B009D95F6 /* WPKitLogging.swift */,
2000+
B5A4822D20AC6C1A009D95F6 /* WPKitLogging.h */,
2001+
B5A4822C20AC6C19009D95F6 /* WPKitLogging.m */,
2002+
);
2003+
path = Logging;
2004+
sourceTree = "<group>";
2005+
};
19952006
404057C3221B30140060250C /* Time Interval */ = {
19962007
isa = PBXGroup;
19972008
children = (
@@ -2401,9 +2412,6 @@
24012412
B5A4821F20AC6B5C009D95F6 /* Private */ = {
24022413
isa = PBXGroup;
24032414
children = (
2404-
B5A4822A20AC6C0B009D95F6 /* WPKitLogging.swift */,
2405-
B5A4822D20AC6C1A009D95F6 /* WPKitLogging.h */,
2406-
B5A4822C20AC6C19009D95F6 /* WPKitLogging.m */,
24072415
1A4F98662279A87D00D86E8E /* WPKit-Swift.h */,
24082416
);
24092417
path = Private;

0 commit comments

Comments
 (0)