renaming NQueue -> Threading

NikSativa · Apr 8, 2024 · d1d666b · d1d666b
1 parent cd4fd81
commit d1d666b
Show file tree

Hide file tree

Showing 13 changed files with 91 additions and 94 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mattgallagher/CwlCatchException.git",
       "state" : {
-        "revision" : "3b123999de19bf04905bc1dfdb76f817b0f2cc00",
-        "version" : "2.1.2"
+        "revision" : "3ef6999c73b6938cc0da422f2c912d0158abb0a0",
+        "version" : "2.2.0"
       }
     },
     {
@@ -19,12 +19,12 @@
       }
     },
     {
-      "identity" : "nspry",
+      "identity" : "sprykit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/NikSativa/NSpry.git",
+      "location" : "https://github.com/NikSativa/SpryKit.git",
       "state" : {
-        "revision" : "2bd07efd49af15a1afd1e44ea9212383c55d3a31",
-        "version" : "2.1.4"
+        "revision" : "e15daa49ecd106aeceab734e4fd7207e26a8ba4c",
+        "version" : "2.2.0"
       }
     }
   ],

diff --git a/Package.swift b/Package.swift
@@ -3,7 +3,7 @@
 import PackageDescription
 
 let package = Package(
-    name: "NQueue",
+    name: "Threading",
     platforms: [
         .iOS(.v13),
         .macOS(.v11),
@@ -13,34 +13,34 @@ let package = Package(
         .watchOS(.v6)
     ],
     products: [
-        .library(name: "NQueue", targets: ["NQueue"]),
-        .library(name: "NQueueTestHelpers", targets: ["NQueueTestHelpers"])
+        .library(name: "Threading", targets: ["Threading"]),
+        .library(name: "ThreadingTestHelpers", targets: ["ThreadingTestHelpers"])
     ],
     dependencies: [
-        .package(url: "https://github.com/NikSativa/NSpry.git", .upToNextMajor(from: "2.1.4"))
+        .package(url: "https://github.com/NikSativa/SpryKit.git", .upToNextMajor(from: "2.2.0"))
     ],
     targets: [
-        .target(name: "NQueue",
+        .target(name: "Threading",
                 dependencies: [
                 ],
                 path: "Source",
                 resources: [
                     .copy("../PrivacyInfo.xcprivacy")
                 ]),
-        .target(name: "NQueueTestHelpers",
+        .target(name: "ThreadingTestHelpers",
                 dependencies: [
-                    "NQueue",
-                    "NSpry"
+                    "Threading",
+                    "SpryKit"
                 ],
                 path: "TestHelpers",
                 resources: [
                     .copy("../PrivacyInfo.xcprivacy")
                 ]),
-        .testTarget(name: "NQueueTests",
+        .testTarget(name: "ThreadingTests",
                     dependencies: [
-                        "NQueue",
-                        "NQueueTestHelpers",
-                        "NSpry"
+                        "Threading",
+                        "ThreadingTestHelpers",
+                        "SpryKit"
                     ],
                     path: "Tests")
     ]

diff --git a/Package@swift-5.5.swift b/Package@swift-5.5.swift
@@ -3,7 +3,7 @@
 import PackageDescription
 
 let package = Package(
-    name: "NQueue",
+    name: "Threading",
     platforms: [
         .iOS(.v13),
         .macOS(.v11),
@@ -12,33 +12,33 @@ let package = Package(
         .watchOS(.v6)
     ],
     products: [
-        .library(name: "NQueue", targets: ["NQueue"]),
-        .library(name: "NQueueTestHelpers", targets: ["NQueueTestHelpers"])
+        .library(name: "Threading", targets: ["Threading"]),
+        .library(name: "ThreadingTestHelpers", targets: ["ThreadingTestHelpers"])
     ],
     dependencies: [
         .package(url: "https://github.com/NikSativa/NSpry.git", .upToNextMajor(from: "2.1.4"))
     ],
     targets: [
-        .target(name: "NQueue",
+        .target(name: "Threading",
                 dependencies: [
                 ],
                 path: "Source",
                 resources: [
                     .copy("../PrivacyInfo.xcprivacy")
                 ]),
-        .target(name: "NQueueTestHelpers",
+        .target(name: "ThreadingTestHelpers",
                 dependencies: [
-                    "NQueue",
+                    "Threading",
                     "NSpry"
                 ],
                 path: "TestHelpers",
                 resources: [
                     .copy("../PrivacyInfo.xcprivacy")
                 ]),
-        .testTarget(name: "NQueueTests",
+        .testTarget(name: "ThreadingTests",
                     dependencies: [
-                        "NQueue",
-                        "NQueueTestHelpers",
+                        "Threading",
+                        "ThreadingTestHelpers",
                         "NSpry"
                     ],
                     path: "Tests")

diff --git a/Package@swift-5.6.swift b/Package@swift-5.6.swift
@@ -3,7 +3,7 @@
 import PackageDescription
 
 let package = Package(
-    name: "NQueue",
+    name: "Threading",
     platforms: [
         .iOS(.v13),
         .macOS(.v11),
@@ -12,33 +12,33 @@ let package = Package(
         .watchOS(.v6)
     ],
     products: [
-        .library(name: "NQueue", targets: ["NQueue"]),
-        .library(name: "NQueueTestHelpers", targets: ["NQueueTestHelpers"])
+        .library(name: "Threading", targets: ["Threading"]),
+        .library(name: "ThreadingTestHelpers", targets: ["ThreadingTestHelpers"])
     ],
     dependencies: [
         .package(url: "https://github.com/NikSativa/NSpry.git", .upToNextMajor(from: "2.1.4"))
     ],
     targets: [
-        .target(name: "NQueue",
+        .target(name: "Threading",
                 dependencies: [
                 ],
                 path: "Source",
                 resources: [
                     .copy("../PrivacyInfo.xcprivacy")
                 ]),
-        .target(name: "NQueueTestHelpers",
+        .target(name: "ThreadingTestHelpers",
                 dependencies: [
-                    "NQueue",
+                    "Threading",
                     "NSpry"
                 ],
                 path: "TestHelpers",
                 resources: [
                     .copy("../PrivacyInfo.xcprivacy")
                 ]),
-        .testTarget(name: "NQueueTests",
+        .testTarget(name: "ThreadingTests",
                     dependencies: [
-                        "NQueue",
-                        "NQueueTestHelpers",
+                        "Threading",
+                        "ThreadingTestHelpers",
                         "NSpry"
                     ],
                     path: "Tests")

diff --git a/Package@swift-5.7.swift b/Package@swift-5.7.swift
@@ -3,7 +3,7 @@
 import PackageDescription
 
 let package = Package(
-    name: "NQueue",
+    name: "Threading",
     platforms: [
         .iOS(.v13),
         .macOS(.v11),
@@ -12,33 +12,33 @@ let package = Package(
         .watchOS(.v6)
     ],
     products: [
-        .library(name: "NQueue", targets: ["NQueue"]),
-        .library(name: "NQueueTestHelpers", targets: ["NQueueTestHelpers"])
+        .library(name: "Threading", targets: ["Threading"]),
+        .library(name: "ThreadingTestHelpers", targets: ["ThreadingTestHelpers"])
     ],
     dependencies: [
         .package(url: "https://github.com/NikSativa/NSpry.git", .upToNextMajor(from: "2.1.4"))
     ],
     targets: [
-        .target(name: "NQueue",
+        .target(name: "Threading",
                 dependencies: [
                 ],
                 path: "Source",
                 resources: [
                     .copy("../PrivacyInfo.xcprivacy")
                 ]),
-        .target(name: "NQueueTestHelpers",
+        .target(name: "ThreadingTestHelpers",
                 dependencies: [
-                    "NQueue",
+                    "Threading",
                     "NSpry"
                 ],
                 path: "TestHelpers",
                 resources: [
                     .copy("../PrivacyInfo.xcprivacy")
                 ]),
-        .testTarget(name: "NQueueTests",
+        .testTarget(name: "ThreadingTests",
                     dependencies: [
-                        "NQueue",
-                        "NQueueTestHelpers",
+                        "Threading",
+                        "ThreadingTestHelpers",
                         "NSpry"
                     ],
                     path: "Tests")

diff --git a/Package@swift-5.8.swift b/Package@swift-5.8.swift
@@ -3,7 +3,7 @@
 import PackageDescription
 
 let package = Package(
-    name: "NQueue",
+    name: "Threading",
     platforms: [
         .iOS(.v13),
         .macOS(.v11),
@@ -12,33 +12,33 @@ let package = Package(
         .watchOS(.v6)
     ],
     products: [
-        .library(name: "NQueue", targets: ["NQueue"]),
-        .library(name: "NQueueTestHelpers", targets: ["NQueueTestHelpers"])
+        .library(name: "Threading", targets: ["Threading"]),
+        .library(name: "ThreadingTestHelpers", targets: ["ThreadingTestHelpers"])
     ],
     dependencies: [
         .package(url: "https://github.com/NikSativa/NSpry.git", .upToNextMajor(from: "2.1.4"))
     ],
     targets: [
-        .target(name: "NQueue",
+        .target(name: "Threading",
                 dependencies: [
                 ],
                 path: "Source",
                 resources: [
                     .copy("../PrivacyInfo.xcprivacy")
                 ]),
-        .target(name: "NQueueTestHelpers",
+        .target(name: "ThreadingTestHelpers",
                 dependencies: [
-                    "NQueue",
+                    "Threading",
                     "NSpry"
                 ],
                 path: "TestHelpers",
                 resources: [
                     .copy("../PrivacyInfo.xcprivacy")
                 ]),
-        .testTarget(name: "NQueueTests",
+        .testTarget(name: "ThreadingTests",
                     dependencies: [
-                        "NQueue",
-                        "NQueueTestHelpers",
+                        "Threading",
+                        "ThreadingTestHelpers",
                         "NSpry"
                     ],
                     path: "Tests")

diff --git a/TestHelpers/DelayedQueue+TestHelper.swift b/TestHelpers/DelayedQueue+TestHelper.swift
@@ -1,6 +1,6 @@
 import Foundation
-import NQueue
-import NSpry
+import SpryKit
+import Threading
 
 // MARK: - DelayedQueue + Equatable, SpryEquatable
 

diff --git a/TestHelpers/FakeMutexing.swift b/TestHelpers/FakeMutexing.swift
@@ -1,27 +1,27 @@
 import Foundation
-import NQueue
-import NSpry
+import SpryKit
+import Threading
 
-final class FakeMutexing: Mutexing, Spryable {
-    enum ClassFunction: String, StringRepresentable {
+public final class FakeMutexing: Mutexing, Spryable {
+    public enum ClassFunction: String, StringRepresentable {
         case empty
     }
 
-    enum Function: String, StringRepresentable {
+    public enum Function: String, StringRepresentable {
         case async = "sync(execute:)"
         case trySync = "trySync(execute:)"
     }
 
-    var shouldFireClosures: Bool = false
+    public var shouldFireClosures: Bool = false
 
-    func sync<R>(execute work: () throws -> R) rethrows -> R {
+    public func sync<R>(execute work: () throws -> R) rethrows -> R {
         if shouldFireClosures {
             return try spryify(fallbackValue: work())
         }
         return spryify()
     }
 
-    func trySync<R>(execute work: () throws -> R) rethrows -> R {
+    public func trySync<R>(execute work: () throws -> R) rethrows -> R {
         if shouldFireClosures {
             return try spryify(fallbackValue: work())
         }