wordpress-mobile · kean · Mar 13, 2026
diff --git a/Modules/Package.swift b/Modules/Package.swift
@@ -24,6 +24,7 @@ let package = Package(
         .library(name: "WordPressReader", targets: ["WordPressReader"]),
         .library(name: "WordPressCore", targets: ["WordPressCore"]),
         .library(name: "WordPressCoreProtocols", targets: ["WordPressCoreProtocols"]),
+        .library(name: "WordPressData", targets: ["WordPressData"]),
     ],
     dependencies: [
         .package(url: "https://github.com/airbnb/lottie-ios", from: "4.4.0"),
@@ -164,6 +165,24 @@ let package = Package(
             // This package should never have dependencies – it exists to expose protocols implemented in WordPressCore
             // to UI code, because `wordpress-rs` doesn't work nicely with previews.
         ]),
+        .target(
+            name: "WordPressData",
+            dependencies: [
+                "BuildSettingsKit",
+                "FormattableContentKit",
+                "SFHFKeychainUtils",
+                "WordPressShared",
+                "WordPressKit",
+                .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"),
+            ],
+            resources: [.process("Resources")],
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
         .target(name: "WordPressIntelligence", dependencies: [
             "WordPressShared",
             .product(name: "SwiftSoup", package: "SwiftSoup"),
@@ -260,6 +279,7 @@ let package = Package(
         .testTarget(name: "WordPressSharedTests", dependencies: [.target(name: "WordPressShared")], swiftSettings: [.swiftLanguageMode(.v5)]),
         .testTarget(name: "WordPressSharedObjCTests", dependencies: [.target(name: "WordPressShared"), .target(name: "WordPressTesting")], swiftSettings: [.swiftLanguageMode(.v5)]),
         .testTarget(name: "WordPressUIUnitTests", dependencies: [.target(name: "WordPressUI")], swiftSettings: [.swiftLanguageMode(.v5)]),
+        .testTarget(name: "WordPressDataTests", dependencies: [.target(name: "WordPressData")], swiftSettings: [.swiftLanguageMode(.v5)]),
         .testTarget(name: "WordPressCoreTests", dependencies: [.target(name: "WordPressCore")]),
         .testTarget(name: "WordPressIntelligenceTests", dependencies: [.target(name: "WordPressIntelligence")]),
         .testTarget(name: "WordPressReaderTests", dependencies: [.target(name: "WordPressReader")])
@@ -286,9 +306,6 @@ 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_WordPressKitTests", targets: ["XcodeTarget_WordPressKitTests"]),
-            .library(name: "XcodeTarget_WordPressData", targets: ["XcodeTarget_WordPressData"]),
-            .library(name: "XcodeTarget_WordPressDataTests", targets: ["XcodeTarget_WordPressDataTests"]),
             .library(name: "XcodeTarget_WordPressAuthentificator", targets: ["XcodeTarget_WordPressAuthentificator"]),
             .library(name: "XcodeTarget_WordPressAuthentificatorTests", targets: ["XcodeTarget_WordPressAuthentificatorTests"]),
             .library(name: "XcodeTarget_ShareExtension", targets: ["XcodeTarget_ShareExtension"]),
@@ -360,6 +377,7 @@ enum XcodeSupport {
             "SFHFKeychainUtils",
             "ShareExtensionCore",
             "Support",
+            "WordPressData",
             "WordPressFlux",
             "WordPressIntelligence",
             "WordPressShared",
@@ -423,13 +441,6 @@ enum XcodeSupport {
                 .product(name: "NSURL-IDN", package: "NSURL-IDN"),
                 .product(name: "WordPressAPI", package: "wordpress-rs"),
             ]),
-            .xcodeTarget("XcodeTarget_WordPressKitTests", dependencies: testDependencies + [
-                "wpxmlrpc",
-                "WordPressKit",
-            ]),
-            .xcodeTarget("XcodeTarget_WordPressDataTests", dependencies: [
-                "WordPressKit",
-            ]),
             .xcodeTarget("XcodeTarget_WordPressAuthentificator", dependencies: wordPresAuthentificatorDependencies),
             .xcodeTarget("XcodeTarget_WordPressAuthentificatorTests", dependencies: wordPresAuthentificatorDependencies + testDependencies),
             .xcodeTarget("XcodeTarget_ShareExtension", dependencies: shareAndDraftExtensionsDependencies),
@@ -493,22 +504,6 @@ enum XcodeSupport {
             .xcodeTarget("XcodeTarget_UITests", dependencies: [
                 "UITestsFoundation",
             ]),
-            .xcodeTarget(
-                "XcodeTarget_WordPressData",
-                dependencies: [
-                    "BuildSettingsKit",
-                    "FormattableContentKit",
-                    "SFHFKeychainUtils",
-                    "WordPressShared",
-                    "WordPressKit",
-                    .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"),
-                ]
-            ),
         ]
     }
 }

diff --git a/Sources/WordPressData/Blog+Extensions.swift → ...urces/WordPressData/Blog+Extensions.swift b/Sources/WordPressData/Blog+Extensions.swift → ...urces/WordPressData/Blog+Extensions.swift
diff --git a/...ressData/Mapping/ReaderPost+Mapping.swift → ...ressData/Mapping/ReaderPost+Mapping.swift b/...ressData/Mapping/ReaderPost+Mapping.swift → ...ressData/Mapping/ReaderPost+Mapping.swift
diff --git a/.../WordPress.xcdatamodeld/.xccurrentversion → .../WordPress.xcdatamodeld/.xccurrentversion b/.../WordPress.xcdatamodeld/.xccurrentversion → .../WordPress.xcdatamodeld/.xccurrentversion
diff --git a/...modeld/WordPress 100.xcdatamodel/contents → ...modeld/WordPress 100.xcdatamodel/contents b/...modeld/WordPress 100.xcdatamodel/contents → ...modeld/WordPress 100.xcdatamodel/contents
diff --git a/...modeld/WordPress 101.xcdatamodel/contents → ...modeld/WordPress 101.xcdatamodel/contents b/...modeld/WordPress 101.xcdatamodel/contents → ...modeld/WordPress 101.xcdatamodel/contents
diff --git a/...modeld/WordPress 102.xcdatamodel/contents → ...modeld/WordPress 102.xcdatamodel/contents b/...modeld/WordPress 102.xcdatamodel/contents → ...modeld/WordPress 102.xcdatamodel/contents
diff --git a/...modeld/WordPress 103.xcdatamodel/contents → ...modeld/WordPress 103.xcdatamodel/contents b/...modeld/WordPress 103.xcdatamodel/contents → ...modeld/WordPress 103.xcdatamodel/contents
diff --git a/...modeld/WordPress 104.xcdatamodel/contents → ...modeld/WordPress 104.xcdatamodel/contents b/...modeld/WordPress 104.xcdatamodel/contents → ...modeld/WordPress 104.xcdatamodel/contents
diff --git a/...modeld/WordPress 105.xcdatamodel/contents → ...modeld/WordPress 105.xcdatamodel/contents b/...modeld/WordPress 105.xcdatamodel/contents → ...modeld/WordPress 105.xcdatamodel/contents
diff --git a/...modeld/WordPress 106.xcdatamodel/contents → ...modeld/WordPress 106.xcdatamodel/contents b/...modeld/WordPress 106.xcdatamodel/contents → ...modeld/WordPress 106.xcdatamodel/contents
diff --git a/...modeld/WordPress 107.xcdatamodel/contents → ...modeld/WordPress 107.xcdatamodel/contents b/...modeld/WordPress 107.xcdatamodel/contents → ...modeld/WordPress 107.xcdatamodel/contents
diff --git a/...modeld/WordPress 108.xcdatamodel/contents → ...modeld/WordPress 108.xcdatamodel/contents b/...modeld/WordPress 108.xcdatamodel/contents → ...modeld/WordPress 108.xcdatamodel/contents
diff --git a/...modeld/WordPress 109.xcdatamodel/contents → ...modeld/WordPress 109.xcdatamodel/contents b/...modeld/WordPress 109.xcdatamodel/contents → ...modeld/WordPress 109.xcdatamodel/contents
diff --git a/...modeld/WordPress 110.xcdatamodel/contents → ...modeld/WordPress 110.xcdatamodel/contents b/...modeld/WordPress 110.xcdatamodel/contents → ...modeld/WordPress 110.xcdatamodel/contents
diff --git a/...modeld/WordPress 111.xcdatamodel/contents → ...modeld/WordPress 111.xcdatamodel/contents b/...modeld/WordPress 111.xcdatamodel/contents → ...modeld/WordPress 111.xcdatamodel/contents
diff --git a/...modeld/WordPress 112.xcdatamodel/contents → ...modeld/WordPress 112.xcdatamodel/contents b/...modeld/WordPress 112.xcdatamodel/contents → ...modeld/WordPress 112.xcdatamodel/contents
diff --git a/...modeld/WordPress 113.xcdatamodel/contents → ...modeld/WordPress 113.xcdatamodel/contents b/...modeld/WordPress 113.xcdatamodel/contents → ...modeld/WordPress 113.xcdatamodel/contents
diff --git a/...modeld/WordPress 114.xcdatamodel/contents → ...modeld/WordPress 114.xcdatamodel/contents b/...modeld/WordPress 114.xcdatamodel/contents → ...modeld/WordPress 114.xcdatamodel/contents
diff --git a/...modeld/WordPress 115.xcdatamodel/contents → ...modeld/WordPress 115.xcdatamodel/contents b/...modeld/WordPress 115.xcdatamodel/contents → ...modeld/WordPress 115.xcdatamodel/contents
diff --git a/...modeld/WordPress 116.xcdatamodel/contents → ...modeld/WordPress 116.xcdatamodel/contents b/...modeld/WordPress 116.xcdatamodel/contents → ...modeld/WordPress 116.xcdatamodel/contents
diff --git a/...modeld/WordPress 117.xcdatamodel/contents → ...modeld/WordPress 117.xcdatamodel/contents b/...modeld/WordPress 117.xcdatamodel/contents → ...modeld/WordPress 117.xcdatamodel/contents
diff --git a/...modeld/WordPress 118.xcdatamodel/contents → ...modeld/WordPress 118.xcdatamodel/contents b/...modeld/WordPress 118.xcdatamodel/contents → ...modeld/WordPress 118.xcdatamodel/contents
diff --git a/...modeld/WordPress 119.xcdatamodel/contents → ...modeld/WordPress 119.xcdatamodel/contents b/...modeld/WordPress 119.xcdatamodel/contents → ...modeld/WordPress 119.xcdatamodel/contents
diff --git a/...modeld/WordPress 120.xcdatamodel/contents → ...modeld/WordPress 120.xcdatamodel/contents b/...modeld/WordPress 120.xcdatamodel/contents → ...modeld/WordPress 120.xcdatamodel/contents
diff --git a/...modeld/WordPress 121.xcdatamodel/contents → ...modeld/WordPress 121.xcdatamodel/contents b/...modeld/WordPress 121.xcdatamodel/contents → ...modeld/WordPress 121.xcdatamodel/contents
diff --git a/...modeld/WordPress 122.xcdatamodel/contents → ...modeld/WordPress 122.xcdatamodel/contents b/...modeld/WordPress 122.xcdatamodel/contents → ...modeld/WordPress 122.xcdatamodel/contents
diff --git a/...modeld/WordPress 123.xcdatamodel/contents → ...modeld/WordPress 123.xcdatamodel/contents b/...modeld/WordPress 123.xcdatamodel/contents → ...modeld/WordPress 123.xcdatamodel/contents
diff --git a/...modeld/WordPress 124.xcdatamodel/contents → ...modeld/WordPress 124.xcdatamodel/contents b/...modeld/WordPress 124.xcdatamodel/contents → ...modeld/WordPress 124.xcdatamodel/contents
diff --git a/...modeld/WordPress 125.xcdatamodel/contents → ...modeld/WordPress 125.xcdatamodel/contents b/...modeld/WordPress 125.xcdatamodel/contents → ...modeld/WordPress 125.xcdatamodel/contents
diff --git a/...modeld/WordPress 126.xcdatamodel/contents → ...modeld/WordPress 126.xcdatamodel/contents b/...modeld/WordPress 126.xcdatamodel/contents → ...modeld/WordPress 126.xcdatamodel/contents
diff --git a/...modeld/WordPress 127.xcdatamodel/contents → ...modeld/WordPress 127.xcdatamodel/contents b/...modeld/WordPress 127.xcdatamodel/contents → ...modeld/WordPress 127.xcdatamodel/contents
diff --git a/...modeld/WordPress 128.xcdatamodel/contents → ...modeld/WordPress 128.xcdatamodel/contents b/...modeld/WordPress 128.xcdatamodel/contents → ...modeld/WordPress 128.xcdatamodel/contents
diff --git a/...modeld/WordPress 129.xcdatamodel/contents → ...modeld/WordPress 129.xcdatamodel/contents b/...modeld/WordPress 129.xcdatamodel/contents → ...modeld/WordPress 129.xcdatamodel/contents
diff --git a/...modeld/WordPress 130.xcdatamodel/contents → ...modeld/WordPress 130.xcdatamodel/contents b/...modeld/WordPress 130.xcdatamodel/contents → ...modeld/WordPress 130.xcdatamodel/contents
diff --git a/...modeld/WordPress 131.xcdatamodel/contents → ...modeld/WordPress 131.xcdatamodel/contents b/...modeld/WordPress 131.xcdatamodel/contents → ...modeld/WordPress 131.xcdatamodel/contents
diff --git a/...modeld/WordPress 132.xcdatamodel/contents → ...modeld/WordPress 132.xcdatamodel/contents b/...modeld/WordPress 132.xcdatamodel/contents → ...modeld/WordPress 132.xcdatamodel/contents
diff --git a/...modeld/WordPress 133.xcdatamodel/contents → ...modeld/WordPress 133.xcdatamodel/contents b/...modeld/WordPress 133.xcdatamodel/contents → ...modeld/WordPress 133.xcdatamodel/contents
diff --git a/...modeld/WordPress 134.xcdatamodel/contents → ...modeld/WordPress 134.xcdatamodel/contents b/...modeld/WordPress 134.xcdatamodel/contents → ...modeld/WordPress 134.xcdatamodel/contents
diff --git a/...modeld/WordPress 135.xcdatamodel/contents → ...modeld/WordPress 135.xcdatamodel/contents b/...modeld/WordPress 135.xcdatamodel/contents → ...modeld/WordPress 135.xcdatamodel/contents
diff --git a/...modeld/WordPress 136.xcdatamodel/contents → ...modeld/WordPress 136.xcdatamodel/contents b/...modeld/WordPress 136.xcdatamodel/contents → ...modeld/WordPress 136.xcdatamodel/contents
diff --git a/...modeld/WordPress 137.xcdatamodel/contents → ...modeld/WordPress 137.xcdatamodel/contents b/...modeld/WordPress 137.xcdatamodel/contents → ...modeld/WordPress 137.xcdatamodel/contents
diff --git a/...modeld/WordPress 138.xcdatamodel/contents → ...modeld/WordPress 138.xcdatamodel/contents b/...modeld/WordPress 138.xcdatamodel/contents → ...modeld/WordPress 138.xcdatamodel/contents
diff --git a/...modeld/WordPress 139.xcdatamodel/contents → ...modeld/WordPress 139.xcdatamodel/contents b/...modeld/WordPress 139.xcdatamodel/contents → ...modeld/WordPress 139.xcdatamodel/contents
diff --git a/...modeld/WordPress 140.xcdatamodel/contents → ...modeld/WordPress 140.xcdatamodel/contents b/...modeld/WordPress 140.xcdatamodel/contents → ...modeld/WordPress 140.xcdatamodel/contents
diff --git a/...modeld/WordPress 141.xcdatamodel/contents → ...modeld/WordPress 141.xcdatamodel/contents b/...modeld/WordPress 141.xcdatamodel/contents → ...modeld/WordPress 141.xcdatamodel/contents
diff --git a/...modeld/WordPress 142.xcdatamodel/contents → ...modeld/WordPress 142.xcdatamodel/contents b/...modeld/WordPress 142.xcdatamodel/contents → ...modeld/WordPress 142.xcdatamodel/contents
diff --git a/...modeld/WordPress 143.xcdatamodel/contents → ...modeld/WordPress 143.xcdatamodel/contents b/...modeld/WordPress 143.xcdatamodel/contents → ...modeld/WordPress 143.xcdatamodel/contents
diff --git a/...modeld/WordPress 144.xcdatamodel/contents → ...modeld/WordPress 144.xcdatamodel/contents b/...modeld/WordPress 144.xcdatamodel/contents → ...modeld/WordPress 144.xcdatamodel/contents
diff --git a/...modeld/WordPress 145.xcdatamodel/contents → ...modeld/WordPress 145.xcdatamodel/contents b/...modeld/WordPress 145.xcdatamodel/contents → ...modeld/WordPress 145.xcdatamodel/contents
diff --git a/...modeld/WordPress 146.xcdatamodel/contents → ...modeld/WordPress 146.xcdatamodel/contents b/...modeld/WordPress 146.xcdatamodel/contents → ...modeld/WordPress 146.xcdatamodel/contents
diff --git a/...modeld/WordPress 147.xcdatamodel/contents → ...modeld/WordPress 147.xcdatamodel/contents b/...modeld/WordPress 147.xcdatamodel/contents → ...modeld/WordPress 147.xcdatamodel/contents
diff --git a/...modeld/WordPress 148.xcdatamodel/contents → ...modeld/WordPress 148.xcdatamodel/contents b/...modeld/WordPress 148.xcdatamodel/contents → ...modeld/WordPress 148.xcdatamodel/contents
diff --git a/...modeld/WordPress 149.xcdatamodel/contents → ...modeld/WordPress 149.xcdatamodel/contents b/...modeld/WordPress 149.xcdatamodel/contents → ...modeld/WordPress 149.xcdatamodel/contents
diff --git a/...modeld/WordPress 150.xcdatamodel/contents → ...modeld/WordPress 150.xcdatamodel/contents b/...modeld/WordPress 150.xcdatamodel/contents → ...modeld/WordPress 150.xcdatamodel/contents
diff --git a/...modeld/WordPress 151.xcdatamodel/contents → ...modeld/WordPress 151.xcdatamodel/contents b/...modeld/WordPress 151.xcdatamodel/contents → ...modeld/WordPress 151.xcdatamodel/contents
diff --git a/...modeld/WordPress 152.xcdatamodel/contents → ...modeld/WordPress 152.xcdatamodel/contents b/...modeld/WordPress 152.xcdatamodel/contents → ...modeld/WordPress 152.xcdatamodel/contents
diff --git a/...modeld/WordPress 153.xcdatamodel/contents → ...modeld/WordPress 153.xcdatamodel/contents b/...modeld/WordPress 153.xcdatamodel/contents → ...modeld/WordPress 153.xcdatamodel/contents
diff --git a/...modeld/WordPress 154.xcdatamodel/contents → ...modeld/WordPress 154.xcdatamodel/contents b/...modeld/WordPress 154.xcdatamodel/contents → ...modeld/WordPress 154.xcdatamodel/contents
diff --git a/...modeld/WordPress 155.xcdatamodel/contents → ...modeld/WordPress 155.xcdatamodel/contents b/...modeld/WordPress 155.xcdatamodel/contents → ...modeld/WordPress 155.xcdatamodel/contents
diff --git a/...modeld/WordPress 156.xcdatamodel/contents → ...modeld/WordPress 156.xcdatamodel/contents b/...modeld/WordPress 156.xcdatamodel/contents → ...modeld/WordPress 156.xcdatamodel/contents
diff --git a/...modeld/WordPress 157.xcdatamodel/contents → ...modeld/WordPress 157.xcdatamodel/contents b/...modeld/WordPress 157.xcdatamodel/contents → ...modeld/WordPress 157.xcdatamodel/contents
diff --git a/...modeld/WordPress 158.xcdatamodel/contents → ...modeld/WordPress 158.xcdatamodel/contents b/...modeld/WordPress 158.xcdatamodel/contents → ...modeld/WordPress 158.xcdatamodel/contents
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="24512" systemVersion="25D125" minimumToolsVersion="Xcode 9.0" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="24512" systemVersion="25D2128" minimumToolsVersion="Xcode 9.0" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="AbstractPost" representedClassName="AbstractPost" isAbstract="YES" parentEntity="BasePost">
         <attribute name="autosaveContent" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="autosaveExcerpt" optional="YES" attributeType="String" syncable="YES"/>

diff --git a/...essData/Swift/AbstractPost+Autosave.swift → ...essData/Swift/AbstractPost+Autosave.swift b/...essData/Swift/AbstractPost+Autosave.swift → ...essData/Swift/AbstractPost+Autosave.swift
diff --git a/...dPressData/Swift/AbstractPost+Blaze.swift → ...dPressData/Swift/AbstractPost+Blaze.swift b/...dPressData/Swift/AbstractPost+Blaze.swift → ...dPressData/Swift/AbstractPost+Blaze.swift
diff --git a/...ift/AbstractPost+CoreDataProperties.swift → ...ift/AbstractPost+CoreDataProperties.swift b/...ift/AbstractPost+CoreDataProperties.swift → ...ift/AbstractPost+CoreDataProperties.swift
diff --git a/...dPressData/Swift/AbstractPost+Local.swift → ...dPressData/Swift/AbstractPost+Local.swift b/...dPressData/Swift/AbstractPost+Local.swift → ...dPressData/Swift/AbstractPost+Local.swift
diff --git a/...sData/Swift/AbstractPost+Searchable.swift → ...sData/Swift/AbstractPost+Searchable.swift b/...sData/Swift/AbstractPost+Searchable.swift → ...sData/Swift/AbstractPost+Searchable.swift
diff --git a/...wift/AbstractPost+fixLocalMediaURLs.swift → ...wift/AbstractPost+fixLocalMediaURLs.swift b/...wift/AbstractPost+fixLocalMediaURLs.swift → ...wift/AbstractPost+fixLocalMediaURLs.swift
diff --git a/...es/WordPressData/Swift/AbstractPost.swift → ...es/WordPressData/Swift/AbstractPost.swift b/...es/WordPressData/Swift/AbstractPost.swift → ...es/WordPressData/Swift/AbstractPost.swift
diff --git a/.../WordPressData/Swift/AppEnvironment.swift → .../WordPressData/Swift/AppEnvironment.swift b/.../WordPressData/Swift/AppEnvironment.swift → .../WordPressData/Swift/AppEnvironment.swift
diff --git a/Sources/WordPressData/Swift/Array+Page.swift → ...rces/WordPressData/Swift/Array+Page.swift b/Sources/WordPressData/Swift/Array+Page.swift → ...rces/WordPressData/Swift/Array+Page.swift
diff --git a/...ordPressData/Swift/AuthKeyMigration.swift → ...ordPressData/Swift/AuthKeyMigration.swift b/...ordPressData/Swift/AuthKeyMigration.swift → ...ordPressData/Swift/AuthKeyMigration.swift
diff --git a/...a/Swift/BasePost+CoreDataProperties.swift → ...a/Swift/BasePost+CoreDataProperties.swift b/...a/Swift/BasePost+CoreDataProperties.swift → ...a/Swift/BasePost+CoreDataProperties.swift
diff --git a/.../Swift/BasePost+PostContentProvider.swift → .../Swift/BasePost+PostContentProvider.swift b/.../Swift/BasePost+PostContentProvider.swift → .../Swift/BasePost+PostContentProvider.swift
diff --git a/Sources/WordPressData/Swift/BasePost.swift → ...ources/WordPressData/Swift/BasePost.swift b/Sources/WordPressData/Swift/BasePost.swift → ...ources/WordPressData/Swift/BasePost.swift
diff --git a/...kEditorSettingElement+CoreDataClass.swift → ...kEditorSettingElement+CoreDataClass.swift b/...kEditorSettingElement+CoreDataClass.swift → ...kEditorSettingElement+CoreDataClass.swift
diff --git a/...orSettingElement+CoreDataProperties.swift → ...orSettingElement+CoreDataProperties.swift b/...orSettingElement+CoreDataProperties.swift → ...orSettingElement+CoreDataProperties.swift
diff --git a/...t/BlockEditorSettings+CoreDataClass.swift → ...t/BlockEditorSettings+CoreDataClass.swift b/...t/BlockEditorSettings+CoreDataClass.swift → ...t/BlockEditorSettings+CoreDataClass.swift
diff --git a/...ckEditorSettings+CoreDataProperties.swift → ...ckEditorSettings+CoreDataProperties.swift b/...ckEditorSettings+CoreDataProperties.swift → ...ckEditorSettings+CoreDataProperties.swift
diff --git a/...s/WordPressData/Swift/BlockedAuthor.swift → ...s/WordPressData/Swift/BlockedAuthor.swift b/...s/WordPressData/Swift/BlockedAuthor.swift → ...s/WordPressData/Swift/BlockedAuthor.swift
diff --git a/...ces/WordPressData/Swift/BlockedSite.swift → ...ces/WordPressData/Swift/BlockedSite.swift b/...ces/WordPressData/Swift/BlockedSite.swift → ...ces/WordPressData/Swift/BlockedSite.swift
diff --git a/...ordPressData/Swift/Blog+BlogAuthors.swift → ...ordPressData/Swift/Blog+BlogAuthors.swift b/...ordPressData/Swift/Blog+BlogAuthors.swift → ...ordPressData/Swift/Blog+BlogAuthors.swift
diff --git a/...rdPressData/Swift/Blog+Capabilities.swift → ...rdPressData/Swift/Blog+Capabilities.swift b/...rdPressData/Swift/Blog+Capabilities.swift → ...rdPressData/Swift/Blog+Capabilities.swift
diff --git a/...s/WordPressData/Swift/Blog+Creation.swift → ...s/WordPressData/Swift/Blog+Creation.swift b/...s/WordPressData/Swift/Blog+Creation.swift → ...s/WordPressData/Swift/Blog+Creation.swift
diff --git a/...s/WordPressData/Swift/Blog+Features.swift → ...s/WordPressData/Swift/Blog+Features.swift b/...s/WordPressData/Swift/Blog+Features.swift → ...s/WordPressData/Swift/Blog+Features.swift
diff --git a/...essData/Swift/Blog+HomepageSettings.swift → ...essData/Swift/Blog+HomepageSettings.swift b/...essData/Swift/Blog+HomepageSettings.swift → ...essData/Swift/Blog+HomepageSettings.swift
diff --git a/...es/WordPressData/Swift/Blog+Jetpack.swift → ...es/WordPressData/Swift/Blog+Jetpack.swift b/...es/WordPressData/Swift/Blog+Jetpack.swift → ...es/WordPressData/Swift/Blog+Jetpack.swift
diff --git a/...ces/WordPressData/Swift/Blog+Lookup.swift → ...ces/WordPressData/Swift/Blog+Lookup.swift b/...ces/WordPressData/Swift/Blog+Lookup.swift → ...ces/WordPressData/Swift/Blog+Lookup.swift
diff --git a/...es/WordPressData/Swift/Blog+Options.swift → ...es/WordPressData/Swift/Blog+Options.swift b/...es/WordPressData/Swift/Blog+Options.swift → ...es/WordPressData/Swift/Blog+Options.swift
diff --git a/Sources/WordPressData/Swift/Blog+Plans.swift → ...rces/WordPressData/Swift/Blog+Plans.swift b/Sources/WordPressData/Swift/Blog+Plans.swift → ...rces/WordPressData/Swift/Blog+Plans.swift
diff --git a/Sources/WordPressData/Swift/Blog+Post.swift → ...urces/WordPressData/Swift/Blog+Post.swift b/Sources/WordPressData/Swift/Blog+Post.swift → ...urces/WordPressData/Swift/Blog+Post.swift
diff --git a/Sources/WordPressData/Swift/Blog+Quota.swift → ...rces/WordPressData/Swift/Blog+Quota.swift b/Sources/WordPressData/Swift/Blog+Quota.swift → ...rces/WordPressData/Swift/Blog+Quota.swift
diff --git a/...WordPressData/Swift/Blog+SelfHosted.swift → ...WordPressData/Swift/Blog+SelfHosted.swift b/...WordPressData/Swift/Blog+SelfHosted.swift → ...WordPressData/Swift/Blog+SelfHosted.swift
diff --git a/Sources/WordPressData/Swift/Blog+Swift.swift → ...rces/WordPressData/Swift/Blog+Swift.swift b/Sources/WordPressData/Swift/Blog+Swift.swift → ...rces/WordPressData/Swift/Blog+Swift.swift
diff --git a/...Data/Swift/Blog+WordPressComRestAPI.swift → ...Data/Swift/Blog+WordPressComRestAPI.swift b/...Data/Swift/Blog+WordPressComRestAPI.swift → ...Data/Swift/Blog+WordPressComRestAPI.swift
diff --git a/Sources/WordPressData/Swift/Blog.swift → ...es/Sources/WordPressData/Swift/Blog.swift b/Sources/WordPressData/Swift/Blog.swift → ...es/Sources/WordPressData/Swift/Blog.swift
diff --git a/Sources/WordPressData/Swift/BlogAuthor.swift → ...rces/WordPressData/Swift/BlogAuthor.swift b/Sources/WordPressData/Swift/BlogAuthor.swift → ...rces/WordPressData/Swift/BlogAuthor.swift
diff --git a/Sources/WordPressData/Swift/BlogQuery.swift → ...urces/WordPressData/Swift/BlogQuery.swift b/Sources/WordPressData/Swift/BlogQuery.swift → ...urces/WordPressData/Swift/BlogQuery.swift
diff --git a/...es/WordPressData/Swift/BlogSettings.swift → ...es/WordPressData/Swift/BlogSettings.swift b/...es/WordPressData/Swift/BlogSettings.swift → ...es/WordPressData/Swift/BlogSettings.swift
diff --git a/.../Swift/BloggingPrompt+CoreDataClass.swift → .../Swift/BloggingPrompt+CoreDataClass.swift b/.../Swift/BloggingPrompt+CoreDataClass.swift → .../Swift/BloggingPrompt+CoreDataClass.swift
diff --git a/...t/BloggingPrompt+CoreDataProperties.swift → ...t/BloggingPrompt+CoreDataProperties.swift b/...t/BloggingPrompt+CoreDataProperties.swift → ...t/BloggingPrompt+CoreDataProperties.swift
diff --git a/...ta/Swift/BloggingPromptRemoteObject.swift → ...ta/Swift/BloggingPromptRemoteObject.swift b/...ta/Swift/BloggingPromptRemoteObject.swift → ...ta/Swift/BloggingPromptRemoteObject.swift
diff --git a/...loggingPromptSettings+CoreDataClass.swift → ...loggingPromptSettings+CoreDataClass.swift b/...loggingPromptSettings+CoreDataClass.swift → ...loggingPromptSettings+CoreDataClass.swift
diff --git a/...ngPromptSettings+CoreDataProperties.swift → ...ngPromptSettings+CoreDataProperties.swift b/...ngPromptSettings+CoreDataProperties.swift → ...ngPromptSettings+CoreDataProperties.swift
diff --git a/...tSettingsReminderDays+CoreDataClass.swift → ...tSettingsReminderDays+CoreDataClass.swift b/...tSettingsReminderDays+CoreDataClass.swift → ...tSettingsReminderDays+CoreDataClass.swift
diff --git a/...ingsReminderDays+CoreDataProperties.swift → ...ingsReminderDays+CoreDataProperties.swift b/...ingsReminderDays+CoreDataProperties.swift → ...ingsReminderDays+CoreDataProperties.swift
diff --git a/...ta/Swift/BloggingPromptsAttribution.swift → ...ta/Swift/BloggingPromptsAttribution.swift b/...ta/Swift/BloggingPromptsAttribution.swift → ...ta/Swift/BloggingPromptsAttribution.swift
diff --git a/...ressData/Swift/Bundle+WordPressData.swift → ...ressData/Swift/Bundle+WordPressData.swift b/...ressData/Swift/Bundle+WordPressData.swift → ...ressData/Swift/Bundle+WordPressData.swift
@@ -2,8 +2,9 @@
 
 extension Bundle {
     @objc public class var wordPressData: Bundle {
-        Bundle(for: BundleToken.self)
+        Bundle.module
+//        Bundle(for: BundleToken.self)
     }
 }
 
 private final class BundleToken {}
diff --git a/...essData/Swift/Comment+CoreDataClass.swift → ...essData/Swift/Comment+CoreDataClass.swift b/...essData/Swift/Comment+CoreDataClass.swift → ...essData/Swift/Comment+CoreDataClass.swift
diff --git a/...ta/Swift/Comment+CoreDataProperties.swift → ...ta/Swift/Comment+CoreDataProperties.swift b/...ta/Swift/Comment+CoreDataProperties.swift → ...ta/Swift/Comment+CoreDataProperties.swift
diff --git a/.../Swift/ContextManager+ErrorHandling.swift → .../Swift/ContextManager+ErrorHandling.swift b/.../Swift/ContextManager+ErrorHandling.swift → .../Swift/ContextManager+ErrorHandling.swift
diff --git a/.../WordPressData/Swift/ContextManager.swift → .../WordPressData/Swift/ContextManager.swift b/.../WordPressData/Swift/ContextManager.swift → .../WordPressData/Swift/ContextManager.swift
diff --git a/.../WordPressData/Swift/CoreDataHelper.swift → .../WordPressData/Swift/CoreDataHelper.swift b/.../WordPressData/Swift/CoreDataHelper.swift → .../WordPressData/Swift/CoreDataHelper.swift
diff --git a/...ata/Swift/CoreDataIterativeMigrator.swift → ...ata/Swift/CoreDataIterativeMigrator.swift b/...ata/Swift/CoreDataIterativeMigrator.swift → ...ata/Swift/CoreDataIterativeMigrator.swift
diff --git a/...s/WordPressData/Swift/CoreDataStack.swift → ...s/WordPressData/Swift/CoreDataStack.swift b/...s/WordPressData/Swift/CoreDataStack.swift → ...s/WordPressData/Swift/CoreDataStack.swift
diff --git a/...dPressData/Swift/CoreDataStackSwift.swift → ...dPressData/Swift/CoreDataStackSwift.swift b/...dPressData/Swift/CoreDataStackSwift.swift → ...dPressData/Swift/CoreDataStackSwift.swift
diff --git a/...rdPressData/Swift/DiffAbstractValue.swift → ...rdPressData/Swift/DiffAbstractValue.swift b/...rdPressData/Swift/DiffAbstractValue.swift → ...rdPressData/Swift/DiffAbstractValue.swift
diff --git a/...ordPressData/Swift/DiffContentValue.swift → ...ordPressData/Swift/DiffContentValue.swift b/...ordPressData/Swift/DiffContentValue.swift → ...ordPressData/Swift/DiffContentValue.swift
diff --git a/.../WordPressData/Swift/DiffTitleValue.swift → .../WordPressData/Swift/DiffTitleValue.swift b/.../WordPressData/Swift/DiffTitleValue.swift → .../WordPressData/Swift/DiffTitleValue.swift
diff --git a/Sources/WordPressData/Swift/Domain.swift → .../Sources/WordPressData/Swift/Domain.swift b/Sources/WordPressData/Swift/Domain.swift → .../Sources/WordPressData/Swift/Domain.swift
@@ -64,9 +64,9 @@
     }
 }
 
-extension Domain: @retroactive Equatable {}
+extension Domain: Equatable {}
 
 public func ==(lhs: Domain, rhs: Domain) -> Bool {
     return lhs.domainName == rhs.domainName &&
        lhs.domainType == rhs.domainType &&
        lhs.isPrimaryDomain == rhs.isPrimaryDomain &&

diff --git a/...WordPressData/Swift/GravatarProfile.swift → ...WordPressData/Swift/GravatarProfile.swift b/...WordPressData/Swift/GravatarProfile.swift → ...WordPressData/Swift/GravatarProfile.swift
diff --git a/...ata/Swift/InviteLinks+CoreDataClass.swift → ...ata/Swift/InviteLinks+CoreDataClass.swift b/...ata/Swift/InviteLinks+CoreDataClass.swift → ...ata/Swift/InviteLinks+CoreDataClass.swift
diff --git a/...wift/InviteLinks+CoreDataProperties.swift → ...wift/InviteLinks+CoreDataProperties.swift b/...wift/InviteLinks+CoreDataProperties.swift → ...wift/InviteLinks+CoreDataProperties.swift
diff --git a/...es/WordPressData/Swift/JetpackState.swift → ...es/WordPressData/Swift/JetpackState.swift b/...es/WordPressData/Swift/JetpackState.swift → ...es/WordPressData/Swift/JetpackState.swift
diff --git a/...ssData/Swift/LikeUser+CoreDataClass.swift → ...ssData/Swift/LikeUser+CoreDataClass.swift b/...ssData/Swift/LikeUser+CoreDataClass.swift → ...ssData/Swift/LikeUser+CoreDataClass.swift
diff --git a/...a/Swift/LikeUser+CoreDataProperties.swift → ...a/Swift/LikeUser+CoreDataProperties.swift b/...a/Swift/LikeUser+CoreDataProperties.swift → ...a/Swift/LikeUser+CoreDataProperties.swift
diff --git a/...LikeUserPreferredBlog+CoreDataClass.swift → ...LikeUserPreferredBlog+CoreDataClass.swift b/...LikeUserPreferredBlog+CoreDataClass.swift → ...LikeUserPreferredBlog+CoreDataClass.swift
diff --git a/...serPreferredBlog+CoreDataProperties.swift → ...serPreferredBlog+CoreDataProperties.swift b/...serPreferredBlog+CoreDataProperties.swift → ...serPreferredBlog+CoreDataProperties.swift
diff --git a/...dAccountSettings+CoreDataProperties.swift → ...dAccountSettings+CoreDataProperties.swift b/...dAccountSettings+CoreDataProperties.swift → ...dAccountSettings+CoreDataProperties.swift
diff --git a/...ssData/Swift/ManagedAccountSettings.swift → ...ssData/Swift/ManagedAccountSettings.swift b/...ssData/Swift/ManagedAccountSettings.swift → ...ssData/Swift/ManagedAccountSettings.swift
diff --git a/...ft/ManagedPerson+CoreDataProperties.swift → ...ft/ManagedPerson+CoreDataProperties.swift b/...ft/ManagedPerson+CoreDataProperties.swift → ...ft/ManagedPerson+CoreDataProperties.swift
diff --git a/...s/WordPressData/Swift/ManagedPerson.swift → ...s/WordPressData/Swift/ManagedPerson.swift b/...s/WordPressData/Swift/ManagedPerson.swift → ...s/WordPressData/Swift/ManagedPerson.swift
diff --git a/Sources/WordPressData/Swift/Media+Blog.swift → ...rces/WordPressData/Swift/Media+Blog.swift b/Sources/WordPressData/Swift/Media+Blog.swift → ...rces/WordPressData/Swift/Media+Blog.swift
diff --git a/Sources/WordPressData/Swift/Media.swift → ...s/Sources/WordPressData/Swift/Media.swift b/Sources/WordPressData/Swift/Media.swift → ...s/Sources/WordPressData/Swift/Media.swift
diff --git a/...ordPressData/Swift/MediaFileManager.swift → ...ordPressData/Swift/MediaFileManager.swift b/...ordPressData/Swift/MediaFileManager.swift → ...ordPressData/Swift/MediaFileManager.swift
diff --git a/...sData/Swift/Menu+CoreDataProperties.swift → ...sData/Swift/Menu+CoreDataProperties.swift b/...sData/Swift/Menu+CoreDataProperties.swift → ...sData/Swift/Menu+CoreDataProperties.swift
diff --git a/Sources/WordPressData/Swift/Menu.swift → ...es/Sources/WordPressData/Swift/Menu.swift b/Sources/WordPressData/Swift/Menu.swift → ...es/Sources/WordPressData/Swift/Menu.swift
diff --git a/...a/Swift/MenuItem+CoreDataProperties.swift → ...a/Swift/MenuItem+CoreDataProperties.swift b/...a/Swift/MenuItem+CoreDataProperties.swift → ...a/Swift/MenuItem+CoreDataProperties.swift
diff --git a/Sources/WordPressData/Swift/MenuItem.swift → ...ources/WordPressData/Swift/MenuItem.swift b/Sources/WordPressData/Swift/MenuItem.swift → ...ources/WordPressData/Swift/MenuItem.swift
diff --git a/...es/WordPressData/Swift/MenuLocation.swift → ...es/WordPressData/Swift/MenuLocation.swift b/...es/WordPressData/Swift/MenuLocation.swift → ...es/WordPressData/Swift/MenuLocation.swift
diff --git a/...ssData/Swift/NSManagedObject+Lookup.swift → ...ssData/Swift/NSManagedObject+Lookup.swift b/...ssData/Swift/NSManagedObject+Lookup.swift → ...ssData/Swift/NSManagedObject+Lookup.swift
diff --git a/...WordPressData/Swift/NSManagedObject.swift → ...WordPressData/Swift/NSManagedObject.swift b/...WordPressData/Swift/NSManagedObject.swift → ...WordPressData/Swift/NSManagedObject.swift
diff --git a/...es/WordPressData/Swift/Notification.swift → ...es/WordPressData/Swift/Notification.swift b/...es/WordPressData/Swift/Notification.swift → ...es/WordPressData/Swift/Notification.swift
diff --git a/...ata/Swift/NullBlogPropertySanitizer.swift → ...ata/Swift/NullBlogPropertySanitizer.swift b/...ata/Swift/NullBlogPropertySanitizer.swift → ...ata/Swift/NullBlogPropertySanitizer.swift
diff --git a/...sData/Swift/Page+CoreDataProperties.swift → ...sData/Swift/Page+CoreDataProperties.swift b/...sData/Swift/Page+CoreDataProperties.swift → ...sData/Swift/Page+CoreDataProperties.swift
diff --git a/Sources/WordPressData/Swift/Page.swift → ...es/Sources/WordPressData/Swift/Page.swift b/Sources/WordPressData/Swift/Page.swift → ...es/Sources/WordPressData/Swift/Page.swift
diff --git a/.../PageTemplateCategory+CoreDataClass.swift → .../PageTemplateCategory+CoreDataClass.swift b/.../PageTemplateCategory+CoreDataClass.swift → .../PageTemplateCategory+CoreDataClass.swift
diff --git a/...TemplateCategory+CoreDataProperties.swift → ...TemplateCategory+CoreDataProperties.swift b/...TemplateCategory+CoreDataProperties.swift → ...TemplateCategory+CoreDataProperties.swift
diff --git a/...ft/PageTemplateLayout+CoreDataClass.swift → ...ft/PageTemplateLayout+CoreDataClass.swift b/...ft/PageTemplateLayout+CoreDataClass.swift → ...ft/PageTemplateLayout+CoreDataClass.swift
diff --git a/...geTemplateLayout+CoreDataProperties.swift → ...geTemplateLayout+CoreDataProperties.swift b/...geTemplateLayout+CoreDataProperties.swift → ...geTemplateLayout+CoreDataProperties.swift
diff --git a/Sources/WordPressData/Swift/Plan.swift → ...es/Sources/WordPressData/Swift/Plan.swift b/Sources/WordPressData/Swift/Plan.swift → ...es/Sources/WordPressData/Swift/Plan.swift
diff --git a/...ces/WordPressData/Swift/PlanFeature.swift → ...ces/WordPressData/Swift/PlanFeature.swift b/...ces/WordPressData/Swift/PlanFeature.swift → ...ces/WordPressData/Swift/PlanFeature.swift
diff --git a/Sources/WordPressData/Swift/PlanGroup.swift → ...urces/WordPressData/Swift/PlanGroup.swift b/Sources/WordPressData/Swift/PlanGroup.swift → ...urces/WordPressData/Swift/PlanGroup.swift
diff --git a/...sData/Swift/Post+CoreDataProperties.swift → ...sData/Swift/Post+CoreDataProperties.swift b/...sData/Swift/Post+CoreDataProperties.swift → ...sData/Swift/Post+CoreDataProperties.swift
diff --git a/Sources/WordPressData/Swift/Post.swift → ...es/Sources/WordPressData/Swift/Post.swift b/Sources/WordPressData/Swift/Post.swift → ...es/Sources/WordPressData/Swift/Post.swift
diff --git a/...ta/Swift/PostCategory+CoreDataClass.swift → ...ta/Swift/PostCategory+CoreDataClass.swift b/...ta/Swift/PostCategory+CoreDataClass.swift → ...ta/Swift/PostCategory+CoreDataClass.swift
diff --git a/...ift/PostCategory+CoreDataProperties.swift → ...ift/PostCategory+CoreDataProperties.swift b/...ift/PostCategory+CoreDataProperties.swift → ...ift/PostCategory+CoreDataProperties.swift
diff --git a/...essData/Swift/PostCategory+Creation.swift → ...essData/Swift/PostCategory+Creation.swift b/...essData/Swift/PostCategory+Creation.swift → ...essData/Swift/PostCategory+Creation.swift
diff --git a/...PressData/Swift/PostCategory+Lookup.swift → ...PressData/Swift/PostCategory+Lookup.swift b/...PressData/Swift/PostCategory+Lookup.swift → ...PressData/Swift/PostCategory+Lookup.swift
diff --git a/...es/WordPressData/Swift/PostMetadata.swift → ...es/WordPressData/Swift/PostMetadata.swift b/...es/WordPressData/Swift/PostMetadata.swift → ...es/WordPressData/Swift/PostMetadata.swift
diff --git a/...essData/Swift/PostMetadataContainer.swift → ...essData/Swift/PostMetadataContainer.swift b/...essData/Swift/PostMetadataContainer.swift → ...essData/Swift/PostMetadataContainer.swift
@@ -29,7 +29,7 @@
 /// ]
 /// ```
 public struct PostMetadataContainer {
-    public struct Key: ExpressibleByStringLiteral, Hashable {
+    public struct Key: ExpressibleByStringLiteral, Hashable, Sendable {
         public let rawValue: String
 
         public init(rawValue: String) {
@@ -125,7 +125,7 @@
        return value
    }

    private func _getValue(forKey key: Key) -> Any? {
        items[key]?["value"]
    }


diff --git a/...Data/Swift/PostServiceRemoteFactory.swift → ...Data/Swift/PostServiceRemoteFactory.swift b/...Data/Swift/PostServiceRemoteFactory.swift → ...Data/Swift/PostServiceRemoteFactory.swift
diff --git a/...essData/Swift/PostTag+CoreDataClass.swift → ...essData/Swift/PostTag+CoreDataClass.swift b/...essData/Swift/PostTag+CoreDataClass.swift → ...essData/Swift/PostTag+CoreDataClass.swift
diff --git a/...ta/Swift/PostTag+CoreDataProperties.swift → ...ta/Swift/PostTag+CoreDataProperties.swift b/...ta/Swift/PostTag+CoreDataProperties.swift → ...ta/Swift/PostTag+CoreDataProperties.swift
diff --git a/...ssData/Swift/PostType+CoreDataClass.swift → ...ssData/Swift/PostType+CoreDataClass.swift b/...ssData/Swift/PostType+CoreDataClass.swift → ...ssData/Swift/PostType+CoreDataClass.swift
diff --git a/...a/Swift/PostType+CoreDataProperties.swift → ...a/Swift/PostType+CoreDataProperties.swift b/...a/Swift/PostType+CoreDataProperties.swift → ...a/Swift/PostType+CoreDataProperties.swift
diff --git a/.../WordPressData/Swift/PostVisibility.swift → .../WordPressData/Swift/PostVisibility.swift b/.../WordPressData/Swift/PostVisibility.swift → .../WordPressData/Swift/PostVisibility.swift
diff --git a/...PressData/Swift/PublicizeConnection.swift → ...PressData/Swift/PublicizeConnection.swift b/...PressData/Swift/PublicizeConnection.swift → ...PressData/Swift/PublicizeConnection.swift
diff --git a/...a/Swift/PublicizeInfo+CoreDataClass.swift → ...a/Swift/PublicizeInfo+CoreDataClass.swift b/...a/Swift/PublicizeInfo+CoreDataClass.swift → ...a/Swift/PublicizeInfo+CoreDataClass.swift
diff --git a/...ft/PublicizeInfo+CoreDataProperties.swift → ...ft/PublicizeInfo+CoreDataProperties.swift b/...ft/PublicizeInfo+CoreDataProperties.swift → ...ft/PublicizeInfo+CoreDataProperties.swift
diff --git a/...ordPressData/Swift/PublicizeService.swift → ...ordPressData/Swift/PublicizeService.swift b/...ordPressData/Swift/PublicizeService.swift → ...ordPressData/Swift/PublicizeService.swift
diff --git a/...ta/Swift/ReaderAbstractTopic+Lookup.swift → ...ta/Swift/ReaderAbstractTopic+Lookup.swift b/...ta/Swift/ReaderAbstractTopic+Lookup.swift → ...ta/Swift/ReaderAbstractTopic+Lookup.swift
diff --git a/...PressData/Swift/ReaderAbstractTopic.swift → ...PressData/Swift/ReaderAbstractTopic.swift b/...PressData/Swift/ReaderAbstractTopic.swift → ...PressData/Swift/ReaderAbstractTopic.swift
diff --git a/...Data/Swift/ReaderCard+CoreDataClass.swift → ...Data/Swift/ReaderCard+CoreDataClass.swift b/...Data/Swift/ReaderCard+CoreDataClass.swift → ...Data/Swift/ReaderCard+CoreDataClass.swift
diff --git a/...Swift/ReaderCard+CoreDataProperties.swift → ...Swift/ReaderCard+CoreDataProperties.swift b/...Swift/ReaderCard+CoreDataProperties.swift → ...Swift/ReaderCard+CoreDataProperties.swift
diff --git a/...PressData/Swift/ReaderCrossPostMeta.swift → ...PressData/Swift/ReaderCrossPostMeta.swift b/...PressData/Swift/ReaderCrossPostMeta.swift → ...PressData/Swift/ReaderCrossPostMeta.swift
diff --git a/...dPressData/Swift/ReaderDefaultTopic.swift → ...dPressData/Swift/ReaderDefaultTopic.swift b/...dPressData/Swift/ReaderDefaultTopic.swift → ...dPressData/Swift/ReaderDefaultTopic.swift
diff --git a/...WordPressData/Swift/ReaderGapMarker.swift → ...WordPressData/Swift/ReaderGapMarker.swift b/...WordPressData/Swift/ReaderGapMarker.swift → ...WordPressData/Swift/ReaderGapMarker.swift
diff --git a/...WordPressData/Swift/ReaderListTopic.swift → ...WordPressData/Swift/ReaderListTopic.swift b/...WordPressData/Swift/ReaderListTopic.swift → ...WordPressData/Swift/ReaderListTopic.swift
diff --git a/...Swift/ReaderPost+CoreDataProperties.swift → ...Swift/ReaderPost+CoreDataProperties.swift b/...Swift/ReaderPost+CoreDataProperties.swift → ...Swift/ReaderPost+CoreDataProperties.swift
diff --git a/Sources/WordPressData/Swift/ReaderPost.swift → ...rces/WordPressData/Swift/ReaderPost.swift b/Sources/WordPressData/Swift/ReaderPost.swift → ...rces/WordPressData/Swift/ReaderPost.swift
@@ -51,8 +51,8 @@ extension ReaderPost {
 extension ReaderPost {
 
     public func blogNameForDisplay() -> String? {
-        if let blogName, !blogName.isEmpty {
-            return blogName.replacing(/\s+/, with: " ")
+        if let blogName, !blogName.isEmpty, let regex = try? Regex(#"\s+"#) {
+            return blogName.replacing(regex, with: " ")
         }
         return URL(string: blogURL ?? "")?.host
     }

diff --git a/...rdPressData/Swift/ReaderSearchTopic.swift → ...rdPressData/Swift/ReaderSearchTopic.swift b/...rdPressData/Swift/ReaderSearchTopic.swift → ...rdPressData/Swift/ReaderSearchTopic.swift
diff --git a/...a/Swift/ReaderSiteInfoSubscriptions.swift → ...a/Swift/ReaderSiteInfoSubscriptions.swift b/...a/Swift/ReaderSiteInfoSubscriptions.swift → ...a/Swift/ReaderSiteInfoSubscriptions.swift
diff --git a/...ssData/Swift/ReaderSiteTopic+Lookup.swift → ...ssData/Swift/ReaderSiteTopic+Lookup.swift b/...ssData/Swift/ReaderSiteTopic+Lookup.swift → ...ssData/Swift/ReaderSiteTopic+Lookup.swift
diff --git a/...WordPressData/Swift/ReaderSiteTopic.swift → ...WordPressData/Swift/ReaderSiteTopic.swift b/...WordPressData/Swift/ReaderSiteTopic.swift → ...WordPressData/Swift/ReaderSiteTopic.swift
diff --git a/.../WordPressData/Swift/ReaderTagTopic.swift → .../WordPressData/Swift/ReaderTagTopic.swift b/.../WordPressData/Swift/ReaderTagTopic.swift → .../WordPressData/Swift/ReaderTagTopic.swift
diff --git a/...WordPressData/Swift/ReaderTeamTopic.swift → ...WordPressData/Swift/ReaderTeamTopic.swift b/...WordPressData/Swift/ReaderTeamTopic.swift → ...WordPressData/Swift/ReaderTeamTopic.swift
diff --git a/Sources/WordPressData/Swift/Revision.swift → ...ources/WordPressData/Swift/Revision.swift b/Sources/WordPressData/Swift/Revision.swift → ...ources/WordPressData/Swift/Revision.swift
diff --git a/...essData/Swift/RevisionDiff+CoreData.swift → ...essData/Swift/RevisionDiff+CoreData.swift b/...essData/Swift/RevisionDiff+CoreData.swift → ...essData/Swift/RevisionDiff+CoreData.swift
diff --git a/...es/WordPressData/Swift/RevisionDiff.swift → ...es/WordPressData/Swift/RevisionDiff.swift b/...es/WordPressData/Swift/RevisionDiff.swift → ...es/WordPressData/Swift/RevisionDiff.swift
diff --git a/Sources/WordPressData/Swift/Role.swift → ...es/Sources/WordPressData/Swift/Role.swift b/Sources/WordPressData/Swift/Role.swift → ...es/Sources/WordPressData/Swift/Role.swift
diff --git a/...ata/Swift/SearchIdentifierGenerator.swift → ...ata/Swift/SearchIdentifierGenerator.swift b/...ata/Swift/SearchIdentifierGenerator.swift → ...ata/Swift/SearchIdentifierGenerator.swift
diff --git a/...Swift/SearchableActivityConvertable.swift → ...Swift/SearchableActivityConvertable.swift b/...Swift/SearchableActivityConvertable.swift → ...Swift/SearchableActivityConvertable.swift
diff --git a/...ata/Swift/SearchableItemConvertable.swift → ...ata/Swift/SearchableItemConvertable.swift b/...ata/Swift/SearchableItemConvertable.swift → ...ata/Swift/SearchableItemConvertable.swift
diff --git a/...essData/Swift/SharedDataIssueSolver.swift → ...essData/Swift/SharedDataIssueSolver.swift b/...essData/Swift/SharedDataIssueSolver.swift → ...essData/Swift/SharedDataIssueSolver.swift
diff --git a/...ressData/Swift/SharingButton+Lookup.swift → ...ressData/Swift/SharingButton+Lookup.swift b/...ressData/Swift/SharingButton+Lookup.swift → ...ressData/Swift/SharingButton+Lookup.swift
diff --git a/...s/WordPressData/Swift/SharingButton.swift → ...s/WordPressData/Swift/SharingButton.swift b/...s/WordPressData/Swift/SharingButton.swift → ...s/WordPressData/Swift/SharingButton.swift
diff --git a/...WordPressData/Swift/SiteInformation.swift → ...WordPressData/Swift/SiteInformation.swift b/...WordPressData/Swift/SiteInformation.swift → ...WordPressData/Swift/SiteInformation.swift
diff --git a/...ressData/Swift/SiteOrganizationType.swift → ...ressData/Swift/SiteOrganizationType.swift b/...ressData/Swift/SiteOrganizationType.swift → ...ressData/Swift/SiteOrganizationType.swift
diff --git a/.../Swift/SiteSuggestion+CoreDataClass.swift → .../Swift/SiteSuggestion+CoreDataClass.swift b/.../Swift/SiteSuggestion+CoreDataClass.swift → .../Swift/SiteSuggestion+CoreDataClass.swift
diff --git a/...t/SiteSuggestion+CoreDataProperties.swift → ...t/SiteSuggestion+CoreDataProperties.swift b/...t/SiteSuggestion+CoreDataProperties.swift → ...t/SiteSuggestion+CoreDataProperties.swift
diff --git a/...es/WordPressData/Swift/SiteTaxonomy.swift → ...es/WordPressData/Swift/SiteTaxonomy.swift b/...es/WordPressData/Swift/SiteTaxonomy.swift → ...es/WordPressData/Swift/SiteTaxonomy.swift
diff --git a/...SourcePostAttribution+CoreDataClass.swift → ...SourcePostAttribution+CoreDataClass.swift b/...SourcePostAttribution+CoreDataClass.swift → ...SourcePostAttribution+CoreDataClass.swift
diff --git a/...ePostAttribution+CoreDataProperties.swift → ...ePostAttribution+CoreDataProperties.swift b/...ePostAttribution+CoreDataProperties.swift → ...ePostAttribution+CoreDataProperties.swift
diff --git a/Sources/WordPressData/Swift/Suggestion.swift → ...rces/WordPressData/Swift/Suggestion.swift b/Sources/WordPressData/Swift/Suggestion.swift → ...rces/WordPressData/Swift/Suggestion.swift
diff --git a/...essData/Swift/TaggedManagedObjectID.swift → ...essData/Swift/TaggedManagedObjectID.swift b/...essData/Swift/TaggedManagedObjectID.swift → ...essData/Swift/TaggedManagedObjectID.swift
diff --git a/...Data/Swift/Theme+CoreDataProperties.swift → ...Data/Swift/Theme+CoreDataProperties.swift b/...Data/Swift/Theme+CoreDataProperties.swift → ...Data/Swift/Theme+CoreDataProperties.swift
diff --git a/...ces/WordPressData/Swift/Theme+Swift.swift → ...ces/WordPressData/Swift/Theme+Swift.swift b/...ces/WordPressData/Swift/Theme+Swift.swift → ...ces/WordPressData/Swift/Theme+Swift.swift
diff --git a/Sources/WordPressData/Swift/Theme.swift → ...s/Sources/WordPressData/Swift/Theme.swift b/Sources/WordPressData/Swift/Theme.swift → ...s/Sources/WordPressData/Swift/Theme.swift
diff --git a/...s/WordPressData/Swift/ThemeIdHelper.swift → ...s/WordPressData/Swift/ThemeIdHelper.swift b/...s/WordPressData/Swift/ThemeIdHelper.swift → ...s/WordPressData/Swift/ThemeIdHelper.swift
diff --git a/...es/WordPressData/Swift/UserSettings.swift → ...es/WordPressData/Swift/UserSettings.swift b/...es/WordPressData/Swift/UserSettings.swift → ...es/WordPressData/Swift/UserSettings.swift
diff --git a/...ata/Swift/UserSuggestion+Comparable.swift → ...ata/Swift/UserSuggestion+Comparable.swift b/...ata/Swift/UserSuggestion+Comparable.swift → ...ata/Swift/UserSuggestion+Comparable.swift
diff --git a/.../Swift/UserSuggestion+CoreDataClass.swift → .../Swift/UserSuggestion+CoreDataClass.swift b/.../Swift/UserSuggestion+CoreDataClass.swift → .../Swift/UserSuggestion+CoreDataClass.swift
diff --git a/...t/UserSuggestion+CoreDataProperties.swift → ...t/UserSuggestion+CoreDataProperties.swift b/...t/UserSuggestion+CoreDataProperties.swift → ...t/UserSuggestion+CoreDataProperties.swift
diff --git a/...ordPressData/Swift/WPAccount+Lookup.swift → ...ordPressData/Swift/WPAccount+Lookup.swift b/...ordPressData/Swift/WPAccount+Lookup.swift → ...ordPressData/Swift/WPAccount+Lookup.swift
diff --git a/...rdPressData/Swift/WPAccount+RestApi.swift → ...rdPressData/Swift/WPAccount+RestApi.swift b/...rdPressData/Swift/WPAccount+RestApi.swift → ...rdPressData/Swift/WPAccount+RestApi.swift
diff --git a/Sources/WordPressData/Swift/WPAccount.swift → ...urces/WordPressData/Swift/WPAccount.swift b/Sources/WordPressData/Swift/WPAccount.swift → ...urces/WordPressData/Swift/WPAccount.swift
diff --git a/.../Swift/WordPressComRestApi+Defaults.swift → .../Swift/WordPressComRestApi+Defaults.swift b/.../Swift/WordPressComRestApi+Defaults.swift → .../Swift/WordPressComRestApi+Defaults.swift
diff --git a/...Swift/WordPressOrgRestApi+WordPress.swift → ...Swift/WordPressOrgRestApi+WordPress.swift b/...Swift/WordPressOrgRestApi+WordPress.swift → ...Swift/WordPressOrgRestApi+WordPress.swift
diff --git a/...es/WordPressData/WordPressDataDummy.swift → ...es/WordPressData/WordPressDataDummy.swift b/...es/WordPressData/WordPressDataDummy.swift → ...es/WordPressData/WordPressDataDummy.swift
diff --git a/Modules/Sources/XcodeSupport/XcodeTarget_WordPressData/Empty.swift b/Modules/Sources/XcodeSupport/XcodeTarget_WordPressData/Empty.swift
diff --git a/Modules/Sources/XcodeSupport/XcodeTarget_WordPressDataTests/Empty.swift b/Modules/Sources/XcodeSupport/XcodeTarget_WordPressDataTests/Empty.swift
diff --git a/Modules/Sources/XcodeSupport/XcodeTarget_WordPressKit/Empty.swift b/Modules/Sources/XcodeSupport/XcodeTarget_WordPressKit/Empty.swift
diff --git a/Modules/Sources/XcodeSupport/XcodeTarget_WordPressKitTests/Empty.swift b/Modules/Sources/XcodeSupport/XcodeTarget_WordPressKitTests/Empty.swift
diff --git a/Tests/WordPressDataTests/BlogTests.swift → .../Tests/WordPressDataTests/BlogTests.swift b/Tests/WordPressDataTests/BlogTests.swift → .../Tests/WordPressDataTests/BlogTests.swift
diff --git a/...dPressDataTests/ContextManagerTests.swift → ...dPressDataTests/ContextManagerTests.swift b/...dPressDataTests/ContextManagerTests.swift → ...dPressDataTests/ContextManagerTests.swift
diff --git a/...dPressDataTests/CoreDataHelperTests.swift → ...dPressDataTests/CoreDataHelperTests.swift b/...dPressDataTests/CoreDataHelperTests.swift → ...dPressDataTests/CoreDataHelperTests.swift
diff --git a/...essDataTests/CoreDataMigrationTests.swift → ...essDataTests/CoreDataMigrationTests.swift b/...essDataTests/CoreDataMigrationTests.swift → ...essDataTests/CoreDataMigrationTests.swift
diff --git a/...dPressDataTests/Helpers/BlogBuilder.swift → ...dPressDataTests/Helpers/BlogBuilder.swift b/...dPressDataTests/Helpers/BlogBuilder.swift → ...dPressDataTests/Helpers/BlogBuilder.swift
diff --git a/...ests/Helpers/ContextManager+Testing.swift → ...ests/Helpers/ContextManager+Testing.swift b/...ests/Helpers/ContextManager+Testing.swift → ...ests/Helpers/ContextManager+Testing.swift
diff --git a/...sDataTests/Helpers/CoreDataTestCase.swift → ...sDataTests/Helpers/CoreDataTestCase.swift b/...sDataTests/Helpers/CoreDataTestCase.swift → ...sDataTests/Helpers/CoreDataTestCase.swift
diff --git a/...aTests/Helpers/MockAuthKeyMigration.swift → ...aTests/Helpers/MockAuthKeyMigration.swift b/...aTests/Helpers/MockAuthKeyMigration.swift → ...aTests/Helpers/MockAuthKeyMigration.swift
diff --git a/...taTests/Helpers/MockKeychainService.swift → ...taTests/Helpers/MockKeychainService.swift b/...taTests/Helpers/MockKeychainService.swift → ...taTests/Helpers/MockKeychainService.swift
diff --git a/...taTests/Helpers/NSError+TestHelpers.swift → ...taTests/Helpers/NSError+TestHelpers.swift b/...taTests/Helpers/NSError+TestHelpers.swift → ...taTests/Helpers/NSError+TestHelpers.swift
diff --git a/...dPressDataTests/Helpers/PostBuilder.swift → ...dPressDataTests/Helpers/PostBuilder.swift b/...dPressDataTests/Helpers/PostBuilder.swift → ...dPressDataTests/Helpers/PostBuilder.swift
diff --git a/...DataTests/Helpers/WPAccount+Fixture.swift → ...DataTests/Helpers/WPAccount+Fixture.swift b/...DataTests/Helpers/WPAccount+Fixture.swift → ...DataTests/Helpers/WPAccount+Fixture.swift
diff --git a/...ests/Mapping/ReaderPostMappingTests.swift → ...ests/Mapping/ReaderPostMappingTests.swift b/...ests/Mapping/ReaderPostMappingTests.swift → ...ests/Mapping/ReaderPostMappingTests.swift
diff --git a/Tests/WordPressDataTests/MediaTests.swift → ...Tests/WordPressDataTests/MediaTests.swift b/Tests/WordPressDataTests/MediaTests.swift → ...Tests/WordPressDataTests/MediaTests.swift
diff --git a/...ataTests/PostMetadataContainerTests.swift → ...ataTests/PostMetadataContainerTests.swift b/...ataTests/PostMetadataContainerTests.swift → ...ataTests/PostMetadataContainerTests.swift
diff --git a/...ordPressDataTests/PostMetadataTests.swift → ...ordPressDataTests/PostMetadataTests.swift b/...ordPressDataTests/PostMetadataTests.swift → ...ordPressDataTests/PostMetadataTests.swift
diff --git a/.../WordPressDataTests/ReaderPostTests.swift → .../WordPressDataTests/ReaderPostTests.swift b/.../WordPressDataTests/ReaderPostTests.swift → .../WordPressDataTests/ReaderPostTests.swift
diff --git a/...ataTests/TaggedManagedObjectIDTests.swift → ...ataTests/TaggedManagedObjectIDTests.swift b/...ataTests/TaggedManagedObjectIDTests.swift → ...ataTests/TaggedManagedObjectIDTests.swift
diff --git a/...s/WordPressDataTests/WPAccountTests.swift → ...s/WordPressDataTests/WPAccountTests.swift b/...s/WordPressDataTests/WPAccountTests.swift → ...s/WordPressDataTests/WPAccountTests.swift
diff --git a/...rdPressDataTests/WordPressDataTests.swift → ...rdPressDataTests/WordPressDataTests.swift b/...rdPressDataTests/WordPressDataTests.swift → ...rdPressDataTests/WordPressDataTests.swift
diff --git a/Tests/KeystoneTests/WordPressUnitTests.xctestplan b/Tests/KeystoneTests/WordPressUnitTests.xctestplan
@@ -34,85 +34,92 @@
     {
       "target" : {
         "containerPath" : "container:WordPress.xcodeproj",
-        "identifier" : "4AD953BA2C21451700D0EEFA",
-        "name" : "WordPressAuthenticatorTests"
+        "identifier" : "4A8280FC2E5FE9B60037E180",
+        "name" : "WordPressKitTests"
       }
     },
     {
       "target" : {
-        "containerPath" : "container:..\/Modules",
-        "identifier" : "DesignSystemTests",
-        "name" : "DesignSystemTests"
+        "containerPath" : "container:WordPress.xcodeproj",
+        "identifier" : "E16AB92914D978240047A2E5",
+        "name" : "WordPressTest"
       }
     },
     {
       "target" : {
         "containerPath" : "container:..\/Modules",
-        "identifier" : "WordPressSharedTests",
-        "name" : "WordPressSharedTests"
+        "identifier" : "JetpackStatsWidgetsCoreTests",
+        "name" : "JetpackStatsWidgetsCoreTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:..\/Modules",
-        "identifier" : "JetpackStatsWidgetsCoreTests",
-        "name" : "JetpackStatsWidgetsCoreTests"
+        "identifier" : "WordPressSharedObjCTests",
+        "name" : "WordPressSharedObjCTests"
       }
     },
     {
       "target" : {
-        "containerPath" : "container:..\/Modules",
-        "identifier" : "WordPressCoreTests",
-        "name" : "WordPressCoreTests"
+        "containerPath" : "container:",
+        "identifier" : "WordPressDataTests",
+        "name" : "WordPressDataTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:..\/Modules",
-        "identifier" : "WordPressUIUnitTests",
-        "name" : "WordPressUIUnitTests"
+        "identifier" : "WordPressFluxTests",
+        "name" : "WordPressFluxTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:WordPress.xcodeproj",
-        "identifier" : "E16AB92914D978240047A2E5",
-        "name" : "WordPressTest"
+        "identifier" : "4AD953BA2C21451700D0EEFA",
+        "name" : "WordPressAuthenticatorTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:..\/Modules",
-        "identifier" : "JetpackStatsTests",
-        "name" : "JetpackStatsTests"
+        "identifier" : "WordPressUIUnitTests",
+        "name" : "WordPressUIUnitTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:..\/Modules",
-        "identifier" : "AsyncImageKitTests",
-        "name" : "AsyncImageKitTests"
+        "identifier" : "DesignSystemTests",
+        "name" : "DesignSystemTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:..\/Modules",
-        "identifier" : "WordPressSharedObjCTests",
-        "name" : "WordPressSharedObjCTests"
+        "identifier" : "JetpackStatsTests",
+        "name" : "JetpackStatsTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:..\/Modules",
-        "identifier" : "WordPressFluxTests",
-        "name" : "WordPressFluxTests"
+        "identifier" : "WordPressSharedTests",
+        "name" : "WordPressSharedTests"
       }
     },
     {
       "target" : {
-        "containerPath" : "container:WordPress.xcodeproj",
-        "identifier" : "4A8280FC2E5FE9B60037E180",
-        "name" : "WordPressKitTests"
+        "containerPath" : "container:..\/Modules",
+        "identifier" : "WordPressCoreTests",
+        "name" : "WordPressCoreTests"
+      }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:..\/Modules",
+        "identifier" : "AsyncImageKitTests",
+        "name" : "AsyncImageKitTests"
       }
     }
   ],

diff --git a/Tests/WordPressDataTests/WordPressDataTests.xctestplan b/Tests/WordPressDataTests/WordPressDataTests.xctestplan