Skip to content

Commit ae6f07a

Browse files
mokagiomokagio
committed
Convert WordPressData from Swift package to Xcode target
To much Objective-C code using logic implemented elsewhere in Swift for us to be able to move the files in two separate Objective-C- and Swift- only packages. Refer to #24166 as an experiment for this that shows the various build failure that even a partial attempt at moving some files results in.
1 parent 8c0e8ba commit ae6f07a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+696
-68
lines changed

‎Modules/Package.swift

+5-10
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ let package = Package(
1515
.library(name: "NotificationServiceExtensionCore", targets: ["NotificationServiceExtensionCore"]),
1616
.library(name: "ShareExtensionCore", targets: ["ShareExtensionCore"]),
1717
.library(name: "SFHFKeychainUtils", targets: ["SFHFKeychainUtils"]),
18-
.library(name: "WordPressData", targets: ["WordPressData"]),
1918
.library(name: "WordPressFlux", targets: ["WordPressFlux"]),
2019
.library(name: "WordPressShared", targets: ["WordPressShared"]),
2120
.library(name: "WordPressUI", targets: ["WordPressUI"]),
@@ -98,14 +97,6 @@ let package = Package(
9897
.product(name: "ScreenObject", package: "ScreenObject"),
9998
.product(name: "XCUITestHelpers", package: "ScreenObject"),
10099
], swiftSettings: [.swiftLanguageMode(.v5)]),
101-
.target(name: "WordPressDataObjC"),
102-
.target(
103-
name: "WordPressData",
104-
dependencies: [
105-
.target(name: "WordPressDataObjC"),
106-
.target(name: "WordPressSharedObjC")
107-
]
108-
),
109100
.target(name: "WordPressFlux", swiftSettings: [.swiftLanguageMode(.v5)]),
110101
.target(name: "WordPressCore", dependencies: [.target(name: "WordPressShared"), .product(name: "WordPressAPI", package: "wordpress-rs")]),
111102
.target(name: "WordPressSharedObjC", resources: [.process("Resources")], swiftSettings: [.swiftLanguageMode(.v5)]),
@@ -166,6 +157,7 @@ enum XcodeSupport {
166157
.library(name: "XcodeTarget_WordPressTests", targets: ["XcodeTarget_WordPressTests"]),
167158
.library(name: "XcodeTarget_WordPressAuthentificator", targets: ["XcodeTarget_WordPressAuthentificator"]),
168159
.library(name: "XcodeTarget_WordPressAuthentificatorTests", targets: ["XcodeTarget_WordPressAuthentificatorTests"]),
160+
.library(name: "XcodeTarget_WordPressData", targets: ["XcodeTarget_WordPressData"]),
169161
.library(name: "XcodeTarget_ShareExtension", targets: ["XcodeTarget_ShareExtension"]),
170162
.library(name: "XcodeTarget_DraftActionExtension", targets: ["XcodeTarget_DraftActionExtension"]),
171163
.library(name: "XcodeTarget_NotificationServiceExtension", targets: ["XcodeTarget_NotificationServiceExtension"]),
@@ -220,7 +212,6 @@ enum XcodeSupport {
220212
"NotificationServiceExtensionCore",
221213
"SFHFKeychainUtils",
222214
"ShareExtensionCore",
223-
"WordPressData",
224215
"WordPressFlux",
225216
"WordPressShared",
226217
"WordPressReader",
@@ -266,6 +257,10 @@ enum XcodeSupport {
266257
]),
267258
.xcodeTarget("XcodeTarget_WordPressAuthentificator", dependencies: wordPresAuthentificatorDependencies),
268259
.xcodeTarget("XcodeTarget_WordPressAuthentificatorTests", dependencies: wordPresAuthentificatorDependencies + testDependencies),
260+
.xcodeTarget(
261+
"XcodeTarget_WordPressData",
262+
dependencies: ["WordPressShared"]
263+
),
269264
.xcodeTarget("XcodeTarget_ShareExtension", dependencies: shareAndDraftExtensionsDependencies),
270265
.xcodeTarget("XcodeTarget_DraftActionExtension", dependencies: shareAndDraftExtensionsDependencies),
271266
.xcodeTarget("XcodeTarget_NotificationServiceExtension", dependencies: [

‎Modules/Sources/WordPressData/WordPressData.swift

-1
This file was deleted.

‎Modules/Sources/XcodeSupport/XcodeTarget_WordPressData/Empty.swift

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import Foundation
2+
3+
public struct __Empty {}

‎WordPress/Classes/Categories/Media+Extensions.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#import "Media+Extensions.h"
22
#import "MediaService.h"
33
#import "Blog.h"
4-
@import WordPressDataObjC;
4+
@import WordPressData;
55
@import WordPressShared;
66
#import "WordPress-Swift.h"
77

‎WordPress/Classes/Models/AbstractPost.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#import "AbstractPost.h"
22
#import "Media.h"
3-
@import WordPressDataObjC;
3+
@import WordPressData;
44
#import "WordPress-Swift.h"
55
#import "BasePost.h"
66

‎WordPress/Classes/Models/BasePost.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#import "BasePost.h"
22
#import "Media.h"
3-
@import WordPressDataObjC;
3+
@import WordPressData;
44

55
@import WordPressShared;
66

‎WordPress/Classes/Models/Blog/Blog.m

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#import "Blog.h"
22
#import "WPAccount.h"
33
#import "AccountService.h"
4-
@import WordPressDataObjC;
4+
@import WordPressData;
55
@import WordPressShared;
66
#import "WordPress-Swift.h"
77
@import SFHFKeychainUtils;
@@ -151,7 +151,7 @@ - (void)didTurnIntoFault
151151

152152
- (NSNumber *)organizationID {
153153
NSNumber *organizationID = [self primitiveValueForKey:@"organizationID"];
154-
154+
155155
if (organizationID == nil) {
156156
return @0;
157157
} else {
@@ -184,7 +184,7 @@ - (NSString *)displayURL
184184
DDLogInfo(@"Blog display URL is nil");
185185
return nil;
186186
}
187-
187+
188188
NSError *error = nil;
189189
NSRegularExpression *protocol = [NSRegularExpression regularExpressionWithPattern:@"http(s?)://" options:NSRegularExpressionCaseInsensitive error:&error];
190190
NSString *result = [NSString stringWithFormat:@"%@", [protocol stringByReplacingMatchesInString:self.url options:0 range:NSMakeRange(0, [self.url length]) withTemplate:@""]];
@@ -302,7 +302,7 @@ - (NSArray *)sortedPostFormats
302302
}
303303

304304
- (NSArray *)sortedPostFormatNames
305-
{
305+
{
306306
return [[self sortedPostFormats] wp_map:^id(NSString *key) {
307307
return self.postFormats[key];
308308
}];
@@ -800,7 +800,7 @@ - (NSSet *)allowedFileTypes
800800
if (!allowedFileTypes || allowedFileTypes.count == 0) {
801801
return nil;
802802
}
803-
803+
804804
return [NSSet setWithArray:allowedFileTypes];
805805
}
806806

@@ -838,7 +838,7 @@ - (NSString *)logDescription
838838
- (NSString *)supportDescription
839839
{
840840
// Gather information
841-
841+
842842
NSString *blogType = [NSString stringWithFormat:@"Type: (%@)", [self stateDescription]];
843843
NSString *urlType = [self wordPressComRestApi] ? @"REST" : @"Self-hosted";
844844
NSString *url = [NSString stringWithFormat:@"URL: %@", self.url];
@@ -850,14 +850,14 @@ - (NSString *)supportDescription
850850
} else {
851851
username = [self.jetpack connectedUsername];
852852
}
853-
853+
854854
NSString *jetpackVersion;
855855
if ([self.jetpack isInstalled]) {
856856
jetpackVersion = [NSString stringWithFormat:@"Jetpack-version: %@", [self.jetpack version]];
857857
}
858-
858+
859859
// Add information to array in the order we want to display it.
860-
860+
861861
NSMutableArray *blogInformation = [[NSMutableArray alloc] init];
862862
[blogInformation addObject:blogType];
863863
if (username) {
@@ -871,7 +871,7 @@ - (NSString *)supportDescription
871871
if (jetpackVersion) {
872872
[blogInformation addObject:jetpackVersion];
873873
}
874-
874+
875875
// Combine and return.
876876
return [NSString stringWithFormat:@"<%@>", [blogInformation componentsJoinedByString:@" "]];
877877
}
@@ -881,16 +881,16 @@ - (NSString *)stateDescription
881881
if (self.account) {
882882
return @"wpcom";
883883
}
884-
884+
885885
if ([self.jetpack isConnected]) {
886886
NSString *apiType = [self wordPressComRestApi] ? @"REST" : @"XML-RPC";
887887
return [NSString stringWithFormat:@"jetpack_connected - %@", apiType];
888888
}
889-
889+
890890
if ([self.jetpack isInstalled]) {
891891
return @"self-hosted - jetpack_installed";
892892
}
893-
893+
894894
return @"self_hosted";
895895
}
896896

‎WordPress/Classes/Models/Media.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#import "Media.h"
2-
@import WordPressDataObjC;
2+
@import WordPressData;
33
#import "WordPress-Swift.h"
44

55
@implementation Media

‎WordPress/Classes/Models/ReaderPost.m

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#import "ReaderPost.h"
2-
@import WordPressDataObjC;
2+
#import "AccountService.h"
3+
@import WordPressData;
34
#import "SourcePostAttribution.h"
45
#import "WPAccount.h"
56
#import "WordPress-Swift.h"

‎WordPress/Classes/Models/Theme.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#import "Theme.h"
22
#import "Blog.h"
3-
@import WordPressDataObjC;
3+
@import WordPressData;
44
#import "WPAccount.h"
55
#import "AccountService.h"
66
#import "WordPress-Swift.h"

‎WordPress/Classes/Services/AccountService.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#import <Foundation/Foundation.h>
2-
@import WordPressDataObjC;
2+
@import WordPressData;
33

44
NS_ASSUME_NONNULL_BEGIN
55

‎WordPress/Classes/Services/AccountService.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#import "AccountService.h"
22
#import "WPAccount.h"
3-
@import WordPressDataObjC;
3+
@import WordPressData;
44
#import "Blog.h"
55
#import "BlogService.h"
66

‎WordPress/Classes/Services/BlogService.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#import <Foundation/Foundation.h>
22
#import "Blog.h"
3-
@import WordPressDataObjC;
3+
@import WordPressData;
44

55
NS_ASSUME_NONNULL_BEGIN
66

‎WordPress/Classes/Services/BlogService.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#import "Blog.h"
33
#import "WPAccount.h"
44
#import "AccountService.h"
5-
@import WordPressDataObjC;
5+
@import WordPressData;
66
#import "WPError.h"
77
#import "Media.h"
88
#import "PostCategoryService.h"

‎WordPress/Classes/Services/CommentService.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#import <Foundation/Foundation.h>
22
#import "CoreDataService.h"
3-
@import WordPressDataObjC;
3+
@import WordPressData;
44

55
NS_ASSUME_NONNULL_BEGIN
66

‎WordPress/Classes/Services/CommentService.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#import "CommentService.h"
22
#import "AccountService.h"
33
#import "Blog.h"
4-
@import WordPressDataObjC;
4+
@import WordPressData;
55
#import "ReaderPost.h"
66
#import "WPAccount.h"
77
#import "PostService.h"

‎WordPress/Classes/Services/Facades/BlogSyncFacade.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#import "BlogSyncFacade.h"
2-
@import WordPressDataObjC;
2+
@import WordPressData;
33
#import "BlogService.h"
44
#import "AccountService.h"
55
#import "Blog.h"

‎WordPress/Classes/Services/MediaService.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#import "AccountService.h"
33
#import "Media.h"
44
#import "WPAccount.h"
5-
@import WordPressDataObjC;
5+
@import WordPressData;
66
@import WordPressShared;
77
#import "Blog.h"
88
#import <MobileCoreServices/MobileCoreServices.h>

‎WordPress/Classes/Services/MenusService.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#import "Menu.h"
55
#import "MenuItem.h"
66
#import "MenuLocation.h"
7-
@import WordPressDataObjC;
7+
@import WordPressData;
88
#import "PostService.h"
99
#import "WordPress-Swift.h"
1010
@import WordPressKit;

‎WordPress/Classes/Services/PostCategoryService.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#import <Foundation/Foundation.h>
2-
@import WordPressDataObjC;
2+
@import WordPressData;
33

44
NS_ASSUME_NONNULL_BEGIN
55

‎WordPress/Classes/Services/PostCategoryService.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#import "PostCategoryService.h"
22
#import "PostCategory.h"
33
#import "Blog.h"
4-
@import WordPressDataObjC;
4+
@import WordPressData;
55
#import "WordPress-Swift.h"
66
@import WordPressKit;
77

‎WordPress/Classes/Services/PostService.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#import "PostService.h"
22
#import "PostCategory.h"
33
#import "PostCategoryService.h"
4-
@import WordPressDataObjC;
4+
@import WordPressData;
55
#import "CommentService.h"
66
#import "MediaService.h"
77
#import "Media.h"

‎WordPress/Classes/Services/PostTagService.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#import "PostTagService.h"
22
#import "Blog.h"
33
#import "PostTag.h"
4-
@import WordPressDataObjC;
4+
@import WordPressData;
55
#import "WordPress-Swift.h"
66
@import WordPressKit;
77

‎WordPress/Classes/Services/Reader Post/ReaderPostService.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#import <Foundation/Foundation.h>
2-
@import WordPressDataObjC;
2+
@import WordPressData;
33

44
#pragma clang diagnostic push
55
#pragma clang diagnostic ignored "-Wnullability-completeness"

‎WordPress/Classes/Services/Reader Post/ReaderPostService.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#import "ReaderPostService.h"
22

33
#import "AccountService.h"
4-
@import WordPressDataObjC;
4+
@import WordPressData;
55
#import "ReaderGapMarker.h"
66
#import "ReaderPost.h"
77
#import "ReaderSiteService.h"

‎WordPress/Classes/Services/ReaderSiteService.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#import <Foundation/Foundation.h>
22
#import "ReaderTopicService.h"
3-
@import WordPressDataObjC;
3+
@import WordPressData;
44

55
typedef NS_ENUM(NSUInteger, ReaderSiteServiceError) {
66
ReaderSiteServiceErrorNotLoggedIn,

‎WordPress/Classes/Services/ReaderSiteService.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#import "ReaderSiteService.h"
22

33
#import "AccountService.h"
4-
@import WordPressDataObjC;
4+
@import WordPressData;
55
#import "ReaderPostService.h"
66
#import "ReaderPost.h"
77
#import "WPAccount.h"

‎WordPress/Classes/Services/ReaderTopicService.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#import <Foundation/Foundation.h>
22
#import "CoreDataService.h"
3-
@import WordPressDataObjC;
3+
@import WordPressData;
44

55
extern NSString * const ReaderTopicFreshlyPressedPathCommponent;
66

‎WordPress/Classes/Services/ReaderTopicService.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#import "ReaderTopicService.h"
22

33
#import "AccountService.h"
4-
@import WordPressDataObjC;
4+
@import WordPressData;
55
#import "ReaderPost.h"
66
#import "ReaderPostService.h"
77
#import "WPAccount.h"

‎WordPress/Classes/Services/ThemeService.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import WordPressDataObjC;
1+
@import WordPressData;
22

33
@class Blog;
44
@class Theme;

‎WordPress/Classes/Services/ThemeService.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#import "Blog.h"
44
#import "Theme.h"
55
#import "WPAccount.h"
6-
@import WordPressDataObjC;
6+
@import WordPressData;
77
#import "WordPress-Swift.h"
88
@import WordPressKit;
99

‎WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#import "WPAnalyticsTrackerAutomatticTracks.h"
2-
@import WordPressDataObjC;
2+
@import WordPressData;
33
#import "AccountService.h"
44
#import "BlogService.h"
55
#import "WPAccount.h"

‎WordPress/Classes/Utility/Analytics/WPAppAnalytics.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#import "WPAppAnalytics.h"
22

3-
@import WordPressDataObjC;
3+
@import WordPressData;
44
#import "WPAnalyticsTrackerWPCom.h"
55
#import "WPAnalyticsTrackerAutomatticTracks.h"
66
#import "WPTabBarController.h"

0 commit comments

Comments
 (0)