Skip to content

Update all library and tooling dependencies #678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 29, 2021
Merged

Update all library and tooling dependencies #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .evergreen/install-tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 7 additions & 9 deletions Tests/MongoSwiftSyncTests/SyncChangeStreamTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SwiftFormat update starting formatting this a little differently.

coincidentally, we can unskip this pretty soon, when Isabel picks up SWIFT-560.

// 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.
Expand Down
2 changes: 1 addition & 1 deletion Tests/MongoSwiftTests/MongoClientTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIO changed the error type thrown here in a recent release.

}

func verifyPoolSize(_ client: MongoClient, size: Int) throws {
Expand Down