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"]),
@@ -72,7 +71,18 @@ let package = Package(
             resources: [.process("Resources")],
             swiftSettings: [.swiftLanguageMode(.v5)]
         ),
-        .target(name: "FormattableContentKit", dependencies: ["WordPressShared"]),
+        .target(
+            name: "FormattableContentKit",
+            dependencies: [
+                "WordPressShared",
+                "WordPressUI",
+                .product(name: "Gridicons", package: "Gridicons-iOS"),
+                // TODO: Remove — It's here just for a NSMutableParagraphStyle init helper
+                .product(name: "WordPressKit", package: "WordPressKit"),
+            ],
+            // Set to v5 to avoid @Sendable warnings and errors
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
         .target(name: "JetpackStatsWidgetsCore", swiftSettings: [.swiftLanguageMode(.v5)]),
         .target(
             name: "ShareExtensionCore",
@@ -98,14 +108,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)]),
@@ -166,6 +168,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"]),
@@ -220,7 +223,6 @@ enum XcodeSupport {
                 "NotificationServiceExtensionCore",
                 "SFHFKeychainUtils",
                 "ShareExtensionCore",
-                "WordPressData",
                 "WordPressFlux",
                 "WordPressShared",
                 "WordPressReader",
@@ -266,6 +268,21 @@ 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: "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/Groups/HeaderContentGroup.swift

@@ -0,0 +1 @@
+public class HeaderContentGroup: FormattableContentGroup {}

Modules/Sources/FormattableContentKit/Groups/SubjectContentGroup.swift

@@ -0,0 +1 @@
+public class SubjectContentGroup: FormattableContentGroup {}

Modules/Sources/FormattableContentKit/Styles/SnippetsContentStyles.swift

@@ -0,0 +1,27 @@
+import WordPressShared
+
+public class SnippetsContentStyles: FormattableContentStyles {
+    public var attributes: [NSAttributedString.Key: Any] {
+        return WPStyleGuide.Notifications.snippetRegularStyle
+    }
+
+    public var quoteStyles: [NSAttributedString.Key: Any]?
+
+    public var rangeStylesMap: [FormattableRangeKind: [NSAttributedString.Key: Any]]?
+
+    public var linksColor: UIColor?
+
+    public var key: String
+
+    public init(
+        quoteStyles: [NSAttributedString.Key : Any]? = nil,
+        rangeStylesMap: [FormattableRangeKind : [NSAttributedString.Key : Any]]? = nil,
+        linksColor: UIColor? = nil,
+        key: String = "SnippetsContentStyles"
+    ) {
+        self.quoteStyles = quoteStyles
+        self.rangeStylesMap = rangeStylesMap
+        self.linksColor = linksColor
+        self.key = key
+    }
+}

WordPress/Classes/ViewRelated/Notifications/FormattableContent/Styles/SubjectContentStyles.swift → Modules/Sources/FormattableContentKit/Styles/SubjectContentStyles.swift

@@ -1,16 +1,15 @@
 import WordPressShared
-import FormattableContentKit
 
-class SubjectContentStyles: FormattableContentStyles {
-    var attributes: [NSAttributedString.Key: Any] {
+public class SubjectContentStyles: FormattableContentStyles {
+    public var attributes: [NSAttributedString.Key: Any] {
         return WPStyleGuide.Notifications.subjectRegularStyle
     }
 
-    var quoteStyles: [NSAttributedString.Key: Any]? {
+    public var quoteStyles: [NSAttributedString.Key: Any]? {
         return WPStyleGuide.Notifications.subjectItalicsStyle
     }
 
-    var rangeStylesMap: [FormattableRangeKind: [NSAttributedString.Key: Any]]? {
+    public var rangeStylesMap: [FormattableRangeKind: [NSAttributedString.Key: Any]]? {
         return [
             .user: WPStyleGuide.Notifications.subjectRegularStyle,
             .post: WPStyleGuide.Notifications.subjectRegularStyle,
@@ -21,6 +20,11 @@ class SubjectContentStyles: FormattableContentStyles {
         ]
     }
 
-    var linksColor: UIColor? = nil
-    var key: String = "SubjectContentStyles"
+    public var linksColor: UIColor?
+    public var key: String
+
+    public init(linkColor: UIColor? = nil, key: String = "SubjectContentStyles") {
+        self.linksColor = linkColor
+        self.key = key
+    }
 }