Release version 1.3.0

fatbobman · fatbobman · commit 9e2b103a8ee1 · 2026-01-06T19:02:43.000+08:00
Swift 6 concurrency improvements: - Add @unchecked Sendable conformance - Thread-safe task management with DispatchQueue - Use NotificationCenter.notifications() (iOS 15+) - Fix Xcode 26+ compatibility (performAndWait → performAndWaitWithResult) - Add [weak self] to prevent retain cycles - Improve Sendable compliance in CombineAsyncPublisher Documentation: - Update README with version 1.3.0 information - Add migration guide for API changes - Document Xcode 26+ compatibility - Add information about upcoming Version 2.0
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+    "swiftlint.enable": false,
+    "swiftlint.autoLintWorkspace": false,
+    "swift.path": "/Applications/Xcode-26.2.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin",
+    "swift.diagnosticsCollection": "onlySourceKit"
+}
diff --git a/README.md b/README.md
@@ -6,32 +6,64 @@ Helps you easily handle Core Data's Persistent History Tracking
 
 [中文版说明](https://github.com/fatbobman/PersistentHistoryTrackingKit/blob/main/READMECN.md)
 
-## 🚀 Swift 6 Branch Available
+## 🚀 Version 1.3.0 - Swift 6 Compatible
 
-> **🎯 New Swift 6 Compatible Version Available**
+> **🎉 Current Version (1.3.0) is Swift 6 Compatible**
 >
-> We've created a comprehensive **Swift 6 adaptation** with full concurrency safety, true Sendable compliance, and memory leak fixes. The new version is available in the `swift6-adaptation` branch.
+> The latest release includes comprehensive Swift 6 concurrency improvements:
 >
-> **✨ Key Improvements:**
+> **✨ What's New in 1.3.0:**
 >
-> - 🔒 **True Sendable Compliance** - Not just `@unchecked Sendable`
-> - 🧵 **Data Race Free** - Comprehensive concurrency testing
-> - 🛡️ **Memory Safe** - Zero retain cycles or memory leaks  
-> - 🧪 **Swift Testing Framework** - Modern testing infrastructure
-> - 📚 **Enhanced Documentation** - Comprehensive guides and examples
+> - ✅ **Swift 6 Compatible** - Works with Swift 6 strict concurrency mode
+> - 🔒 **Thread-Safe Task Management** - Protected with DispatchQueue barriers
+> - 🧵 **No Retain Cycles** - Uses `[weak self]` to prevent memory leaks
+> - 📱 **Xcode 26+ Compatible** - Resolves system API naming conflicts
+> - 🚀 **Native Notifications** - Uses iOS 15+ `NotificationCenter.notifications()`
+> - 🎯 **Sendable Compliance** - Added `@unchecked Sendable` conformance
 >
-> **🔄 Try it out:**
+> **📦 Install the latest version:**
 >
 > ```swift
 > dependencies: [
->     .package(url: "https://github.com/fatbobman/PersistentHistoryTrackingKit.git", branch: "swift6-adaptation")
+>     .package(url: "https://github.com/fatbobman/PersistentHistoryTrackingKit.git", from: "1.3.0")
 > ]
 > ```
 >
-> **📝 Feedback Welcome:**  
-> Please test the Swift 6 version and [**create an issue**](https://github.com/fatbobman/PersistentHistoryTrackingKit/issues) with your feedback. We'll merge it to main once we have sufficient real-world validation.
+> **🔜 Looking ahead:**
 >
-> **📖 Full Documentation:** [Swift 6 Branch README](https://github.com/fatbobman/PersistentHistoryTrackingKit/blob/swift6-adaptation/README.md)
+> We're actively developing **Version 2.0** with:
+>
+> - Full Swift 6 strict concurrency mode
+> - iOS 17+ with Actor-based architecture
+> - Built-in Hook callback system
+> - Tombstone mechanism for deleted objects
+> - Complete Sendable safety without `@unchecked`
+>
+> Follow progress in the `feature/swift6-optimization-and-hook-system` branch.
+
+## ⚠️ Important API Note for Xcode 26+ Users
+
+Version 1.3.0+ is fully compatible with Xcode 26 (Swift 6.0)
+
+Since Xcode 26 Beta 5, Apple has added a native `performAndWait<T>(_ block: @Sendable () throws -> T) rethrows -> T` method to `NSManagedObjectContext`. To avoid naming conflicts with this system API, we renamed our extension method:
+
+### Old (before 1.3.0)
+
+```swift
+// ❌ Conflicts with Xcode 26+ system API
+let result = try context.performAndWait { ... }
+```
+
+### New (1.3.0+)
+
+```swift
+// ✅ Works with all Xcode versions
+let result = try context.performAndWaitWithResult { ... }
+```
+
+**Migration:** If you were using the old `performAndWait` extension, simply rename it to `performAndWaitWithResult`. The functionality is identical.
+
+For more details, see [Issue #6](https://github.com/fatbobman/PersistentHistoryTrackingKit/issues/6).
 
 ## What's This？
 
diff --git a/READMECN.md b/READMECN.md
@@ -6,32 +6,64 @@
 
 [English Version](https://github.com/fatbobman/PersistentHistoryTrackingKit/blob/main/README.md)
 
-## 🚀 Swift 6 分支现已可用
+## 🚀 版本 1.3.0 - Swift 6 兼容
 
-> **🎯 新的 Swift 6 兼容版本现已可用**
+> **🎉 当前版本 (1.3.0) 兼容 Swift 6**
 >
-> 我们创建了一个全面的 **Swift 6 适配版本**，具备完整的并发安全性、真正的 Sendable 合规性和内存泄漏修复。新版本可在 `swift6-adaptation` 分支中使用。
+> 最新版本包含了全面的 Swift 6 并发改进：
 >
-> **✨ 主要改进：**
+> **✨ 1.3.0 新特性：**
 >
-> - 🔒 **真正的 Sendable 合规** - 不仅仅是 `@unchecked Sendable`
-> - 🧵 **无数据竞争** - 全面的并发测试
-> - 🛡️ **内存安全** - 零保留循环或内存泄漏
-> - 🧪 **Swift Testing 框架** - 现代测试基础设施
-> - 📚 **增强文档** - 全面的指南和示例
+> - ✅ **Swift 6 兼容** - 支持 Swift 6 严格并发模式
+> - 🔒 **线程安全的任务管理** - 使用 DispatchQueue 屏障保护
+> - 🧵 **无内存泄漏** - 使用 `[weak self]` 防止循环引用
+> - 📱 **Xcode 26+ 兼容** - 解决系统 API 命名冲突
+> - 🚀 **原生通知** - 使用 iOS 15+ `NotificationCenter.notifications()`
+> - 🎯 **Sendable 合规** - 添加 `@unchecked Sendable` 一致性
 >
-> **🔄 试用方法：**
+> **📦 安装最新版本：**
 >
 > ```swift
 > dependencies: [
->     .package(url: "https://github.com/fatbobman/PersistentHistoryTrackingKit.git", branch: "swift6-adaptation")
+>     .package(url: "https://github.com/fatbobman/PersistentHistoryTrackingKit.git", from: "1.3.0")
 > ]
 > ```
 >
-> **📝 欢迎反馈：**  
-> 请测试 Swift 6 版本并[**创建 issue**](https://github.com/fatbobman/PersistentHistoryTrackingKit/issues) 提供您的反馈。一旦我们获得足够的实际使用验证，就会将其合并到 main 分支。
+> **🔜 展望未来：**
 >
-> **📖 完整文档：** [Swift 6 分支 README](https://github.com/fatbobman/PersistentHistoryTrackingKit/blob/swift6-adaptation/READMECN.md)
+> 我们正在积极开发 **版本 2.0**，包含：
+>
+> - 完整的 Swift 6 严格并发模式
+> - iOS 17+ 基于 Actor 的架构
+> - 内置 Hook 回调系统
+> - 删除对象的墓碑机制
+> - 完全的 Sendable 安全性（无需 `@unchecked`）
+>
+> 在 `feature/swift6-optimization-and-hook-system` 分支关注开发进度。
+
+## ⚠️ Xcode 26+ 用户重要 API 说明
+
+**版本 1.3.0+ 完全兼容 Xcode 26 (Swift 6.0)**
+
+从 Xcode 26 Beta 5 开始，Apple 为 `NSManagedObjectContext` 添加了原生的 `performAndWait<T>(_ block: @Sendable () throws -> T) rethrows -> T` 方法。为了避免与系统 API 命名冲突，我们重命名了扩展方法：
+
+### 旧版本 (1.3.0 之前)
+
+```swift
+// ❌ 与 Xcode 26+ 系统API冲突
+let result = try context.performAndWait { ... }
+```
+
+### 新版本 (1.3.0+)
+
+```swift
+// ✅ 兼容所有 Xcode 版本
+let result = try context.performAndWaitWithResult { ... }
+```
+
+**迁移指南：** 如果您之前使用的是旧的 `performAndWait` 扩展，只需将其重命名为 `performAndWaitWithResult`。功能完全相同。
+
+更多详情请参阅 [Issue #6](https://github.com/fatbobman/PersistentHistoryTrackingKit/issues/6)。
 
 ## What's This？
 
diff --git a/Sources/PersistentHistoryTrackingKit/Extensions.swift b/Sources/PersistentHistoryTrackingKit/Extensions.swift
@@ -33,29 +33,32 @@ extension NSManagedObjectContext {
     }
 }
 
-public extension Task where Success == Never, Failure == Never {
-    static func sleep(seconds duration: Double) async throws {
-        try await sleep(nanoseconds: UInt64(duration * 1000000000))
+extension Task where Success == Never, Failure == Never {
+    public static func sleep(seconds duration: Double) async throws {
+        try await sleep(nanoseconds: UInt64(duration * 1_000_000_000))
     }
 }
 
 import Combine
 /// 将Publisher转换成异步序列。
 ///
 /// 同系统内置的 publisher.values 不同，本实现将首先对数据进行缓存。尤其适用于NotificationCenter之类的应用。
-struct CombineAsyncPublisher<P>: AsyncSequence, AsyncIteratorProtocol where P: Publisher, P.Failure == Never {
+struct CombineAsyncPublisher<P>: AsyncSequence, AsyncIteratorProtocol where P: Publisher, P.Failure == Never, P.Output: Sendable {
     typealias Element = P.Output
     typealias AsyncIterator = CombineAsyncPublisher<P>
 
     func makeAsyncIterator() -> Self {
-        return self
+        self
     }
 
     private let stream: AsyncStream<P.Output>
     private var iterator: AsyncStream<P.Output>.Iterator
     private var cancellable: AnyCancellable?
 
-    init(_ upstream: P, bufferingPolicy limit: AsyncStream<Element>.Continuation.BufferingPolicy = .unbounded) {
+    init(
+        _ upstream: P,
+        bufferingPolicy limit: AsyncStream<Element>.Continuation.BufferingPolicy = .unbounded)
+    {
         var subscription: AnyCancellable?
         stream = AsyncStream<P.Output>(P.Output.self, bufferingPolicy: limit) { continuation in
             subscription = upstream
@@ -72,7 +75,7 @@ struct CombineAsyncPublisher<P>: AsyncSequence, AsyncIteratorProtocol where P: P
     }
 }
 
-extension Publisher where Self.Failure == Never {
+extension Publisher where Self.Failure == Never, Self.Output: Sendable {
     var sequence: CombineAsyncPublisher<Self> {
         CombineAsyncPublisher(self)
     }
diff --git a/Sources/PersistentHistoryTrackingKit/PersistentHistoryTrackingKit.swift b/Sources/PersistentHistoryTrackingKit/PersistentHistoryTrackingKit.swift
@@ -12,13 +12,12 @@
 
 import CoreData
 import Foundation
-import AsyncAlgorithms
 
 // swiftlint:disable line_length
 
-public final class PersistentHistoryTrackingKit {
+public final class PersistentHistoryTrackingKit: @unchecked Sendable {
     /// 日志显示等级，从0-2级。0 关闭 2 最详尽
-    public var logLevel: Int
+    public private(set) var logLevel: Int
 
     /// 清除策略
     var strategy: TransactionPurgePolicy
@@ -70,7 +69,8 @@ public final class PersistentHistoryTrackingKit {
     let timestampManager: TransactionTimestampManager
 
     /// 处理持久化历史跟踪事件的任务。可以通过start开启，stop停止。
-    var transactionProcessingTasks = [Task<Void, Never>]()
+    private var transactionProcessingTasks = [Task<Void, Never>]()
+    private let taskQueue = DispatchQueue(label: "com.persistenthistorytrackingkit.tasks", attributes: .concurrent)
 
     /// 持久化存储协调器，用于缩小通知返回
     private let coordinator: NSPersistentStoreCoordinator
@@ -81,45 +81,44 @@ public final class PersistentHistoryTrackingKit {
     ///
     /// 通过将持久化历史跟踪记录的通知转换成异步序列，实现了逐个处理的机制。
     func createTransactionProcessingTask() -> Task<Void, Never> {
-        Task {
-            sendMessage(type: .info, level: 1, message: "Persistent History Track Kit Start")
+        Task { [weak self] in
+            guard let self = self else { return }
+
+            self.sendMessage(type: .info, level: 1, message: "Persistent History Track Kit Start")
             // 响应 notification
-            let publisher = NotificationCenter.default.publisher(
-                for: .NSPersistentStoreRemoteChange,
-                object: coordinator
-            )
-            for await _ in publisher.values.buffer(policy: .unbounded) where !Task.isCancelled {
-                sendMessage(type: .info,
+            for await _ in NotificationCenter.default.notifications(named: .NSPersistentStoreRemoteChange, object: self.coordinator) where !Task.isCancelled {
+
+                self.sendMessage(type: .info,
                             level: 2,
                             message: "Get a `NSPersistentStoreRemoteChange` notification")
 
                 // fetch
-                let transactions = fetchTransactions(
-                    for: currentAuthor,
-                    since: timestampManager,
-                    by: fetcher,
-                    logger: sendMessage
+                let transactions = self.fetchTransactions(
+                    for: self.currentAuthor,
+                    since: self.timestampManager,
+                    by: self.fetcher,
+                    logger: self.sendMessage
                 )
-                
+
                 if transactions.isEmpty { continue }
-                
+
                 // merge
-                mergeTransactionsInContexts(
+                self.mergeTransactionsInContexts(
                     transactions: transactions,
-                    by: merger,
-                    timestampManager: timestampManager,
-                    logger: sendMessage
+                    by: self.merger,
+                    timestampManager: self.timestampManager,
+                    logger: self.sendMessage
                 )
-                
-                deduplicator?(deduplicate: transactions, in: contexts)
+
+                self.deduplicator?(deduplicate: transactions, in: self.contexts)
 
                 // clean
-                cleanTransactions(
-                    beforeDate: timestampManager,
-                    allAuthors: allAuthors,
-                    batchAuthors: batchAuthors,
-                    by: cleaner,
-                    logger: sendMessage
+                self.cleanTransactions(
+                    beforeDate: self.timestampManager,
+                    allAuthors: self.allAuthors,
+                    batchAuthors: self.batchAuthors,
+                    by: self.cleaner,
+                    logger: self.sendMessage
                 )
             }
             sendMessage(type: .info, level: 1, message: "Persistent History Track Kit Stop")
@@ -264,18 +263,22 @@ public final class PersistentHistoryTrackingKit {
 public extension PersistentHistoryTrackingKit {
     /// 启动处理任务
     func start() {
-        guard transactionProcessingTasks.isEmpty else {
-            return
+        taskQueue.async(flags: .barrier) {
+            guard self.transactionProcessingTasks.isEmpty else {
+                return
+            }
+            self.transactionProcessingTasks.append(self.createTransactionProcessingTask())
         }
-        transactionProcessingTasks.append(createTransactionProcessingTask())
     }
 
     /// 停止处理任务
     func stop() {
-        transactionProcessingTasks.forEach {
-            $0.cancel()
+        taskQueue.async(flags: .barrier) {
+            self.transactionProcessingTasks.forEach {
+                $0.cancel()
+            }
+            self.transactionProcessingTasks.removeAll()
         }
-        transactionProcessingTasks.removeAll()
     }
 }
 
@@ -384,4 +387,3 @@ public extension PersistentHistoryTrackingKit {
     }
 }
 
-extension Notification:@unchecked Sendable {}

Original file line number	Diff line number	Diff line change
`@@ -33,29 +33,32 @@ extension NSManagedObjectContext {`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`-public extension Task where Success == Never, Failure == Never {`
`37`		`- static func sleep(seconds duration: Double) async throws {`
`38`		`- try await sleep(nanoseconds: UInt64(duration * 1000000000))`
	`36`	`+extension Task where Success == Never, Failure == Never {`
	`37`	`+ public static func sleep(seconds duration: Double) async throws {`
	`38`	`+ try await sleep(nanoseconds: UInt64(duration * 1_000_000_000))`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`import Combine`
`43`	`43`	`/// 将Publisher转换成异步序列。`
`44`	`44`	`///`
`45`	`45`	`/// 同系统内置的 publisher.values 不同，本实现将首先对数据进行缓存。尤其适用于NotificationCenter之类的应用。`
`46`		`-struct CombineAsyncPublisher<P>: AsyncSequence, AsyncIteratorProtocol where P: Publisher, P.Failure == Never {`
	`46`	`+struct CombineAsyncPublisher<P>: AsyncSequence, AsyncIteratorProtocol where P: Publisher, P.Failure == Never, P.Output: Sendable {`
`47`	`47`	`typealias Element = P.Output`
`48`	`48`	`typealias AsyncIterator = CombineAsyncPublisher<P>`
`49`	`49`
`50`	`50`	`func makeAsyncIterator() -> Self {`
`51`		`- return self`
	`51`	`+ self`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`private let stream: AsyncStream<P.Output>`
`55`	`55`	`private var iterator: AsyncStream<P.Output>.Iterator`
`56`	`56`	`private var cancellable: AnyCancellable?`
`57`	`57`
`58`		`- init(_ upstream: P, bufferingPolicy limit: AsyncStream<Element>.Continuation.BufferingPolicy = .unbounded) {`
	`58`	`+ init(`
	`59`	`+ _ upstream: P,`
	`60`	`+ bufferingPolicy limit: AsyncStream<Element>.Continuation.BufferingPolicy = .unbounded)`
	`61`	`+ {`
`59`	`62`	`var subscription: AnyCancellable?`
`60`	`63`	`stream = AsyncStream<P.Output>(P.Output.self, bufferingPolicy: limit) { continuation in`
`61`	`64`	`subscription = upstream`
`@@ -72,7 +75,7 @@ struct CombineAsyncPublisher<P>: AsyncSequence, AsyncIteratorProtocol where P: P`
`72`	`75`	`}`
`73`	`76`	`}`
`74`	`77`
`75`		`-extension Publisher where Self.Failure == Never {`
	`78`	`+extension Publisher where Self.Failure == Never, Self.Output: Sendable {`
`76`	`79`	`var sequence: CombineAsyncPublisher<Self> {`
`77`	`80`	`CombineAsyncPublisher(self)`
`78`	`81`	`}`