diff --git a/.evergreen/install-tools.sh b/.evergreen/install-tools.sh index 8759f6b80..ae3f37a46 100644 --- a/.evergreen/install-tools.sh +++ b/.evergreen/install-tools.sh @@ -39,13 +39,13 @@ swiftenv local $SWIFT_VERSION if [ $1 == "swiftlint" ] then - build_from_gh swiftlint https://github.com/realm/SwiftLint "0.43.1" + build_from_gh swiftlint https://github.com/realm/SwiftLint "0.44.0" elif [ $1 == "swiftformat" ] then - build_from_gh swiftformat https://github.com/nicklockwood/SwiftFormat "0.47.13" + build_from_gh swiftformat https://github.com/nicklockwood/SwiftFormat "0.48.11" elif [ $1 == "sourcery" ] then - install_from_gh sourcery https://github.com/krzysztofzablocki/Sourcery/releases/download/1.3.4/Sourcery-1.3.4.zip + install_from_gh sourcery https://github.com/krzysztofzablocki/Sourcery/releases/download/1.6.0/Sourcery-1.6.0.zip else echo Missing/unknown install option: "$1" fi diff --git a/Package.resolved b/Package.resolved index 3ce3da918..c52a51753 100644 --- a/Package.resolved +++ b/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/mongodb/swift-bson", "state": { "branch": null, - "revision": "8a9d60c4e684579a390621674850e8a6fa04c3ed", - "version": "3.0.0" + "revision": "558c7ff441da4599a18dc5eee5b4c6c6d74a1b8b", + "version": "3.0.1" } }, { @@ -42,8 +42,8 @@ "repositoryURL": "https://github.com/apple/swift-nio", "state": { "branch": null, - "revision": "43931b7a7daf8120a487601530c8bc03ce711992", - "version": "2.25.1" + "revision": "6aa9347d9bc5bbfe6a84983aec955c17ffea96ef", + "version": "2.33.0" } } ] diff --git a/Tests/MongoSwiftSyncTests/SyncChangeStreamTests.swift b/Tests/MongoSwiftSyncTests/SyncChangeStreamTests.swift index 34961a77f..a0be65bef 100644 --- a/Tests/MongoSwiftSyncTests/SyncChangeStreamTests.swift +++ b/Tests/MongoSwiftSyncTests/SyncChangeStreamTests.swift @@ -296,15 +296,13 @@ final class ChangeStreamSpecTests: MongoSwiftTestCase { // TODO: SWIFT-560: Run this test. func testChangeStreamSpecUnified() throws { printSkipMessage(testName: self.name, reason: "Skipping until SWIFT-560 is implemented") - return - - // let tests = try retrieveSpecTestFiles( - // specName: "change-streams", - // subdirectory: "unified", - // asType: UnifiedTestFile.self - // ).map { $0.1 } - // let testRunner = try UnifiedTestRunner() - // try testRunner.runFiles(tests) + // let tests = try retrieveSpecTestFiles( + // specName: "change-streams", + // subdirectory: "unified", + // asType: UnifiedTestFile.self + // ).map { $0.1 } + // let testRunner = try UnifiedTestRunner() + // try testRunner.runFiles(tests) } // TODO: SWIFT-560: Remove this test. It is a prose version of a unified test which we skip above. diff --git a/Tests/MongoSwiftTests/MongoClientTests.swift b/Tests/MongoSwiftTests/MongoClientTests.swift index 52972e05b..12c906b2d 100644 --- a/Tests/MongoSwiftTests/MongoClientTests.swift +++ b/Tests/MongoSwiftTests/MongoClientTests.swift @@ -10,7 +10,7 @@ final class MongoClientTests: MongoSwiftTestCase { defer { elg.syncShutdownOrFail() } let client = try MongoClient(using: elg) try client.syncClose() - expect(try client.listDatabases().wait()).to(throwError(errorType: ChannelError.self)) + expect(try client.listDatabases().wait()).to(throwError(errorType: NIOThreadPoolError.ThreadPoolInactive.self)) } func verifyPoolSize(_ client: MongoClient, size: Int) throws {