Convert WordPressData from Swift package to Xcode target

mokagio · mokagio · commit bb41aa4636a7 · 2025-03-12T18:16:00.000+11:00
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.
diff --git a/Modules/Package.swift b/Modules/Package.swift
@@ -11,7 +11,6 @@ let package = Package(
         .library(name: "AsyncImageKit", targets: ["AsyncImageKit"]),
         .library(name: "DesignSystem", targets: ["DesignSystem"]),
         .library(name: "JetpackStatsWidgetsCore", targets: ["JetpackStatsWidgetsCore"]),
-        .library(name: "WordPressData", targets: ["WordPressData"]),
         .library(name: "WordPressFlux", targets: ["WordPressFlux"]),
         .library(name: "WordPressShared", targets: ["WordPressShared"]),
         .library(name: "WordPressUI", targets: ["WordPressUI"]),
@@ -64,14 +63,6 @@ let package = Package(
             .product(name: "ScreenObject", package: "ScreenObject"),
             .product(name: "XCUITestHelpers", package: "ScreenObject"),
         ], swiftSettings: [.swiftLanguageMode(.v5)]),
-        .target(name: "WordPressDataObjC"),
-        .target(
-            name: "WordPressData",
-            dependencies: [
-                .target(name: "WordPressDataObjC"),
-                .target(name: "WordPressSharedObjC")
-            ]
-        ),
         .target(name: "WordPressFlux", swiftSettings: [.swiftLanguageMode(.v5)]),
         .target(name: "WordPressCore", dependencies: [.target(name: "WordPressShared"), .product(name: "WordPressAPI", package: "wordpress-rs")]),
         .target(name: "WordPressSharedObjC", resources: [.process("Resources")], swiftSettings: [.swiftLanguageMode(.v5)]),
@@ -124,6 +115,7 @@ enum XcodeSupport {
             .library(name: "XcodeTarget_WordPressTests", targets: ["XcodeTarget_WordPressTests"]),
             .library(name: "XcodeTarget_WordPressAuthentificator", targets: ["XcodeTarget_WordPressAuthentificator"]),
             .library(name: "XcodeTarget_WordPressAuthentificatorTests", targets: ["XcodeTarget_WordPressAuthentificatorTests"]),
+            .library(name: "XcodeTarget_WordPressData", targets: ["XcodeTarget_WordPressData"]),
             .library(name: "XcodeTarget_ShareExtension", targets: ["XcodeTarget_ShareExtension"]),
             .library(name: "XcodeTarget_DraftActionExtension", targets: ["XcodeTarget_DraftActionExtension"]),
             .library(name: "XcodeTarget_NotificationServiceExtension", targets: ["XcodeTarget_NotificationServiceExtension"]),
@@ -168,7 +160,6 @@ enum XcodeSupport {
             .xcodeTarget("XcodeTarget_App", dependencies: [
                 "DesignSystem",
                 "JetpackStatsWidgetsCore",
-                "WordPressData",
                 "WordPressFlux",
                 "WordPressShared",
                 "WordPressReader",
@@ -213,6 +204,10 @@ enum XcodeSupport {
             ]),
             .xcodeTarget("XcodeTarget_WordPressAuthentificator", dependencies: wordPresAuthentificatorDependencies),
             .xcodeTarget("XcodeTarget_WordPressAuthentificatorTests", dependencies: wordPresAuthentificatorDependencies + testDependencies),
+            .xcodeTarget(
+                "XcodeTarget_WordPressData",
+                dependencies: ["WordPressShared"]
+            ),
             .xcodeTarget("XcodeTarget_ShareExtension", dependencies: shareAndDraftExtensionsDependencies),
             .xcodeTarget("XcodeTarget_DraftActionExtension", dependencies: shareAndDraftExtensionsDependencies),
             .xcodeTarget("XcodeTarget_NotificationServiceExtension", dependencies: [
diff --git a/Modules/Sources/WordPressData/WordPressData.swift b/Modules/Sources/WordPressData/WordPressData.swift
diff --git a/Modules/Sources/XcodeSupport/XcodeTarget_WordPressData/Empty.swift b/Modules/Sources/XcodeSupport/XcodeTarget_WordPressData/Empty.swift
@@ -0,0 +1,3 @@
+import Foundation
+
+public struct __Empty {}
diff --git a/WordPress/Classes/Categories/Media+Extensions.m b/WordPress/Classes/Categories/Media+Extensions.m
@@ -1,7 +1,7 @@
 #import "Media+Extensions.h"
 #import "MediaService.h"
 #import "Blog.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "WordPress-Swift.h"
 
 @implementation Media (Extensions)
diff --git a/WordPress/Classes/Models/AbstractPost.m b/WordPress/Classes/Models/AbstractPost.m
@@ -1,6 +1,6 @@
 #import "AbstractPost.h"
 #import "Media.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "WordPress-Swift.h"
 #import "BasePost.h"
 
diff --git a/WordPress/Classes/Models/BasePost.m b/WordPress/Classes/Models/BasePost.m
@@ -1,6 +1,6 @@
 #import "BasePost.h"
 #import "Media.h"
-@import WordPressDataObjC;
+@import WordPressData;
 
 @import WordPressShared;
 
diff --git a/WordPress/Classes/Models/Blog/Blog.m b/WordPress/Classes/Models/Blog/Blog.m
@@ -1,7 +1,7 @@
 #import "Blog.h"
 #import "WPAccount.h"
 #import "AccountService.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "WPUserAgent.h"
 #import "WordPress-Swift.h"
 
diff --git a/WordPress/Classes/Models/Media.m b/WordPress/Classes/Models/Media.m
@@ -1,5 +1,5 @@
 #import "Media.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "WordPress-Swift.h"
 
 @implementation Media
diff --git a/WordPress/Classes/Models/ReaderPost.m b/WordPress/Classes/Models/ReaderPost.m
@@ -1,6 +1,6 @@
 #import "ReaderPost.h"
 #import "AccountService.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "SourcePostAttribution.h"
 #import "WPAccount.h"
 #import "WordPress-Swift.h"
diff --git a/WordPress/Classes/Models/Theme.m b/WordPress/Classes/Models/Theme.m
@@ -1,6 +1,6 @@
 #import "Theme.h"
 #import "Blog.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "WPAccount.h"
 #import "AccountService.h"
 #import "WordPress-Swift.h"
diff --git a/WordPress/Classes/Services/AccountService.h b/WordPress/Classes/Services/AccountService.h
@@ -1,5 +1,5 @@
 #import <Foundation/Foundation.h>
-@import WordPressDataObjC;
+@import WordPressData;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/WordPress/Classes/Services/AccountService.m b/WordPress/Classes/Services/AccountService.m
@@ -1,6 +1,6 @@
 #import "AccountService.h"
 #import "WPAccount.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "Blog.h"
 #import "BlogService.h"
 
diff --git a/WordPress/Classes/Services/BlogService.h b/WordPress/Classes/Services/BlogService.h
@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 #import "Blog.h"
-@import WordPressDataObjC;
+@import WordPressData;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/WordPress/Classes/Services/BlogService.m b/WordPress/Classes/Services/BlogService.m
@@ -2,7 +2,7 @@
 #import "Blog.h"
 #import "WPAccount.h"
 #import "AccountService.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "WPError.h"
 #import "Media.h"
 #import "PostCategoryService.h"
diff --git a/WordPress/Classes/Services/CommentService.h b/WordPress/Classes/Services/CommentService.h
@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 #import "CoreDataService.h"
-@import WordPressDataObjC;
+@import WordPressData;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/WordPress/Classes/Services/CommentService.m b/WordPress/Classes/Services/CommentService.m
@@ -1,7 +1,7 @@
 #import "CommentService.h"
 #import "AccountService.h"
 #import "Blog.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "ReaderPost.h"
 #import "WPAccount.h"
 #import "PostService.h"
diff --git a/WordPress/Classes/Services/Facades/BlogSyncFacade.m b/WordPress/Classes/Services/Facades/BlogSyncFacade.m
@@ -1,5 +1,5 @@
 #import "BlogSyncFacade.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "BlogService.h"
 #import "AccountService.h"
 #import "Blog.h"
diff --git a/WordPress/Classes/Services/MediaService.m b/WordPress/Classes/Services/MediaService.m
@@ -2,7 +2,7 @@
 #import "AccountService.h"
 #import "Media.h"
 #import "WPAccount.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "Blog.h"
 #import <MobileCoreServices/MobileCoreServices.h>
 #import "WordPress-Swift.h"
diff --git a/WordPress/Classes/Services/MenusService.m b/WordPress/Classes/Services/MenusService.m
@@ -4,7 +4,7 @@
 #import "Menu.h"
 #import "MenuItem.h"
 #import "MenuLocation.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "PostService.h"
 #import "WordPress-Swift.h"
 @import WordPressKit;
diff --git a/WordPress/Classes/Services/PostCategoryService.h b/WordPress/Classes/Services/PostCategoryService.h
@@ -1,5 +1,5 @@
 #import <Foundation/Foundation.h>
-@import WordPressDataObjC;
+@import WordPressData;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/WordPress/Classes/Services/PostCategoryService.m b/WordPress/Classes/Services/PostCategoryService.m
@@ -1,7 +1,7 @@
 #import "PostCategoryService.h"
 #import "PostCategory.h"
 #import "Blog.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "WordPress-Swift.h"
 @import WordPressKit;
 
diff --git a/WordPress/Classes/Services/PostService.m b/WordPress/Classes/Services/PostService.m
@@ -1,7 +1,7 @@
 #import "PostService.h"
 #import "PostCategory.h"
 #import "PostCategoryService.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "CommentService.h"
 #import "MediaService.h"
 #import "Media.h"
diff --git a/WordPress/Classes/Services/PostTagService.m b/WordPress/Classes/Services/PostTagService.m
@@ -1,7 +1,7 @@
 #import "PostTagService.h"
 #import "Blog.h"
 #import "PostTag.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "WordPress-Swift.h"
 @import WordPressKit;
 
diff --git a/WordPress/Classes/Services/Reader Post/ReaderPostService.h b/WordPress/Classes/Services/Reader Post/ReaderPostService.h
@@ -1,5 +1,5 @@
 #import <Foundation/Foundation.h>
-@import WordPressDataObjC;
+@import WordPressData;
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wnullability-completeness"
diff --git a/WordPress/Classes/Services/Reader Post/ReaderPostService.m b/WordPress/Classes/Services/Reader Post/ReaderPostService.m
@@ -1,7 +1,7 @@
 #import "ReaderPostService.h"
 
 #import "AccountService.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "ReaderGapMarker.h"
 #import "ReaderPost.h"
 #import "ReaderSiteService.h"
diff --git a/WordPress/Classes/Services/ReaderSiteService.h b/WordPress/Classes/Services/ReaderSiteService.h
@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 #import "ReaderTopicService.h"
-@import WordPressDataObjC;
+@import WordPressData;
 
 typedef NS_ENUM(NSUInteger, ReaderSiteServiceError) {
     ReaderSiteServiceErrorNotLoggedIn,
diff --git a/WordPress/Classes/Services/ReaderSiteService.m b/WordPress/Classes/Services/ReaderSiteService.m
@@ -1,7 +1,7 @@
 #import "ReaderSiteService.h"
 
 #import "AccountService.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "ReaderPostService.h"
 #import "ReaderPost.h"
 #import "WPAccount.h"
diff --git a/WordPress/Classes/Services/ReaderTopicService.h b/WordPress/Classes/Services/ReaderTopicService.h
@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 #import "CoreDataService.h"
-@import WordPressDataObjC;
+@import WordPressData;
 
 extern NSString * const ReaderTopicFreshlyPressedPathCommponent;
 
diff --git a/WordPress/Classes/Services/ReaderTopicService.m b/WordPress/Classes/Services/ReaderTopicService.m
@@ -1,7 +1,7 @@
 #import "ReaderTopicService.h"
 
 #import "AccountService.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "ReaderPost.h"
 #import "ReaderPostService.h"
 #import "WPAccount.h"
diff --git a/WordPress/Classes/Services/ThemeService.h b/WordPress/Classes/Services/ThemeService.h
@@ -1,4 +1,4 @@
-@import WordPressDataObjC;
+@import WordPressData;
 
 @class Blog;
 @class Theme;
diff --git a/WordPress/Classes/Services/ThemeService.m b/WordPress/Classes/Services/ThemeService.m
@@ -3,7 +3,7 @@
 #import "Blog.h"
 #import "Theme.h"
 #import "WPAccount.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "WordPress-Swift.h"
 @import WordPressKit;
 
diff --git a/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m b/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m
@@ -1,5 +1,5 @@
 #import "WPAnalyticsTrackerAutomatticTracks.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "AccountService.h"
 #import "BlogService.h"
 #import "WPAccount.h"
diff --git a/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m b/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m
@@ -1,6 +1,6 @@
 #import "WPAppAnalytics.h"
 
-@import WordPressDataObjC;
+@import WordPressData;
 #import "WPAnalyticsTrackerWPCom.h"
 #import "WPAnalyticsTrackerAutomatticTracks.h"
 #import "WPTabBarController.h"
diff --git a/WordPress/Classes/Utility/WPAuthTokenIssueSolver.m b/WordPress/Classes/Utility/WPAuthTokenIssueSolver.m
@@ -1,7 +1,7 @@
 #import "WPAuthTokenIssueSolver.h"
 #import "AccountService.h"
 #import "BlogService.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "WPAccount.h"
 #import "WordPress-Swift.h"
 
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m
@@ -3,7 +3,7 @@
 #import "AccountService.h"
 #import "BlogService.h"
 #import "CommentsViewController.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "ReachabilityUtils.h"
 #import "SiteSettingsViewController.h"
 #import "SharingViewController.h"
diff --git a/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m b/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m
@@ -2,7 +2,7 @@
 
 #import "Blog.h"
 #import "BlogService.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "PostCategory.h"
 #import "PostCategoryService.h"
 #import "SettingsSelectionViewController.h"
diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m
@@ -6,7 +6,7 @@
 #import "MenuItemEditingFooterView.h"
 #import "MenuItemSourceViewController.h"
 #import "MenuItemTypeViewController.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "WordPress-Swift.h"
 
 @import WordPressShared;
diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m
@@ -5,7 +5,7 @@
 #import "MenuItemView.h"
 #import "MenuItemInsertionView.h"
 #import "MenuItemsVisualOrderingView.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "Menu+ViewDesign.h"
 #import "WordPress-Swift.h"
 
diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m
@@ -9,7 +9,7 @@
 #import "MenuItemsViewController.h"
 #import "MenuItemEditingViewController.h"
 #import "Menu+ViewDesign.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "WPAppAnalytics.h"
 #import "WordPress-Swift.h"
 
diff --git a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m
@@ -3,7 +3,7 @@
 #import "Media.h"
 #import "SettingsSelectionViewController.h"
 #import "SharingDetailViewController.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "MediaService.h"
 #import "WordPress-Swift.h"
 
diff --git a/WordPress/Classes/ViewRelated/Stats/StatsViewController.m b/WordPress/Classes/ViewRelated/Stats/StatsViewController.m
@@ -1,7 +1,7 @@
 #import "StatsViewController.h"
 #import "Blog.h"
 #import "WPAccount.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "BlogService.h"
 #import "WordPress-Swift.h"
 #import "WPAppAnalytics.h"
diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController.m b/WordPress/Classes/ViewRelated/System/WPTabBarController.m
@@ -1,7 +1,7 @@
 #import "WPTabBarController.h"
 
 #import "AccountService.h"
-@import WordPressDataObjC;
+@import WordPressData;
 #import "BlogService.h"
 #import "Blog.h"
 
diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj
diff --git a/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPress Alpha.xcscheme b/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPress Alpha.xcscheme
diff --git a/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPress.xcscheme b/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPress.xcscheme
diff --git a/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPressData.xcscheme b/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPressData.xcscheme
diff --git a/WordPress/WordPressData/CoreDataService.m b/WordPress/WordPressData/CoreDataService.m
diff --git a/WordPress/WordPressData/CoreDataStackSwift.swift b/WordPress/WordPressData/CoreDataStackSwift.swift
diff --git a/WordPress/WordPressData/WordPressData.h b/WordPress/WordPressData/WordPressData.h
diff --git a/WordPress/WordPressData/include/CoreDataService.h b/WordPress/WordPressData/include/CoreDataService.h
diff --git a/WordPress/WordPressData/include/CoreDataStack.h b/WordPress/WordPressData/include/CoreDataStack.h
diff --git a/WordPress/WordPressDataTests/WordPressDataTests.swift b/WordPress/WordPressDataTests/WordPressDataTests.swift
diff --git a/WordPress/WordPressDataTests/WordPressDataUnitTests.xctestplan b/WordPress/WordPressDataTests/WordPressDataUnitTests.xctestplan
diff --git a/WordPress/WordPressTest/BlogServiceTest.m b/WordPress/WordPressTest/BlogServiceTest.m
diff --git a/WordPress/WordPressTest/ReaderPostServiceTest.m b/WordPress/WordPressTest/ReaderPostServiceTest.m

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import Foundation`
	`2`	`+`
	`3`	`+public struct __Empty {}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@import WordPressDataObjC;`
	`1`	`+@import WordPressData;`
`2`	`2`
`3`	`3`	`@class Blog;`
`4`	`4`	`@class Theme;`