Add missing platform specifiers (#121)

* Add missing platform specifiers

* Fix imports

* Remove outdated concurrency conditionals, replace deprecated NIOAtomic with ManagedAtomic

Package.swift

@@ -4,7 +4,10 @@ import PackageDescription
 let package = Package(
     name: "queues",
     platforms: [
-       .macOS(.v10_15)
+        .macOS(.v10_15),
+        .iOS(.v13),
+        .tvOS(.v13),
+        .watchOS(.v6),
     ],
     products: [
         .library(name: "Queues", targets: ["Queues"]),

Sources/Queues/Application+Queues.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Logging
 import Vapor
 import NIO
 

Sources/Queues/AsyncJob.swift

@@ -2,9 +2,7 @@ import Vapor
 import NIOCore
 import Foundation
 
-#if compiler(>=5.5) && canImport(_Concurrency)
 /// A task that can be queued for future execution.
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
 public protocol AsyncJob: Job {
     /// The data associated with a job
     associatedtype Payload
@@ -41,7 +39,6 @@ public protocol AsyncJob: Job {
     static func parsePayload(_ bytes: [UInt8]) throws -> Payload
 }
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
 extension AsyncJob where Payload: Codable {
 
     /// Serialize a payload into Data
@@ -57,7 +54,6 @@ extension AsyncJob where Payload: Codable {
     }
 }
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
 extension AsyncJob {
     /// The jobName of the Job
     public static var name: String {
@@ -93,4 +89,3 @@ extension AsyncJob {
         return
     }
 }
-#endif

Sources/Queues/AsyncJobEventDelegate.swift

@@ -1,8 +1,6 @@
-#if compiler(>=5.5) && canImport(_Concurrency)
 import NIOCore
 
 /// Represents an object that can receive notifications about job statuses
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
 public protocol AsyncJobEventDelegate: JobEventDelegate {
     /// Called when the job is first dispatched
     /// - Parameters:
@@ -26,7 +24,6 @@ public protocol AsyncJobEventDelegate: JobEventDelegate {
     func error(jobId: String, error: Error) async throws
 }
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
 extension AsyncJobEventDelegate {
     public func dispatched(job: JobEventData) async throws { }
     public func didDequeue(jobId: String) async throws { }
@@ -57,4 +54,3 @@ extension AsyncJobEventDelegate {
         }
     }
 }
-#endif

Sources/Queues/AsyncScheduledJob.swift

@@ -2,9 +2,7 @@ import Vapor
 import NIOCore
 import Foundation
 
-#if compiler(>=5.5) && canImport(_Concurrency)
 /// Describes a job that can be scheduled and repeated
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
 public protocol AsyncScheduledJob: ScheduledJob {
     var name: String { get }
 
@@ -13,7 +11,6 @@ public protocol AsyncScheduledJob: ScheduledJob {
     func run(context: QueueContext) async throws
 }
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
 extension AsyncScheduledJob {
     public var name: String { "\(Self.self)" }
 
@@ -25,4 +22,3 @@ extension AsyncScheduledJob {
         return promise.futureResult
     }
 }
-#endif

Sources/Queues/Job.swift

@@ -1,5 +1,6 @@
-import NIO
+import NIOCore
 import Foundation
+import Logging
 import Vapor
 
 /// A task that can be queued for future execution.

Sources/Queues/Queue+Async.swift

@@ -1,15 +1,14 @@
+import Foundation
 import Vapor
 import NIOCore
 
-#if compiler(>=5.5) && canImport(_Concurrency)
 extension Queue {
     /// Dispatch a job into the queue for processing
     /// - Parameters:
     ///   - job: The Job type
     ///   - payload: The payload data to be dispatched
     ///   - maxRetryCount: Number of times to retry this job on failure
     ///   - delayUntil: Delay the processing of this job until a certain date
-    @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
     public func dispatch<J>(
         _ job: J.Type,
         _ payload: J.Payload,
@@ -20,4 +19,3 @@ extension Queue {
         try await self.dispatch(job, payload, maxRetryCount: maxRetryCount, delayUntil: delayUntil, id: id).get()
     }
 }
-#endif

Sources/Queues/QueueContext.swift

@@ -1,3 +1,5 @@
+import Logging
+import NIOCore
 import Vapor
 
 /// The context for a queue.

Sources/Queues/QueuesCommand.swift

@@ -1,6 +1,14 @@
+import ConsoleKit
+import Dispatch
 import Vapor
 import NIOConcurrencyHelpers
 import NIOCore
+import Atomics
+#if os(Linux)
+import Glibc
+#else
+import Darwin.C
+#endif
 
 /// The command to start the Queue job
 public final class QueuesCommand: Command {
@@ -30,7 +38,7 @@ public final class QueuesCommand: Command {
     private var signalSources: [DispatchSourceSignal]
     private var didShutdown: Bool
 
-    private let isShuttingDown: NIOAtomic<Bool>
+    private let isShuttingDown: ManagedAtomic<Bool>
 
     private var eventLoopGroup: EventLoopGroup {
         self.application.eventLoopGroup
@@ -41,7 +49,7 @@ public final class QueuesCommand: Command {
         self.application = application
         self.jobTasks = []
         self.scheduledTasks = [:]
-        self.isShuttingDown = .makeAtomic(value: false)
+        self.isShuttingDown = .init(false)
         self.signalSources = []
         self.didShutdown = false
         self.lock = .init()
@@ -114,7 +122,7 @@ public final class QueuesCommand: Command {
                 return worker.run().map {
                     self.application.logger.trace("Worker ran the task successfully")
                     //Check if shutting down
-                    if self.isShuttingDown.load() {
+                    if self.isShuttingDown.load(ordering: .relaxed) {
                         self.application.logger.trace("Shutting down, cancelling the task")
                         task.cancel()
                     }
@@ -145,7 +153,7 @@ public final class QueuesCommand: Command {
     }
 
     private func schedule(_ job: AnyScheduledJob) {
-        if self.isShuttingDown.load() {
+        if self.isShuttingDown.load(ordering: .relaxed) {
             self.application.logger.trace("Application is shutting down, cancelling scheduling \(job.job.name)")
             return
         }
@@ -180,7 +188,7 @@ public final class QueuesCommand: Command {
         self.lock.lock()
         defer { self.lock.unlock() }
 
-        self.isShuttingDown.store(true)
+        self.isShuttingDown.store(true, ordering: .relaxed)
         self.didShutdown = true
 
         // stop running in case shutting downf rom signal

Sources/Queues/QueuesEventLoopPreference.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import NIO
+import NIOCore
 
 /// Determines which event loop the jobs worker uses while executing jobs.
 public enum QueuesEventLoopPreference {

Sources/Queues/Request+Queues.swift

@@ -1,6 +1,6 @@
 import Foundation
 import Vapor
-import NIO
+import NIOCore
 
 extension Request {
     /// Returns the default job `Queue`

Sources/Queues/ScheduleBuilder.swift

@@ -24,7 +24,7 @@ public final class ScheduleBuilder {
         case first
         case last
         case exact(Int)
-
+     
         public init(integerLiteral value: Int) {
             self = .exact(value)
         }

Sources/Queues/ScheduledJob.swift

@@ -1,4 +1,6 @@
 import NIOCore
+import Foundation
+import Logging
 
 /// Describes a job that can be scheduled and repeated
 public protocol ScheduledJob {

Sources/XCTQueues/TestQueueDriver.swift

@@ -1,5 +1,6 @@
 import Queues
 import Vapor
+import NIOCore
 import NIOConcurrencyHelpers
 
 extension Application.Queues.Provider {

Tests/QueuesTests/AsyncQueueTests.swift

@@ -1,19 +1,20 @@
-#if compiler(>=5.5) && canImport(_Concurrency)
 import Queues
+import Foundation
 import Vapor
+import XCTest
 import XCTVapor
 import XCTQueues
 @testable import Vapor
+import NIOCore
 import NIOConcurrencyHelpers
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
 final class AsyncQueueTests: XCTestCase {
     func testAsyncJob() throws {
         let app = Application(.testing)
         defer { app.shutdown() }
         app.queues.use(.test)
 
-        let promise = app.eventLoopGroup.next().makePromise(of: Void.self)
+        let promise = app.eventLoopGroup.any().makePromise(of: Void.self)
         app.queues.add(MyAsyncJob(promise: promise))
 
         app.get("foo") { req in
@@ -41,7 +42,6 @@ final class AsyncQueueTests: XCTestCase {
     }
 }
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
 struct MyAsyncJob: AsyncJob {
     let promise: EventLoopPromise<Void>
 
@@ -54,4 +54,3 @@ struct MyAsyncJob: AsyncJob {
         return
     }
 }
-#endif

Tests/QueuesTests/QueueTests.swift

@@ -1,9 +1,13 @@
+import Atomics
 import Queues
 import Vapor
+import Foundation
+import XCTest
 import XCTVapor
 import XCTQueues
-@testable import Vapor
+import NIOCore
 import NIOConcurrencyHelpers
+@testable import Vapor
 
 final class QueueTests: XCTestCase {
     func testVaporIntegrationWithInProcessJob() throws {
@@ -137,13 +141,13 @@ final class QueueTests: XCTestCase {
         let app = Application(.testing)
         defer { app.shutdown() }
 
-        XCTAssertEqual(TestingScheduledJob.count.load(), 0)
+        XCTAssertEqual(TestingScheduledJob.count.load(ordering: .relaxed), 0)
         app.queues.schedule(TestingScheduledJob()).everySecond()
         try app.queues.startScheduledJobs()
 
         let promise = app.eventLoopGroup.next().makePromise(of: Void.self)
         app.eventLoopGroup.next().scheduleTask(in: .seconds(5)) { () -> Void in
-            XCTAssert(TestingScheduledJob.count.load() > 4)
+            XCTAssert(TestingScheduledJob.count.load(ordering: .relaxed) > 4)
             promise.succeed(())
         }
 
@@ -408,10 +412,10 @@ struct FailingScheduledJob: ScheduledJob {
 }
 
 struct TestingScheduledJob: ScheduledJob {
-    static var count = NIOAtomic<Int>.makeAtomic(value: 0)
+    static var count = ManagedAtomic<Int>(0)
 
     func run(context: QueueContext) -> EventLoopFuture<Void> {
-        TestingScheduledJob.count.add(1)
+        TestingScheduledJob.count.wrappingIncrement(ordering: .relaxed)
         return context.eventLoop.future()
     }
 }

Tests/QueuesTests/ScheduleBuilderTests.swift

@@ -1,3 +1,4 @@
+import Foundation
 import Queues
 import XCTest
 import NIOCore
@@ -157,8 +158,6 @@ final class ScheduleBuilderTests: XCTestCase {
 
 }
 
-
-
 final class Cleanup: ScheduledJob {
     func run(context: QueueContext) -> EventLoopFuture<Void> {
         return context.eventLoop.makeSucceededFuture(())