Merge branch 'trunk' into merge/25.8-release-notes-into-trunk

Author: jkmassel

Modules/Package.swift

@@ -11,6 +11,7 @@ let package = Package(
         .library(name: "AsyncImageKit", targets: ["AsyncImageKit"]),
         .library(name: "DesignSystem", targets: ["DesignSystem"]),
         .library(name: "JetpackStatsWidgetsCore", targets: ["JetpackStatsWidgetsCore"]),
+        .library(name: "WordPressData", targets: ["WordPressData"]),
         .library(name: "WordPressFlux", targets: ["WordPressFlux"]),
         .library(name: "WordPressShared", targets: ["WordPressShared"]),
         .library(name: "WordPressUI", targets: ["WordPressUI"]),
@@ -63,6 +64,8 @@ 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: "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)]),
@@ -105,7 +108,7 @@ let package = Package(
 ///
 /// ## Known Issues
 ///
-///   - SwiftPM copies resource bundles from a target, including dynamic frameworks,
+///   - SwiftPM copies resource bundles from a target, including dynamic frameworks,
 /// into every target that depends on it. Make sure to avoid including frameworks
 /// with large resources bundled into multiple targets.
 enum XcodeSupport {
@@ -159,6 +162,7 @@ enum XcodeSupport {
             .xcodeTarget("XcodeTarget_App", dependencies: [
                 "DesignSystem",
                 "JetpackStatsWidgetsCore",
+                "WordPressData",
                 "WordPressFlux",
                 "WordPressShared",
                 "WordPressReader",

Modules/Sources/WordPressData/CoreDataStackSwift.swift

@@ -0,0 +1,38 @@
+import CoreData
+import WordPressDataObjC
+
+public protocol CoreDataStackSwift: CoreDataStack {
+
+    /// Execute the given block with a background context and save the changes.
+    ///
+    /// This function _does not block_ its running thread. The block is executed in background and its return value
+    /// is passed onto the `completion` block which is executed on the given `queue`.
+    ///
+    /// - Parameters:
+    ///   - block: A closure which uses the given `NSManagedObjectContext` to make Core Data model changes.
+    ///   - completion: A closure which is called with the return value of the `block`, after the changed made
+    ///         by the `block` is saved.
+    ///   - queue: A queue on which to execute the completion block.
+    func performAndSave<T>(_ block: @escaping (NSManagedObjectContext) -> T, completion: ((T) -> Void)?, on queue: DispatchQueue)
+
+    /// Execute the given block with a background context and save the changes _if the block does not throw an error_.
+    ///
+    /// This function _does not block_ its running thread. The block is executed in background and the return value
+    /// (or an error) is passed onto the `completion` block which is executed on the given `queue`.
+    ///
+    /// - Parameters:
+    ///   - block: A closure that uses the given `NSManagedObjectContext` to make Core Data model changes. The changes
+    ///         are only saved if the block does not throw an error.
+    ///   - completion: A closure which is called with the `block`'s execution result, which is either an error thrown
+    ///         by the `block` or the return value of the `block`.
+    ///   - queue: A queue on which to execute the completion block.
+    func performAndSave<T>(_ block: @escaping (NSManagedObjectContext) throws -> T, completion: ((Result<T, Error>) -> Void)?, on queue: DispatchQueue)
+
+    /// Execute the given block with a background context and save the changes _if the block does not throw an error_.
+    ///
+    /// - Parameter block: A closure that uses the given `NSManagedObjectContext` to make Core Data model changes.
+    ///     The changes are only saved if the block does not throw an error.
+    /// - Returns: The value returned by the `block`
+    /// - Throws: The error thrown by the `block`, in which case the Core Data changes made by the `block` is discarded.
+    func performAndSave<T>(_ block: @escaping (NSManagedObjectContext) throws -> T) async throws -> T
+}

Modules/Sources/WordPressData/WordPressData.swift

@@ -0,0 +1 @@
+@_exported import WordPressDataObjC

WordPress/Classes/Services/CoreDataService.m Modules/Sources/WordPressDataObjC/CoreDataService.m

@@ -0,0 +1,6 @@
+FOUNDATION_EXPORT double WordPressDataVersionNumber;
+
+FOUNDATION_EXPORT const unsigned char WordPressDataVersionString[];
+
+#import <WordPressData/CoreDataService.h>
+#import <WordPressData/CoreDataStack.h>

Modules/Sources/WordPressDataObjC/WordPressData.h

@@ -1,5 +1,4 @@
 #import <Foundation/Foundation.h>
-
 #import "CoreDataStack.h"
 
 NS_ASSUME_NONNULL_BEGIN

WordPress/Classes/Services/CoreDataService.h Modules/Sources/WordPressDataObjC/include/CoreDataService.h

@@ -4,11 +4,18 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @protocol CoreDataStack
+
 @property (nonatomic, readonly, strong) NSManagedObjectContext *mainContext;
+
 - (NSManagedObjectContext *const)newDerivedContext DEPRECATED_MSG_ATTRIBUTE("Use `performAndSave` instead");
+
 - (void)saveContextAndWait:(NSManagedObjectContext *)context;
+
 - (void)saveContext:(NSManagedObjectContext *)context;
-- (void)saveContext:(NSManagedObjectContext *)context withCompletionBlock:(void (^ _Nullable)(void))completionBlock onQueue:(dispatch_queue_t)queue NS_SWIFT_NAME(save(_:completion:on:));
+
+- (void)saveContext:(NSManagedObjectContext *)context
+withCompletionBlock:(void (^ _Nullable)(void))completionBlock
+            onQueue:(dispatch_queue_t)queue NS_SWIFT_NAME(save(_:completion:on:));
 
 /// Execute the given block with a background context and save the changes.
 ///
@@ -27,7 +34,8 @@ NS_ASSUME_NONNULL_BEGIN
 ///   - aBlock: A block which uses the given `NSManagedObjectContext` to make Core Data model changes.
 ///   - completion: A block which is called after the changes made by the `block` are saved.
 ///   - queue: A queue on which to execute the `completion` block.
-- (void)performAndSaveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock completion:(void (^ _Nullable)(void))completion onQueue:(dispatch_queue_t)queue;
+- (void)performAndSaveUsingBlock:(void (^)(NSManagedObjectContext *context))aBlock
+                      completion:(void (^ _Nullable)(void))completion onQueue:(dispatch_queue_t)queue;
 
 @end
 

WordPress/Classes/Utility/CoreData/CoreDataStack.h Modules/Sources/WordPressDataObjC/include/CoreDataStack.h

@@ -1,7 +1,7 @@
 #import "Media+Extensions.h"
 #import "MediaService.h"
 #import "Blog.h"
-#import "CoreDataStack.h"
+@import WordPressDataObjC;
 #import "WordPress-Swift.h"
 
 @implementation Media (Extensions)

WordPress/Classes/Utility/WPException.m Modules/Sources/WordPressSharedObjC/ErrorHandling/WPException.m

@@ -1,5 +1,6 @@
 import Foundation
 import CoreData
+import WordPressData
 
 extension Media {
 

WordPress/Classes/Utility/WPException.h Modules/Sources/WordPressSharedObjC/include/WPException.h

@@ -1,8 +1,8 @@
+import Alamofire
 import AuthenticationServices
 import Foundation
 import UIKit
-
-import Alamofire
+import WordPressData
 
 /// Log in or sign up a WordPress.com account via web.
 ///

WordPress/Classes/Categories/Media+Extensions.m

@@ -1,6 +1,6 @@
 #import "AbstractPost.h"
 #import "Media.h"
-#import "CoreDataStack.h"
+@import WordPressDataObjC;
 #import "WordPress-Swift.h"
 #import "BasePost.h"
 

WordPress/Classes/Extensions/Media/Media+Sync.swift

@@ -1,6 +1,6 @@
 #import "BasePost.h"
 #import "Media.h"
-#import "CoreDataStack.h"
+@import WordPressDataObjC;
 
 @import WordPressShared;
 

WordPress/Classes/Login/WordPressDotComAuthenticator.swift

@@ -1,7 +1,7 @@
 #import "Blog.h"
 #import "WPAccount.h"
 #import "AccountService.h"
-#import "CoreDataStack.h"
+@import WordPressDataObjC;
 #import "Constants.h"
 #import "WPUserAgent.h"
 #import "WordPress-Swift.h"

WordPress/Classes/Models/AbstractPost.m

@@ -1,5 +1,5 @@
 #import "Media.h"
-#import "CoreDataStack.h"
+@import WordPressDataObjC;
 #import "WordPress-Swift.h"
 
 @implementation Media

WordPress/Classes/Models/BasePost.m

@@ -1,6 +1,6 @@
 #import "ReaderPost.h"
 #import "AccountService.h"
-#import "CoreDataStack.h"
+@import WordPressDataObjC;
 #import "SourcePostAttribution.h"
 #import "WPAccount.h"
 #import "WordPress-Swift.h"

WordPress/Classes/Models/Blog/Blog.m

@@ -1,6 +1,6 @@
 #import "Theme.h"
 #import "Blog.h"
-#import "CoreDataStack.h"
+@import WordPressDataObjC;
 #import "WPAccount.h"
 #import "AccountService.h"
 #import "WordPress-Swift.h"

WordPress/Classes/Models/Coordinate.h

@@ -3,28 +3,11 @@ import Foundation
 extension ValueTransformer {
     @objc
     static func registerCustomTransformers() {
-        CoordinateValueTransformer.register()
         NSErrorValueTransformer.register()
         SetValueTransformer.register()
     }
 }
 
-@objc
-final class CoordinateValueTransformer: NSSecureUnarchiveFromDataTransformer {
-
-    static let name = NSValueTransformerName(rawValue: String(describing: CoordinateValueTransformer.self))
-
-    override static var allowedTopLevelClasses: [AnyClass] {
-        return [Coordinate.self]
-    }
-
-    @objc
-    public static func register() {
-        let transformer = CoordinateValueTransformer()
-        ValueTransformer.setValueTransformer(transformer, forName: name)
-    }
-}
-
 @objc
 final class NSErrorValueTransformer: NSSecureUnarchiveFromDataTransformer {
 

WordPress/Classes/Models/Coordinate.m

@@ -1,5 +1,5 @@
 #import <Foundation/Foundation.h>
-#import "CoreDataService.h"
+@import WordPressDataObjC;
 
 NS_ASSUME_NONNULL_BEGIN
 

WordPress/Classes/Models/Media.m

@@ -1,6 +1,6 @@
 #import "AccountService.h"
 #import "WPAccount.h"
-#import "CoreDataStack.h"
+@import WordPressDataObjC;
 #import "Blog.h"
 #import "BlogService.h"
 

WordPress/Classes/Models/ReaderPost.m

@@ -1,5 +1,6 @@
 import Foundation
 import Reachability
+import WordPressData
 import WordPressKit
 
 extension NSNotification.Name {

WordPress/Classes/Models/Theme.m

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 import WordPressKit
 
 final class AtomicSiteService {

WordPress/Classes/Models/ValueTransformers.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 import WordPressKit
 
 protocol BlazeServiceProtocol {

WordPress/Classes/Services/AccountService.h

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 import WordPressKit
 
 class BlockEditorSettingsService {

WordPress/Classes/Services/AccountService.m

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 
 extension BlogService {
     @objc func unscheduleBloggingReminders(for blog: Blog) {

WordPress/Classes/Services/AccountSettingsService.swift

@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
-#import "CoreDataService.h"
 #import "Blog.h"
+@import WordPressDataObjC;
 
 NS_ASSUME_NONNULL_BEGIN
 

WordPress/Classes/Services/AtomicSiteService.swift

@@ -2,7 +2,7 @@
 #import "Blog.h"
 #import "WPAccount.h"
 #import "AccountService.h"
-#import "CoreDataStack.h"
+@import WordPressDataObjC;
 #import "WPError.h"
 #import "Media.h"
 #import "PostCategoryService.h"

WordPress/Classes/Services/BlazeService.swift

@@ -1,4 +1,5 @@
 import CoreData
+import WordPressData
 import WordPressKit
 
 class BloggingPromptsService {

WordPress/Classes/Services/BlockEditorSettingsService.swift

@@ -1,5 +1,6 @@
 #import <Foundation/Foundation.h>
 #import "CoreDataService.h"
+@import WordPressDataObjC;
 
 NS_ASSUME_NONNULL_BEGIN
 

WordPress/Classes/Services/BlogService+Reminders.swift

@@ -1,7 +1,7 @@
 #import "CommentService.h"
 #import "AccountService.h"
 #import "Blog.h"
-#import "CoreDataStack.h"
+@import WordPressDataObjC;
 #import "ReaderPost.h"
 #import "WPAccount.h"
 #import "PostService.h"

WordPress/Classes/Services/BlogService.h

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 import WordPressKit
 
 @objc enum EditorSettingsServiceError: Int, Swift.Error {

WordPress/Classes/Services/BlogService.m

@@ -1,5 +1,5 @@
 #import "BlogSyncFacade.h"
-#import "CoreDataStack.h"
+@import WordPressDataObjC;
 #import "BlogService.h"
 #import "AccountService.h"
 #import "Blog.h"

WordPress/Classes/Services/BloggingPrompts/BloggingPromptsService.swift

@@ -1,5 +1,6 @@
-import WordPressKit
 import CoreData
+import WordPressData
+import WordPressKit
 
 @objc class JetpackSocialService: NSObject {
 

WordPress/Classes/Services/CommentService.h

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 import WordPressFlux
 
 import class AutomatticTracks.CrashLogging