code cleanup, and maybe resolving a build error on SPI w/ Swift 5.7 a…

…nd linux

Package.swift

@@ -4,14 +4,15 @@ import PackageDescription
 
 var globalSwiftSettings: [PackageDescription.SwiftSetting] = []
 #if swift(>=5.7)
+  #if canImport(Foundation)
     if ProcessInfo.processInfo.environment["CI"] != nil {
         globalSwiftSettings.append(.unsafeFlags(["-Xfrontend", "-strict-concurrency=complete"]))
         /*
          Summation from https://www.donnywals.com/enabling-concurrency-warnings-in-xcode-14/
          Set `strict-concurrency` to `targeted` to enforce Sendable and actor-isolation checks
          in your code. This explicitly verifies that `Sendable` constraints are met when you
          mark one of your types as `Sendable`.
-         
+
          This mode is essentially a bit of a hybrid between the behavior that's intended in
          Swift 6, and the default in Swift 5.7. Use this mode to have a bit of checking on
          your code that uses Swift concurrency without too many warnings and / or errors in
@@ -21,6 +22,7 @@ var globalSwiftSettings: [PackageDescription.SwiftSetting] = []
          constraints, essentially as they will work in Swift 6.
          */
     }
+  #endif
 #endif
 
 let package = Package(

Sources/CRDT/GenericCRDTs/GCounter.swift

@@ -9,7 +9,7 @@
 /// by Marc Shapiro, Nuno Preguiça, Carlos Baquero, and Marek Zawirski (2011).
 public struct GCounter<ActorID: Hashable & PartiallyOrderable> {
     private var _storage: UInt
-    internal let selfId: ActorID
+    let selfId: ActorID
 
     /// The counter's value.
     public var value: UInt {

Sources/CRDT/GenericCRDTs/GSet.swift

@@ -9,7 +9,7 @@
 /// by Marc Shapiro, Nuno Preguiça, Carlos Baquero, and Marek Zawirski (2011).
 public struct GSet<ActorID: Hashable & PartiallyOrderable, T: Hashable> {
     private var _storage: Set<T>
-    internal var currentTimestamp: LamportTimestamp<ActorID>
+    var currentTimestamp: LamportTimestamp<ActorID>
 
     /// The set of values.
     public var values: Set<T> {

Sources/CRDT/GenericCRDTs/LWWRegister.swift

@@ -15,8 +15,8 @@ import Foundation
 public struct LWWRegister<ActorID: Hashable & PartiallyOrderable, T> {
     /// A struct that represents the state of an LWWRegister
     public struct Metadata {
-        internal var value: T
-        internal var clockId: WallclockTimestamp<ActorID>
+        var value: T
+        var clockId: WallclockTimestamp<ActorID>
 
         init(value: T, id: ActorID, timestamp: TimeInterval = Date().timeIntervalSinceReferenceDate) {
             self.value = value
@@ -37,7 +37,7 @@ public struct LWWRegister<ActorID: Hashable & PartiallyOrderable, T> {
     }
 
     private var _storage: Metadata
-    internal let selfId: ActorID
+    let selfId: ActorID
 
     /// The value of the register.
     public var value: T {

Sources/CRDT/GenericCRDTs/List.swift

@@ -100,9 +100,9 @@ public struct List<ActorID: Hashable & PartiallyOrderable, T: Hashable & Equatab
     }
 
     // A combination of Lamport timestamp & actor ID
-    internal var currentTimestamp: LamportTimestamp<ActorID>
-    internal var activeValues: [Metadata] = []
-    internal var tombstones: [Metadata] = []
+    var currentTimestamp: LamportTimestamp<ActorID>
+    var activeValues: [Metadata] = []
+    var tombstones: [Metadata] = []
 
     /// The values of the list.
     public var values: [T] { activeValues.map(\.value) }

Sources/CRDT/GenericCRDTs/ORMap.swift

@@ -10,7 +10,7 @@
 /// Annette Bieniusa, Marek Zawirski, Nuno Preguiça, Marc Shapiro, Carlos Baquero, Valter Balegas, and Sérgio Duarte (2012).
 /// arXiv:[1210.3368](https://arxiv.org/abs/1210.3368).
 public struct ORMap<ActorID: Hashable & PartiallyOrderable, KEY: Hashable, VALUE: Equatable> {
-    internal struct Metadata: CustomStringConvertible {
+    struct Metadata: CustomStringConvertible {
         var isDeleted: Bool
         var lamportTimestamp: LamportTimestamp<ActorID>
         var value: VALUE
@@ -25,8 +25,8 @@ public struct ORMap<ActorID: Hashable & PartiallyOrderable, KEY: Hashable, VALUE
         }
     }
 
-    internal var currentTimestamp: LamportTimestamp<ActorID>
-    internal var metadataByDictKey: [KEY: Metadata]
+    var currentTimestamp: LamportTimestamp<ActorID>
+    var metadataByDictKey: [KEY: Metadata]
 
     /// Creates a new grow-only set..
     /// - Parameters:

Sources/CRDT/GenericCRDTs/ORSet.swift

@@ -11,7 +11,7 @@
 /// Annette Bieniusa, Marek Zawirski, Nuno Preguiça, Marc Shapiro, Carlos Baquero, Valter Balegas, and Sérgio Duarte (2012).
 /// arXiv:[1210.3368](https://arxiv.org/abs/1210.3368)
 public struct ORSet<ActorID: Hashable & PartiallyOrderable, T: Hashable> {
-    internal struct Metadata: CustomStringConvertible {
+    struct Metadata: CustomStringConvertible {
         var isDeleted: Bool
         var lamportTimestamp: LamportTimestamp<ActorID>
         var description: String {
@@ -24,8 +24,8 @@ public struct ORSet<ActorID: Hashable & PartiallyOrderable, T: Hashable> {
         }
     }
 
-    internal var currentTimestamp: LamportTimestamp<ActorID>
-    internal var metadataByValue: [T: Metadata]
+    var currentTimestamp: LamportTimestamp<ActorID>
+    var metadataByValue: [T: Metadata]
 
     /// Creates a new grow-only set..
     /// - Parameters:

Sources/CRDT/GenericCRDTs/PNCounter.swift

@@ -8,9 +8,9 @@
 /// [A comprehensive study of Convergent and Commutative Replicated Data Types](https://hal.inria.fr/inria-00555588/document)”
 /// by Marc Shapiro, Nuno Preguiça, Carlos Baquero, and Marek Zawirski (2011).
 public struct PNCounter<ActorID: Hashable & PartiallyOrderable> {
-    internal var pos_value: UInt
-    internal var neg_value: UInt
-    internal let selfId: ActorID
+    var pos_value: UInt
+    var neg_value: UInt
+    let selfId: ActorID
 
     /// The counter's value.
     public var value: Int {

Sources/CRDT/LamportTimestamp.swift

@@ -8,8 +8,8 @@
 /// where the clock value is identical. These scenarios happen when two independent CRDTs update internal values
 /// "at the same time".
 public struct LamportTimestamp<ActorID: Hashable & PartiallyOrderable>: Identifiable, PartiallyOrderable {
-    internal var clock: UInt64 = 0
-    internal var actorId: ActorID
+    var clock: UInt64 = 0
+    var actorId: ActorID
 
     /// A stable, unique identity for the Lamport timestamp.
     public var id: String {

Sources/CRDT/WallclockTimestamp.swift

@@ -10,8 +10,8 @@ import Foundation
 /// where the clock value is identical. These scenarios happen when two independent CRDTs update internal values
 /// "at the same time".
 public struct WallclockTimestamp<ActorID: Hashable & PartiallyOrderable>: Identifiable, PartiallyOrderable {
-    internal var clock: TimeInterval
-    internal var actorId: ActorID
+    var clock: TimeInterval
+    var actorId: ActorID
 
     /// A stable, unique identity for the wallclock timestamp.
     public var id: String {

Tests/CRDTTests/ORMapTests.swift

@@ -1,5 +1,5 @@
 //
-//  ORSetTests.swift
+//  ORMapTests.swift
 //
 
 @testable import CRDT