Swift6 (#21)

.gitignore

@@ -2,6 +2,7 @@
 /.build
 /Packages
 /*.xcodeproj
+/*.xcworkspace
 xcuserdata/
 DerivedData/
 .swiftpm/config/registries.json

.mise.toml

@@ -0,0 +1,2 @@
+[tools]
+tuist = "4.18"

Development/Development.xcodeproj/project.pbxproj

@@ -350,7 +350,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = app.muukii.Development;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -380,7 +380,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = app.muukii.Development;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

Development/Development/BookUIKitBasedCompositional.swift

@@ -4,7 +4,9 @@ import DynamicList
 import os
 import MondrianLayout
 
-fileprivate var globalCount: Int = 0
+
+nonisolated(unsafe) fileprivate var globalCount: Int = 0
+
 fileprivate func getGlobalCount() -> Int {
   globalCount &+= 1
   return globalCount

Development/Development/BookUIKitBasedFlow.swift

@@ -4,7 +4,7 @@ import DynamicList
 import os
 
 
-fileprivate var globalCount: Int = 0
+nonisolated(unsafe) fileprivate var globalCount: Int = 0
 fileprivate func getGlobalCount() -> Int {
   globalCount &+= 1
   return globalCount
@@ -101,6 +101,7 @@ struct BookUIKitBasedFlow: View, PreviewProvider {
           case .a(let v):
             return context.cell(reuseIdentifier: "A") { state, _ in
               ComposableCell {
+                TextField("Hello", text: .constant("Hoge"))
                 HStack {
                   Text("\(state.isHighlighted.description)")
                   Text("\(v.name)")

Development/Development/BookVariadicView.swift

@@ -9,13 +9,6 @@ struct BookVariadicView: View, PreviewProvider {
 
     List {
 
-      NavigationLink {
-        BackedContent()
-          .navigationTitle("Backed")
-      } label: {
-        Text("Backed")
-      }
-
       NavigationLink {
         NativeContent()
           .navigationTitle("Native")
@@ -31,13 +24,6 @@ struct BookVariadicView: View, PreviewProvider {
     NavigationView {
       List {
 
-        NavigationLink {
-          BackedContent()
-            .navigationTitle("Backed")
-        } label: {
-          Text("Backed")
-        }
-
         NavigationLink {
           NativeContent()
             .navigationTitle("Native")
@@ -69,62 +55,6 @@ struct BookVariadicView: View, PreviewProvider {
     }
   }
 
-  private struct BackedContent: View {
-
-    @State var items: [Message] = MockData.randomMessages(count: 2000)
-
-    var body: some View {
-      VStack {
-        CustomList {
-          ForEach(
-            items,
-            content: {
-              ComplexCell(message: $0)
-            }
-          )
-        }
-      }
-    }
-
-    struct Cell1: View {
-
-      @State var flag = false
-
-      var body: some View {
-        VStack {
-          HStack {
-            Text("Hello")
-            Toggle("Flag", isOn: $flag)
-          }
-          Rectangle()
-            .frame(height: flag ? 10 : 50)
-        }
-        .padding(.horizontal, 20)
-        .padding(.vertical, 30)
-      }
-    }
-
-    struct Cell2: View {
-
-      @State var flag = false
-
-      var body: some View {
-        VStack {
-          HStack {
-            Text("Hello")
-            Toggle("Flag", isOn: $flag)
-          }
-          Rectangle()
-            .fill(Color.red)
-            .frame(height: flag ? 10 : 50)
-        }
-        .padding(.horizontal, 20)
-        .padding(.vertical, 30)
-      }
-    }
-
-  }
-
   static let url = URL(
     string:
       "https://images.unsplash.com/photo-1686726754283-3cf793dec0e6?ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D&auto=format&fit=crop&w=1000&q=80"

Sources/DynamicList/ContentPagingTrigger.swift

@@ -60,14 +60,14 @@ final class ContentPagingTrigger {
     self.leadingScreensForBatching = leadingScreensForBatching
     self.trackingScrollDirection = trackingScrollDirection
 
-    offsetObservation = scrollView.observe(\.contentOffset, options: [.initial, .new]) {
-      @MainActor(unsafe) [weak self] scrollView, _ in
+    offsetObservation = scrollView.observe(\.contentOffset, options: [.initial, .new]) { [weak self] scrollView, _ in      
       guard let `self` = self else { return }
-      self.didScroll(scrollView: scrollView)
+      MainActor.assumeIsolated {
+        self.didScroll(scrollView: scrollView)
+      }
     }
 
-    contentSizeObservation = scrollView.observe(\.contentSize, options: [.initial, .new]) {
-      @MainActor(unsafe) scrollView, _ in
+    contentSizeObservation = scrollView.observe(\.contentSize, options: [.initial, .new]) { scrollView, _ in
       //      print(scrollView.contentSize)
     }
   }

Sources/DynamicList/DynamicList.swift

@@ -1,12 +1,11 @@
 import SwiftUI
-import UIKit
 
 public enum Selection<Data: Hashable> {
   case single(Data)
   case multiple(Set<Data>)
 }
 
-public struct DynamicList<Section: Hashable, Item: Hashable>: UIViewRepresentable {
+public struct DynamicList<Section: Hashable & Sendable, Item: Hashable & Sendable>: UIViewRepresentable {
 
   public struct ScrollTarget {
     public let item: Item

Sources/DynamicList/DynamicListView.swift

@@ -33,7 +33,9 @@ public protocol CustomStateKey {
  */
 public struct CellState {
 
-  public static let empty = CellState()
+  public static var empty: CellState {
+    .init()
+  }
 
   private var stateMap: [AnyKeyPath : Any] = [:]
 
@@ -63,7 +65,7 @@ public enum DynamicListViewScrollAction {
 ///
 /// - TODO: Currently supported only vertical scrolling.
 @available(iOS 13, *)
-public final class DynamicListView<Section: Hashable, Data: Hashable>: UIView,
+public final class DynamicListView<Section: Hashable & Sendable, Data: Hashable & Sendable>: UIView,
   UICollectionViewDelegate, UIScrollViewDelegate
 {
 
@@ -135,7 +137,7 @@ public final class DynamicListView<Section: Hashable, Data: Hashable>: UIView,
 
       if _collectionView.cellForIdentifiers.contains(_reuseIdentifier) == false {
 
-        Log.debug(.generic, "Register Cell : \(_reuseIdentifier)")
+        Log.generic.debug("Register Cell : \(_reuseIdentifier)")
 
         _collectionView.register(VersatileCell.self, forCellWithReuseIdentifier: _reuseIdentifier)
       }
@@ -636,12 +638,12 @@ internal final class CollectionView: UICollectionView {
 public typealias DynamicCompositionalLayoutSingleSectionView<Data: Hashable> =
   DynamicListView<DynamicCompositionalLayoutSingleSection, Data>
 
-public enum DynamicCompositionalLayoutSingleSection: Hashable {
+public enum DynamicCompositionalLayoutSingleSection: Hashable, Sendable {
   case main
 }
 
 private enum CellContextKey: EnvironmentKey {
-  static var defaultValue: VersatileCell?
+  static var defaultValue: VersatileCell? { nil }
 }
 
 extension EnvironmentValues {

Sources/DynamicList/Log.swift

@@ -2,39 +2,22 @@
 import os.log
 
 enum Log {
-
-  static func debug(
-    dso: UnsafeRawPointer = #dsohandle,
-    file: StaticString = #file,
-    line: UInt = #line,
-    _ log: OSLog,
-    _ object: @autoclosure () -> Any
-  ) {
-    os_log(.debug, dso: dso, log: log, "%{public}@", "\(object())")
-  }
-
-  static func error(
-    dso: UnsafeRawPointer = #dsohandle,
-    file: StaticString = #file,
-    line: UInt = #line,
-    _ log: OSLog,
-    _ object: @autoclosure () -> Any
-  ) {
-    os_log(.error, dso: dso, log: log, "%{public}@", "\(object())")
-  }
-
+
+  static let generic = Logger(OSLog.makeOSLogInDebug { OSLog.init(subsystem: "DynamicList", category: "generic") })
+
 }
 
 extension OSLog {
 
   @inline(__always)
-  private static func makeOSLogInDebug(isEnabled: Bool = true, _ factory: () -> OSLog) -> OSLog {
+  fileprivate static func makeOSLogInDebug(isEnabled: Bool = true, _ factory: () -> OSLog) -> OSLog {
 #if DEBUG
     return factory()
 #else
     return .disabled
 #endif
   }
 
-  static let generic: OSLog = makeOSLogInDebug { OSLog.init(subsystem: "app.muukii", category: "generic") }
 }
+
+

Sources/DynamicList/NSDiffableDataSourceSnapshot+Unique.swift

@@ -1,9 +1,9 @@
 
 import UIKit
 
-public enum DiffableDataSourceError: Error {
-  case duplicatedSectionIdentifiers(Set<AnyHashable>)
-  case duplicatedItemIdentifiers(Set<AnyHashable>)
+public enum DiffableDataSourceError: Error, Sendable {
+  case duplicatedSectionIdentifiers(debugDescription: String)
+  case duplicatedItemIdentifiers(debugDescription: String)
 }
 
 extension NSDiffableDataSourceSnapshot {
@@ -17,7 +17,7 @@ extension NSDiffableDataSourceSnapshot {
     for section in sections {
       let (inserted, _) = sectionSet.insert(section)
       guard inserted else {
-        throw DiffableDataSourceError.duplicatedSectionIdentifiers([section])
+        throw DiffableDataSourceError.duplicatedSectionIdentifiers(debugDescription: String(describing: [section]))
       }
     }
 
@@ -28,7 +28,7 @@ extension NSDiffableDataSourceSnapshot {
     if set.isEmpty {
       appendSections(sections)
     } else {
-      throw DiffableDataSourceError.duplicatedSectionIdentifiers(set)
+      throw DiffableDataSourceError.duplicatedSectionIdentifiers(debugDescription: String(describing: set))
     }
 
   }
@@ -43,7 +43,7 @@ extension NSDiffableDataSourceSnapshot {
     for item in items {
       let (inserted, _) = itemSet.insert(item)
       guard inserted else {
-        throw DiffableDataSourceError.duplicatedItemIdentifiers([item])
+        throw DiffableDataSourceError.duplicatedItemIdentifiers(debugDescription: String(describing: [item]))
       }
     }
 
@@ -53,7 +53,7 @@ extension NSDiffableDataSourceSnapshot {
     if set.isEmpty {
       appendItems(items, toSection: sectionIdentifier)
     } else {
-      throw DiffableDataSourceError.duplicatedItemIdentifiers(set)
+      throw DiffableDataSourceError.duplicatedItemIdentifiers(debugDescription: String(describing: set))
     }
 
   }