Swift testing

.github/workflows/ci.yml

@@ -20,9 +20,9 @@ jobs:
     strategy:
       matrix:
         image:
-          - 'swift:5.10'
           - 'swift:6.0'
           - 'swift:6.1'
+          - 'swiftlang/swift:nightly-6.2-noble'
         postgres-image:
           - 'postgres:17'
           - 'postgres:16'

Package.swift

@@ -1,10 +1,10 @@
-// swift-tools-version: 5.10
+// swift-tools-version: 6.0
 
 import PackageDescription
 
 let package = Package(
     name: "swift-jobs-postgres",
-    platforms: [.macOS(.v14), .iOS(.v17), .tvOS(.v17)],
+    platforms: [.macOS(.v15), .iOS(.v18), .tvOS(.v18)],
     products: [
         .library(name: "JobsPostgres", targets: ["JobsPostgres"])
     ],

Sources/JobsPostgres/PostgresJobsQueue+cleanup.swift

@@ -15,7 +15,6 @@
 import Foundation
 import Jobs
 import Logging
-import NIOConcurrencyHelpers
 import NIOCore
 import PostgresMigrations
 import PostgresNIO

Sources/JobsPostgres/PostgresJobsQueue.swift

@@ -15,10 +15,10 @@
 import Foundation
 import Jobs
 import Logging
-import NIOConcurrencyHelpers
 import NIOCore
 import PostgresMigrations
 import PostgresNIO
+import Synchronization
 
 /// Postgres Job queue implementation
 ///
@@ -147,7 +147,7 @@ public final class PostgresJobQueue: JobQueueDriver, CancellableJobQueue, Resuma
     public let logger: Logger
     let migrations: DatabaseMigrations
     @usableFromInline
-    let isStopped: NIOLockedValueBox<Bool>
+    let isStopped: Mutex<Bool>
 
     /// Initialize a PostgresJobQueue
     public init(client: PostgresClient, migrations: DatabaseMigrations, configuration: Configuration = .init(), logger: Logger) async {
@@ -157,9 +157,8 @@ public final class PostgresJobQueue: JobQueueDriver, CancellableJobQueue, Resuma
         self.logger = logger
         self.isStopped = .init(false)
         self.migrations = migrations
-        await migrations.add(CreateSwiftJobsMigrations(), skipDuplicates: true)
-        await migrations.add(CreateJobMetadataMigration(), skipDuplicates: true)
         self.registerCleanupJob()
+        await Self.addMigrations(to: self.migrations)
     }
 
     public func waitUntilReady() async throws {
@@ -168,6 +167,11 @@ public final class PostgresJobQueue: JobQueueDriver, CancellableJobQueue, Resuma
         try await self.migrations.waitUntilCompleted()
     }
 
+    package static func addMigrations(to migrations: DatabaseMigrations) async {
+        await migrations.add(CreateSwiftJobsMigrations(), skipDuplicates: true)
+        await migrations.add(CreateJobMetadataMigration(), skipDuplicates: true)
+    }
+
     ///  Cancel job
     ///
     /// This function is used to cancel a job. Job cancellation is not gaurenteed howerever.
@@ -285,7 +289,7 @@ public final class PostgresJobQueue: JobQueueDriver, CancellableJobQueue, Resuma
 
     /// stop serving jobs
     public func stop() async {
-        self.isStopped.withLockedValue { $0 = true }
+        self.isStopped.withLock { $0 = true }
     }
 
     /// shutdown queue once all active jobs have been processed
@@ -533,7 +537,7 @@ extension PostgresJobQueue {
         @inlinable
         public func next() async throws -> Element? {
             while true {
-                if self.queue.isStopped.withLockedValue({ $0 }) {
+                if self.queue.isStopped.withLock({ $0 }) {
                     return nil
                 }