Move model files from apps targets to WordPressData

Modules/Package.swift

@@ -195,6 +195,7 @@ enum XcodeSupport {
             .library(name: "XcodeTarget_App", targets: ["XcodeTarget_App"]),
             .library(name: "XcodeTarget_Keystone", targets: ["XcodeTarget_Keystone"]),
             .library(name: "XcodeTarget_WordPressTests", targets: ["XcodeTarget_WordPressTests"]),
+            .library(name: "XcodeTarget_WordPressData", targets: ["XcodeTarget_WordPressData"]),
             .library(name: "XcodeTarget_WordPressAuthentificator", targets: ["XcodeTarget_WordPressAuthentificator"]),
             .library(name: "XcodeTarget_WordPressAuthentificatorTests", targets: ["XcodeTarget_WordPressAuthentificatorTests"]),
             .library(name: "XcodeTarget_ShareExtension", targets: ["XcodeTarget_ShareExtension"]),
@@ -228,6 +229,16 @@ enum XcodeSupport {
             "WordPressUI",
             "TextBundle",
             "TracksMini",
+            // Even though the extensions are all in Swift, we need to include the Objective-C
+            // version of CocoaLumberjack to avoid linking issues with other dependencies that
+            // use it.
+            //
+            // Example:
+            //
+            // Undefined symbols for architecture arm64:
+            //  "_OBJC_CLASS_$_DDLog", referenced from:
+            //       in AppExtensionsService.o
+            .product(name: "CocoaLumberjack", package: "CocoaLumberjack"),
             .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
             .product(name: "Down", package: "Down"),
             .product(name: "Gridicons", package: "Gridicons-iOS"),
@@ -299,6 +310,17 @@ enum XcodeSupport {
                 .product(name: "Gravatar", package: "Gravatar-SDK-iOS"),
                 .product(name: "Nimble", package: "Nimble"),
                 .product(name: "BuildkiteTestCollector", package: "test-collector-swift"),
+                // Needed by WordPressData because of how linkage works...
+                //
+                "BuildSettingsKit",
+                "FormattableContentKit",
+                "SFHFKeychainUtils",
+                .product(name: "CocoaLumberjack", package: "CocoaLumberjack"),
+                .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
+                .product(name: "NSObject-SafeExpectations", package: "NSObject-SafeExpectations"),
+                .product(name: "NSURL+IDN", package: "NSURL-IDN"),
+                .product(name: "WordPressAPI", package: "wordpress-rs"),
+                .product(name: "WordPressKit", package: "WordPressKit-iOS"),
             ]),
             .xcodeTarget("XcodeTarget_WordPressAuthentificator", dependencies: wordPresAuthentificatorDependencies),
             .xcodeTarget("XcodeTarget_WordPressAuthentificatorTests", dependencies: wordPresAuthentificatorDependencies + testDependencies),
@@ -311,6 +333,18 @@ enum XcodeSupport {
                 "SFHFKeychainUtils",
                 "TracksMini",
                 "WordPressShared",
+                // Even though the extensions are all in Swift, we need to include the Objective-C
+                // version of CocoaLumberjack to avoid linking issues with other dependencies that
+                // use it.
+                //
+                // Example:
+                //
+                // EmitSwiftModule normal arm64 (in target 'WordPressNotificationServiceExtension' from project 'WordPress')
+                //    cd /path/to/repo/WordPress
+                //
+                // <unknown>:0: error: missing required modules: 'CocoaLumberjack', 'CocoaLumberjackSwiftSupport'
+                .product(name: "CocoaLumberjack", package: "CocoaLumberjack"),
+                .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
             ]),
             .xcodeTarget("XcodeTarget_StatsWidget", dependencies: [
                 "BuildSettingsKit",
@@ -319,18 +353,54 @@ enum XcodeSupport {
                 "TracksMini",
                 "WordPressShared",
                 "WordPressUI",
+                // Even though the extensions are all in Swift, we need to include the Objective-C
+                // version of CocoaLumberjack to avoid linking issues with other dependencies that
+                // use it.
+                //
+                // Example:
+                //
+                // Undefined symbols for architecture arm64:
+                //  "_OBJC_CLASS_$_DDLog", referenced from:
+                //       in AppExtensionsService.o
+                .product(name: "CocoaLumberjack", package: "CocoaLumberjack"),
                 .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
                 .product(name: "WordPressAPI", package: "wordpress-rs"),
             ]),
             .xcodeTarget("XcodeTarget_Intents", dependencies: [
                 "BuildSettingsKit",
                 "JetpackStatsWidgetsCore",
+                // Even though the extensions are all in Swift, we need to include the Objective-C
+                // version of CocoaLumberjack to avoid linking issues with other dependencies that
+                // use it.
+                //
+                // Example:
+                //
+                // Undefined symbols for architecture arm64:
+                //  "_OBJC_CLASS_$_DDLog", referenced from:
+                //       in AppExtensionsService.o
+                .product(name: "CocoaLumberjack", package: "CocoaLumberjack"),
                 .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
             ]),
             .xcodeTarget("XcodeTarget_UITests", dependencies: [
                 "UITestsFoundation",
                 .product(name: "BuildkiteTestCollector", package: "test-collector-swift"),
             ]),
+            .xcodeTarget(
+                "XcodeTarget_WordPressData",
+                dependencies: [
+                    "BuildSettingsKit",
+                    "FormattableContentKit",
+                    "SFHFKeychainUtils",
+                    "WordPressShared",
+                    .product(name: "CocoaLumberjack", package: "CocoaLumberjack"),
+                    .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
+                    .product(name: "Gravatar", package: "Gravatar-SDK-iOS"),
+                    .product(name: "NSObject-SafeExpectations", package: "NSObject-SafeExpectations"),
+                    .product(name: "NSURL+IDN", package: "NSURL-IDN"),
+                    .product(name: "WordPressAPI", package: "wordpress-rs"),
+                    .product(name: "WordPressKit", package: "WordPressKit-iOS"),
+                ]
+            ),
         ]
     }
 }

Modules/Sources/XcodeSupport/XcodeTarget_WordPressData/Empty.swift

@@ -0,0 +1,3 @@
+import Foundation
+
+public struct __Empty {}

Sources/Keystone/WordPress.h

@@ -11,7 +11,6 @@ FOUNDATION_EXPORT const unsigned char WordPressVersionString[];
 #import <WordPress/ActivityLogViewController.h>
 #import <WordPress/AccountService.h>
 
-#import <WordPress/Blog.h>
 #import <WordPress/BlogService.h>
 #import <WordPress/BlogSyncFacade.h>
 #import <WordPress/BlogDetailsViewController.h>
@@ -20,11 +19,7 @@ FOUNDATION_EXPORT const unsigned char WordPressVersionString[];
 #import <WordPress/CommentsViewController.h>
 #import <WordPress/Constants.h>
 
-#import <WordPress/LocalCoreDataService.h>
-
-#import <WordPress/Media.h>
 #import <WordPress/MediaService.h>
-#import <WordPress/MenuItem.h>
 #import <WordPress/MenuItemsViewController.h>
 #import <WordPress/MenusService.h>
 #import <WordPress/MenusViewController.h>
@@ -33,20 +28,11 @@ FOUNDATION_EXPORT const unsigned char WordPressVersionString[];
 #import <WordPress/NSObject+Helpers.h>
 
 #import <WordPress/PageSettingsViewController.h>
-#import <WordPress/PostContentProvider.h>
-#import <WordPress/PostCategory.h>
 #import <WordPress/PostCategoryService.h>
-#import <WordPress/PostContentProvider.h>
-#import <WordPress/PostHelper.h>
 #import <WordPress/PostMetaButton.h>
-#import <WordPress/PostService.h>
-#import <WordPress/PostServiceOptions.h>
 #import <WordPress/PostSettingsViewController.h>
-#import <WordPress/PostTag.h>
 #import <WordPress/PostTagService.h>
 
-#import <WordPress/ReaderGapMarker.h>
-#import <WordPress/ReaderPost.h>
 #import <WordPress/ReaderPostService.h>
 #import <WordPress/ReaderSiteService.h>
 #import <WordPress/ReaderSiteService_Internal.h>
@@ -58,19 +44,16 @@ FOUNDATION_EXPORT const unsigned char WordPressVersionString[];
 #import <WordPress/SettingsTextViewController.h>
 #import <WordPress/SharingViewController.h>
 #import <WordPress/SiteSettingsViewController.h>
-#import <WordPress/SourcePostAttribution.h>
 #import <WordPress/StatsViewController.h>
 #import <WordPress/SuggestionsTableView.h>
 #import <WordPress/SuggestionsTableViewCell.h>
 
-#import <WordPress/Theme.h>
 #import <WordPress/ThemeService.h>
 
 #import <WordPress/UIAlertControllerProxy.h>
 #import <WordPress/UIApplication+Helpers.h>
 #import <WordPress/UIView+Subviews.h>
 
-#import <WordPress/WPAccount.h>
 #import <WordPress/WPActivityDefaults.h>
 #import <WordPress/WPAppAnalytics.h>
 #import <WordPress/WPUploadStatusButton.h>

WordPress/Classes/Models/AbstractPost.m → Sources/WordPressData/Objective-C/AbstractPost.m

@@ -1,10 +1,6 @@
 #import "AbstractPost.h"
 #import "Media.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
-#import "WordPress-Swift.h"
-#endif
+#import "WordPressData-Swift.h"
 #import "BasePost.h"
 
 @import WordPressKit;

WordPress/Classes/Models/Blog/Blog.m → Sources/WordPressData/Objective-C/Blog.m

@@ -1,15 +1,13 @@
 #import "Blog.h"
 #import "WPAccount.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
-#import "WordPress-Swift.h"
-#endif
+@import WordPressShared;
+#import "WordPressData-Swift.h"
 
 @import SFHFKeychainUtils;
 @import WordPressShared;
 @import NSObject_SafeExpectations;
 @import NSURL_IDN;
+@import WordPressKit; // FIXME: Is it required?
 
 @class Comment;
 

Sources/WordPressData/Objective-C/CocoaLumberJackConfiguration.m

@@ -0,0 +1,8 @@
+@import CocoaLumberjack;
+
+DDLogLevel ddLogLevel = DDLogLevelInfo;
+
+void SetCocoaLumberjackObjCLogLevel(NSUInteger ddLogLevelRawValue)
+{
+    ddLogLevel = (DDLogLevel)ddLogLevelRawValue;
+}

WordPress/Classes/Models/Media.m → Sources/WordPressData/Objective-C/Media.m

@@ -1,9 +1,5 @@
 #import "Media.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
-#import "WordPress-Swift.h"
-#endif
+#import "WordPressData-Swift.h"
 
 @implementation Media
 

WordPress/Classes/Services/PostHelper.m → Sources/WordPressData/Objective-C/PostHelper.m

@@ -1,10 +1,7 @@
 #import "PostHelper.h"
 #import "AbstractPost.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
-#import "WordPress-Swift.h"
-#endif
+#import "WordPressData-Swift.h"
+@import WordPressShared; // FIXME: Is this needed?
 
 @import WordPressKit;
 @import NSObject_SafeExpectations;

WordPress/Classes/Services/PostService.m → Sources/WordPressData/Objective-C/PostService.m

@@ -3,11 +3,7 @@
 #import "PostServiceOptions.h"
 #import "PostCategory.h"
 #import "Media.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
-#import "WordPress-Swift.h"
-#endif
+#import "WordPressData-Swift.h"
 #import "PostHelper.h"
 @import WordPressKit;
 @import WordPressShared;

WordPress/Classes/Models/ReaderPost.m → Sources/WordPressData/Objective-C/ReaderPost.m

@@ -1,11 +1,8 @@
 #import "ReaderPost.h"
 #import "SourcePostAttribution.h"
 #import "WPAccount.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
-#import "WordPress-Swift.h"
-#endif
+#import "WordPressData-Swift.h"
+@import WordPressKit; // FIXME: Is this needed?
 
 @import WordPressShared;
 

WordPress/Classes/Models/Theme.m → Sources/WordPressData/Objective-C/Theme.m

@@ -1,11 +1,6 @@
 #import "Theme.h"
 #import "Blog.h"
 #import "WPAccount.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
-#import "WordPress-Swift.h"
-#endif
 
 @import WordPressShared;
 

WordPress/Classes/Models/WPAccount.m → Sources/WordPressData/Objective-C/WPAccount.m

@@ -1,10 +1,7 @@
 @import SFHFKeychainUtils;
 #import "WPAccount.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
-#import "WordPress-Swift.h"
-#endif
+#import "WordPressData-Swift.h"
+@import WordPressKit;
 
 @interface WPAccount ()
 

WordPress/Classes/Models/AbstractPost.h → Sources/WordPressData/Objective-C/include/AbstractPost.h

@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 #import <CoreData/CoreData.h>
-#import "BasePost.h"
+#import <WordPressData/BasePost.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

WordPress/Classes/Models/BasePost.h → Sources/WordPressData/Objective-C/include/BasePost.h

@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
-#import "Blog.h"
-#import "PostContentProvider.h"
+#import <WordPressData/Blog.h>
+#import <WordPressData/PostContentProvider.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

WordPress/Classes/Models/Media.h → Sources/WordPressData/Objective-C/include/Media.h

@@ -1,6 +1,6 @@
 #import <CoreData/CoreData.h>
-#import "Blog.h"
-#import "AbstractPost.h"
+#import <WordPressData/Blog.h>
+#import <WordPressData/AbstractPost.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

WordPress/Classes/Models/PostCategory.h → Sources/WordPressData/Objective-C/include/PostCategory.h

@@ -1,5 +1,5 @@
 #import <CoreData/CoreData.h>
-#import "Blog.h"
+#import <WordPressData/Blog.h>
 
 extern NSString * const PostCategoryEntityName;
 extern NSString * const PostCategoryNameKey;

WordPress/Classes/Services/PostHelper.h → Sources/WordPressData/Objective-C/include/PostHelper.h

@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 #import <CoreData/CoreData.h>
-#import "PostService.h"
+#import <WordPressData/PostService.h>
 
 @class AbstractPost, RemotePost;
 

WordPress/Classes/Services/PostService.h → Sources/WordPressData/Objective-C/include/PostService.h

@@ -1,5 +1,5 @@
 #import <Foundation/Foundation.h>
-#import "LocalCoreDataService.h"
+#import <WordPressData/LocalCoreDataService.h>
 
 @class AbstractPost;
 @class Blog;

WordPress/Classes/Services/PostServiceOptions.h → Sources/WordPressData/Objective-C/include/PostServiceOptions.h

@@ -1,4 +1,4 @@
-@import WordPressKit;
+#import <WordPressKit/WordPressKit.h>
 
 /**
  @class PostServiceSyncOptions

WordPress/Classes/Models/ReaderPost.h → Sources/WordPressData/Objective-C/include/ReaderPost.h

@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 #import <CoreData/CoreData.h>
-#import "BasePost.h"
+#import <WordPressData/BasePost.h>
 
 typedef NS_ENUM(NSUInteger, SourceAttributionStyle) {
     SourceAttributionStyleNone,