Work bench PR for one-go Core Data extraction into target

.buildkite/pipeline.yml

@@ -52,6 +52,23 @@ steps:
   #################
   # Run Unit Tests
   #################
+  - label: "WordPressData tests"
+    command: |
+      echo "--- :rubygems: Setting up Gems"
+      install_gems
+      echo "--- :swift: Setting up Swift Packages"
+      install_swiftpm_dependencies
+      echo "--- :microscope: Test"
+      FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT=120 bundle exec fastlane run scan \
+        scheme:WordPressData \
+        device:'iPhone 16'
+    plugins: [$CI_TOOLKIT_PLUGIN]
+    artifact_paths:
+      - "build/results/*"
+    notify:
+      - github_commit_status:
+          context: "WordPressData Unit Tests"
+
   - label: "🔬 :wordpress: Unit Tests"
     command: ".buildkite/commands/run-unit-tests.sh"
     depends_on: "build_wordpress"

Modules/Package.swift

@@ -15,7 +15,6 @@ let package = Package(
         .library(name: "NotificationServiceExtensionCore", targets: ["NotificationServiceExtensionCore"]),
         .library(name: "ShareExtensionCore", targets: ["ShareExtensionCore"]),
         .library(name: "SFHFKeychainUtils", targets: ["SFHFKeychainUtils"]),
-        .library(name: "WordPressData", targets: ["WordPressData"]),
         .library(name: "WordPressFlux", targets: ["WordPressFlux"]),
         .library(name: "WordPressShared", targets: ["WordPressShared"]),
         .library(name: "WordPressUI", targets: ["WordPressUI"]),
@@ -121,14 +120,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)]),
@@ -195,6 +186,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"]),
@@ -252,7 +244,6 @@ enum XcodeSupport {
                 "NotificationServiceExtensionCore",
                 "SFHFKeychainUtils",
                 "ShareExtensionCore",
-                "WordPressData",
                 "WordPressFlux",
                 "WordPressShared",
                 "WordPressReader",
@@ -289,6 +280,7 @@ enum XcodeSupport {
                 .product(name: "WordPressEditor", package: "AztecEditor-iOS"),
             ]),
             .xcodeTarget("XcodeTarget_WordPressTests", dependencies: testDependencies + [
+                "FormattableContentKit",
                 "SFHFKeychainUtils",
                 "WordPressShared",
                 "WordPressUI",
@@ -298,6 +290,22 @@ enum XcodeSupport {
             ]),
             .xcodeTarget("XcodeTarget_WordPressAuthentificator", dependencies: wordPresAuthentificatorDependencies),
             .xcodeTarget("XcodeTarget_WordPressAuthentificatorTests", dependencies: wordPresAuthentificatorDependencies + testDependencies),
+            .xcodeTarget(
+                "XcodeTarget_WordPressData",
+                dependencies: [
+                    "BuildSettingsKit",
+                    "FormattableContentKit",
+                    "SFHFKeychainUtils",
+                    "WordPressShared",
+                    // FIXME: Having issues with CocoaLumberjack as a transitive dependency when added to Objective-C files
+                    // .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: "WordPressKit", package: "WordPressKit-iOS"),
+                ]
+            ),
             .xcodeTarget("XcodeTarget_ShareExtension", dependencies: shareAndDraftExtensionsDependencies),
             .xcodeTarget("XcodeTarget_DraftActionExtension", dependencies: shareAndDraftExtensionsDependencies),
             .xcodeTarget("XcodeTarget_NotificationServiceExtension", dependencies: [

Modules/Sources/FormattableContentKit/NotificationContentFactory.swift

@@ -6,6 +6,7 @@ private enum Constants {
     static let Ranges = "ranges"
 }
 
+// FIXME: This is a WordPressData notification!
 extension Notification {
     enum ContentType: String {
         case comment

Modules/Sources/XcodeSupport/XcodeTarget_WordPressData/Empty.swift

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

WordPress/Classes/Categories/Media+Extensions.m

@@ -1,7 +1,6 @@
 #import "Media+Extensions.h"
 #import "MediaService.h"
-#import "Blog.h"
-@import WordPressDataObjC;
+@import WordPressData;
 @import WordPressShared;
 #import "WordPress-Swift.h"
 

WordPress/Classes/Extensions/Notifications/Notification+Interface.swift

@@ -1,8 +1,9 @@
 import Foundation
+import WordPressData
 
 /// Encapsulates Notification Interface Helpers
 ///
-extension Notification {
+extension WordPressData.Notification {
     /// Returns a Section Identifier that can be sorted. Note that this string is not human readable, and
     /// you should use the *descriptionForSectionIdentifier* method as well!.
     ///

WordPress/Classes/Extensions/Post+BloggingPrompts.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 
 extension Post {
 

WordPress/Classes/Extensions/SVProgressHUD+Extensions.swift

@@ -1,3 +1,4 @@
+import Foundation
 import SVProgressHUD
 
 extension SVProgressHUD {
@@ -37,11 +38,11 @@ extension SVProgressHUD {
         NotificationCenter.default.removeObserver(self, name: NSNotification.Name.SVProgressHUDWillDisappear, object: nil)
     }
 
-    @objc static func handleHUDTappedNotification(_ notification: Notification) {
+    @objc static func handleHUDTappedNotification(_ notification: Foundation.Notification) {
         SVProgressHUD.dismiss()
     }
 
-    @objc static func handleHUDDisappearedNotification(_ notification: Notification) {
+    @objc static func handleHUDDisappearedNotification(_ notification: Foundation.Notification) {
         // Prevent unregistering if another HUD is still visible
         if !SVProgressHUD.isVisible() {
             unregisterFromHUDNotifications()

WordPress/Classes/Jetpack/Utility/DataMigrator.swift

@@ -1,6 +1,7 @@
 import Foundation
 import AutomatticTracks
 import BuildSettingsKit
+import WordPressData
 import WordPressShared
 
 protocol ContentDataMigrating {
@@ -12,7 +13,7 @@ protocol ContentDataMigrating {
     /// Imports user's WordPress content data from the shared location.
     ///
     /// - Parameter completion: Closure called after the export process completes.
-    func importData(completion: ((Result<Void, DataMigrationError>) -> Void)?)
+    func importData(isJetpack: Bool, completion: ((Result<Void, DataMigrationError>) -> Void)?)
 
     /// Deletes any exported user content at the shared location if it exists.
     func deleteExportedData()
@@ -65,7 +66,10 @@ extension DataMigrator: ContentDataMigrating {
         completion?(.success(()))
     }
 
-    func importData(completion: ((Result<Void, DataMigrationError>) -> Void)? = nil) {
+    func importData(
+        isJetpack: Bool = AppConfiguration.isJetpack,
+        completion: ((Result<Void, DataMigrationError>) -> Void)? = nil
+    ) {
         guard isDataReadyToMigrate else {
             completion?(.failure(.dataNotReadyToImport))
             return
@@ -92,7 +96,7 @@ extension DataMigrator: ContentDataMigrating {
             sharedDefaults: sharedDefaults,
             appGroupName: appGroupName
         )
-        sharedDataIssueSolver.migrateAuthKey()
+        sharedDataIssueSolver.migrateAuthKey(isJetpack: isJetpack)
         sharedDataIssueSolver.migrateExtensionsData()
         BloggingRemindersScheduler.handleRemindersMigration(appGroupName: appGroupName)
         completion?(.success(()))

WordPress/Classes/Models/Blog/Blog+Creation.swift

@@ -1,3 +1,5 @@
+import WordPressData
+
 extension Blog {
 
     /// Creates a blank `Blog` object for this account

WordPress/Classes/Models/Blog/Blog+Editor.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 
 enum MobileEditor: String {
     case aztec

WordPress/Classes/Models/Blog/Blog+JetpackSocial.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 
 /// Blog extension for methods related to Jetpack Social.
 extension Blog {

WordPress/Classes/Models/Blog/Blog+Lookup.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 
 /// An extension dedicated to looking up and returning blog objects
 public extension Blog {

WordPress/Classes/Models/Blog/Blog+Organization.swift

@@ -1,4 +1,4 @@
-import Foundation
+import WordPressData
 
 extension Blog {
     var isAutomatticP2: Bool {

WordPress/Classes/Models/Blog/BlogSettings+DateAndTimeFormat.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 
 /// In this extension, we implement several nested Enums (and helper setters / getters) aimed at simplifying
 /// the BlogSettings interface for handling writing date and time format properties.

WordPress/Classes/Models/Blog/BlogSettings+Discussion.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 
 /// In this extension, we implement several nested Enums (and helper setters / getters)  aimed at simplifying
 /// the BlogSettings interface. This may be considered as an Adapter class, *Swift* style!

WordPress/Classes/Models/Gutenberg/BlockEditorSettings+GutenbergEditorSettings.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 import WordPressKit
 import Gutenberg
 
@@ -21,7 +22,7 @@ extension BlockEditorSettings: GutenbergEditorSettings {
     }
 }
 
-extension BlockEditorSettings {
+public extension BlockEditorSettings {
     convenience init?(editorTheme: RemoteEditorTheme, context: NSManagedObjectContext) {
         self.init(context: context)
         self.isFSETheme = editorTheme.themeSupport?.blockTemplates ?? false

WordPress/Classes/Models/Notifications/Actions/ApproveComment.swift

@@ -36,22 +36,18 @@ class ApproveComment: DefaultNotificationActionCommand {
     }
 
     private func unApprove(block: FormattableCommentContent) {
-        ReachabilityUtils.onAvailableInternetConnectionDo {
-            actionsService?.unapproveCommentWithBlock(block, completion: { [weak self] success in
-                if success {
-                    self?.on.toggle()
-                }
-            })
-        }
+        actionsService?.unapproveCommentWithBlock(block, completion: { [weak self] success in
+            if success {
+                self?.on.toggle()
+            }
+        })
     }
 
     private func approve(block: FormattableCommentContent) {
-        ReachabilityUtils.onAvailableInternetConnectionDo {
-            actionsService?.approveCommentWithBlock(block, completion: { [weak self] success in
-                if success {
-                    self?.on.toggle()
-                }
-            })
-        }
+        actionsService?.approveCommentWithBlock(block, completion: { [weak self] success in
+            if success {
+                self?.on.toggle()
+            }
+        })
     }
 }