From f8d7a36a4c3a66f7ae4466c4a7eae1345080eb65 Mon Sep 17 00:00:00 2001 From: Ross Goldberg <484615+rgoldberg@users.noreply.github.com> Date: Wed, 2 Oct 2024 06:24:02 -0400 Subject: [PATCH] Upgrade test dependencies. Quick upgrade necessary if we ever switch from PromiseKit to Swift concurrency. Signed-off-by: Ross Goldberg <484615+rgoldberg@users.noreply.github.com> --- Package.resolved | 26 ++++++++++++++++--- Package.swift | 4 +-- Tests/masTests/Commands/AccountSpec.swift | 2 +- Tests/masTests/Commands/HomeSpec.swift | 2 +- Tests/masTests/Commands/InfoSpec.swift | 2 +- Tests/masTests/Commands/InstallSpec.swift | 2 +- Tests/masTests/Commands/ListSpec.swift | 2 +- Tests/masTests/Commands/LuckySpec.swift | 2 +- Tests/masTests/Commands/OpenSpec.swift | 2 +- Tests/masTests/Commands/OutdatedSpec.swift | 2 +- Tests/masTests/Commands/PurchaseSpec.swift | 2 +- Tests/masTests/Commands/ResetSpec.swift | 2 +- Tests/masTests/Commands/SearchSpec.swift | 2 +- Tests/masTests/Commands/SignInSpec.swift | 2 +- Tests/masTests/Commands/SignOutSpec.swift | 2 +- Tests/masTests/Commands/UninstallSpec.swift | 2 +- Tests/masTests/Commands/UpgradeSpec.swift | 2 +- Tests/masTests/Commands/VendorSpec.swift | 2 +- Tests/masTests/Commands/VersionSpec.swift | 2 +- .../Controllers/MasAppLibrarySpec.swift | 2 +- .../Controllers/MasStoreSearchSpec.swift | 2 +- .../OpenSystemCommandSpec.swift | 2 +- .../Formatters/AppListFormatterSpec.swift | 2 +- .../SearchResultFormatterSpec.swift | 2 +- .../Models/SearchResultListSpec.swift | 2 +- Tests/masTests/Models/SearchResultSpec.swift | 2 +- .../masTests/Models/SoftwareProductSpec.swift | 2 +- Tests/masTests/OutputListenerSpec.swift | 2 +- 28 files changed, 50 insertions(+), 32 deletions(-) diff --git a/Package.resolved b/Package.resolved index 80d3efe..dfcbb2b 100644 --- a/Package.resolved +++ b/Package.resolved @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Quick/Nimble.git", "state" : { - "revision" : "1f3bde57bde12f5e7b07909848c071e9b73d6edc", - "version" : "10.0.0" + "revision" : "6416749c3c0488664fff6b42f8bf3ea8dc282ca1", + "version" : "13.6.0" } }, { @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Quick/Quick.git", "state" : { - "revision" : "f9d519828bb03dfc8125467d8f7b93131951124c", - "version" : "5.0.1" + "revision" : "1163a1b1b114a657c7432b63dd1f92ce99fe11a6", + "version" : "7.6.2" } }, { @@ -54,6 +54,15 @@ "version" : "2.1.1" } }, + { + "identity" : "swift-algorithms", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-algorithms.git", + "state" : { + "revision" : "f6919dfc309e7f1b56224378b11e28bab5bccc42", + "version" : "1.2.0" + } + }, { "identity" : "swift-argument-parser", "kind" : "remoteSourceControl", @@ -63,6 +72,15 @@ "version" : "1.5.0" } }, + { + "identity" : "swift-numerics", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-numerics.git", + "state" : { + "revision" : "0a5bc04095a675662cf24757cc0640aa2204253b", + "version" : "1.0.2" + } + }, { "identity" : "version", "kind" : "remoteSourceControl", diff --git a/Package.swift b/Package.swift index f56b7ec..021e71f 100644 --- a/Package.swift +++ b/Package.swift @@ -17,8 +17,8 @@ let package = Package( ], dependencies: [ // Dependencies declare other packages that this package depends on. - .package(url: "https://github.com/Quick/Nimble.git", from: "10.0.0"), - .package(url: "https://github.com/Quick/Quick.git", from: "5.0.0"), + .package(url: "https://github.com/Quick/Nimble.git", from: "13.6.0"), + .package(url: "https://github.com/Quick/Quick.git", from: "7.6.2"), .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.5.0"), .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.22.1"), .package(url: "https://github.com/mxcl/Version.git", from: "2.1.0"), diff --git a/Tests/masTests/Commands/AccountSpec.swift b/Tests/masTests/Commands/AccountSpec.swift index b4c6277..2021577 100644 --- a/Tests/masTests/Commands/AccountSpec.swift +++ b/Tests/masTests/Commands/AccountSpec.swift @@ -13,7 +13,7 @@ import Quick // Deprecated test public class AccountSpec: QuickSpec { - override public func spec() { + override public static func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/HomeSpec.swift b/Tests/masTests/Commands/HomeSpec.swift index 6f740d3..e366ee4 100644 --- a/Tests/masTests/Commands/HomeSpec.swift +++ b/Tests/masTests/Commands/HomeSpec.swift @@ -12,7 +12,7 @@ import Quick @testable import mas public class HomeSpec: QuickSpec { - override public func spec() { + override public static func spec() { let result = SearchResult( trackId: 1111, trackViewUrl: "mas preview url", diff --git a/Tests/masTests/Commands/InfoSpec.swift b/Tests/masTests/Commands/InfoSpec.swift index 8047c95..bbedfdd 100644 --- a/Tests/masTests/Commands/InfoSpec.swift +++ b/Tests/masTests/Commands/InfoSpec.swift @@ -12,7 +12,7 @@ import Quick @testable import mas public class InfoSpec: QuickSpec { - override public func spec() { + override public static func spec() { let result = SearchResult( currentVersionReleaseDate: "2019-01-07T18:53:13Z", fileSizeBytes: "1024", diff --git a/Tests/masTests/Commands/InstallSpec.swift b/Tests/masTests/Commands/InstallSpec.swift index 4baeead..8580fe0 100644 --- a/Tests/masTests/Commands/InstallSpec.swift +++ b/Tests/masTests/Commands/InstallSpec.swift @@ -12,7 +12,7 @@ import Quick @testable import mas public class InstallSpec: QuickSpec { - override public func spec() { + override public static func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/ListSpec.swift b/Tests/masTests/Commands/ListSpec.swift index 352ccdd..5cb373d 100644 --- a/Tests/masTests/Commands/ListSpec.swift +++ b/Tests/masTests/Commands/ListSpec.swift @@ -12,7 +12,7 @@ import Quick @testable import mas public class ListSpec: QuickSpec { - override public func spec() { + override public static func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/LuckySpec.swift b/Tests/masTests/Commands/LuckySpec.swift index 51da88f..879c5dd 100644 --- a/Tests/masTests/Commands/LuckySpec.swift +++ b/Tests/masTests/Commands/LuckySpec.swift @@ -12,7 +12,7 @@ import Quick @testable import mas public class LuckySpec: QuickSpec { - override public func spec() { + override public static func spec() { let networkSession = NetworkSessionMockFromFile(responseFile: "search/slack.json") let storeSearch = MasStoreSearch(networkManager: NetworkManager(session: networkSession)) diff --git a/Tests/masTests/Commands/OpenSpec.swift b/Tests/masTests/Commands/OpenSpec.swift index c0cca20..bedab44 100644 --- a/Tests/masTests/Commands/OpenSpec.swift +++ b/Tests/masTests/Commands/OpenSpec.swift @@ -13,7 +13,7 @@ import Quick @testable import mas public class OpenSpec: QuickSpec { - override public func spec() { + override public static func spec() { let result = SearchResult( trackId: 1111, trackViewUrl: "fakescheme://some/url", diff --git a/Tests/masTests/Commands/OutdatedSpec.swift b/Tests/masTests/Commands/OutdatedSpec.swift index 9acd3da..6152645 100644 --- a/Tests/masTests/Commands/OutdatedSpec.swift +++ b/Tests/masTests/Commands/OutdatedSpec.swift @@ -12,7 +12,7 @@ import Quick @testable import mas public class OutdatedSpec: QuickSpec { - override public func spec() { + override public static func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/PurchaseSpec.swift b/Tests/masTests/Commands/PurchaseSpec.swift index 51f84f5..e186f55 100644 --- a/Tests/masTests/Commands/PurchaseSpec.swift +++ b/Tests/masTests/Commands/PurchaseSpec.swift @@ -12,7 +12,7 @@ import Quick @testable import mas public class PurchaseSpec: QuickSpec { - override public func spec() { + override public static func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/ResetSpec.swift b/Tests/masTests/Commands/ResetSpec.swift index ca39e2b..411c101 100644 --- a/Tests/masTests/Commands/ResetSpec.swift +++ b/Tests/masTests/Commands/ResetSpec.swift @@ -12,7 +12,7 @@ import Quick @testable import mas public class ResetSpec: QuickSpec { - override public func spec() { + override public static func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/SearchSpec.swift b/Tests/masTests/Commands/SearchSpec.swift index c5fdc84..fba2caf 100644 --- a/Tests/masTests/Commands/SearchSpec.swift +++ b/Tests/masTests/Commands/SearchSpec.swift @@ -12,7 +12,7 @@ import Quick @testable import mas public class SearchSpec: QuickSpec { - override public func spec() { + override public static func spec() { let result = SearchResult( trackId: 1111, trackName: "slack", diff --git a/Tests/masTests/Commands/SignInSpec.swift b/Tests/masTests/Commands/SignInSpec.swift index f0866c7..5336c99 100644 --- a/Tests/masTests/Commands/SignInSpec.swift +++ b/Tests/masTests/Commands/SignInSpec.swift @@ -13,7 +13,7 @@ import Quick // Deprecated test public class SignInSpec: QuickSpec { - override public func spec() { + override public static func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/SignOutSpec.swift b/Tests/masTests/Commands/SignOutSpec.swift index a5b5466..3424ef2 100644 --- a/Tests/masTests/Commands/SignOutSpec.swift +++ b/Tests/masTests/Commands/SignOutSpec.swift @@ -12,7 +12,7 @@ import Quick @testable import mas public class SignOutSpec: QuickSpec { - override public func spec() { + override public static func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/UninstallSpec.swift b/Tests/masTests/Commands/UninstallSpec.swift index 76018ed..072473e 100644 --- a/Tests/masTests/Commands/UninstallSpec.swift +++ b/Tests/masTests/Commands/UninstallSpec.swift @@ -13,7 +13,7 @@ import Quick @testable import mas public class UninstallSpec: QuickSpec { - override public func spec() { + override public static func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/UpgradeSpec.swift b/Tests/masTests/Commands/UpgradeSpec.swift index 78a3c93..f22d450 100644 --- a/Tests/masTests/Commands/UpgradeSpec.swift +++ b/Tests/masTests/Commands/UpgradeSpec.swift @@ -12,7 +12,7 @@ import Quick @testable import mas public class UpgradeSpec: QuickSpec { - override public func spec() { + override public static func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/VendorSpec.swift b/Tests/masTests/Commands/VendorSpec.swift index 499534a..b5bf8e5 100644 --- a/Tests/masTests/Commands/VendorSpec.swift +++ b/Tests/masTests/Commands/VendorSpec.swift @@ -12,7 +12,7 @@ import Quick @testable import mas public class VendorSpec: QuickSpec { - override public func spec() { + override public static func spec() { let result = SearchResult( trackId: 1111, trackViewUrl: "https://awesome.app", diff --git a/Tests/masTests/Commands/VersionSpec.swift b/Tests/masTests/Commands/VersionSpec.swift index 36adb0e..46c2baa 100644 --- a/Tests/masTests/Commands/VersionSpec.swift +++ b/Tests/masTests/Commands/VersionSpec.swift @@ -12,7 +12,7 @@ import Quick @testable import mas public class VersionSpec: QuickSpec { - override public func spec() { + override public static func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Controllers/MasAppLibrarySpec.swift b/Tests/masTests/Controllers/MasAppLibrarySpec.swift index 9d823a4..6fe8628 100644 --- a/Tests/masTests/Controllers/MasAppLibrarySpec.swift +++ b/Tests/masTests/Controllers/MasAppLibrarySpec.swift @@ -12,7 +12,7 @@ import Quick @testable import mas public class MasAppLibrarySpec: QuickSpec { - override public func spec() { + override public static func spec() { let library = MasAppLibrary(softwareMap: SoftwareMapMock(products: apps)) beforeSuite { diff --git a/Tests/masTests/Controllers/MasStoreSearchSpec.swift b/Tests/masTests/Controllers/MasStoreSearchSpec.swift index e05a2a6..938c82c 100644 --- a/Tests/masTests/Controllers/MasStoreSearchSpec.swift +++ b/Tests/masTests/Controllers/MasStoreSearchSpec.swift @@ -12,7 +12,7 @@ import Quick @testable import mas public class MasStoreSearchSpec: QuickSpec { - override public func spec() { + override public static func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/ExternalCommands/OpenSystemCommandSpec.swift b/Tests/masTests/ExternalCommands/OpenSystemCommandSpec.swift index d2709ef..41db44a 100644 --- a/Tests/masTests/ExternalCommands/OpenSystemCommandSpec.swift +++ b/Tests/masTests/ExternalCommands/OpenSystemCommandSpec.swift @@ -12,7 +12,7 @@ import Quick @testable import mas public class OpenSystemCommandSpec: QuickSpec { - override public func spec() { + override public static func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Formatters/AppListFormatterSpec.swift b/Tests/masTests/Formatters/AppListFormatterSpec.swift index c454691..ebc9130 100644 --- a/Tests/masTests/Formatters/AppListFormatterSpec.swift +++ b/Tests/masTests/Formatters/AppListFormatterSpec.swift @@ -12,7 +12,7 @@ import Quick @testable import mas public class AppListsFormatterSpec: QuickSpec { - override public func spec() { + override public static func spec() { // static func reference let format = AppListFormatter.format(products:) var products: [SoftwareProduct] = [] diff --git a/Tests/masTests/Formatters/SearchResultFormatterSpec.swift b/Tests/masTests/Formatters/SearchResultFormatterSpec.swift index 211445b..368e8e6 100644 --- a/Tests/masTests/Formatters/SearchResultFormatterSpec.swift +++ b/Tests/masTests/Formatters/SearchResultFormatterSpec.swift @@ -12,7 +12,7 @@ import Quick @testable import mas public class SearchResultsFormatterSpec: QuickSpec { - override public func spec() { + override public static func spec() { // static func reference let format = SearchResultFormatter.format(results:includePrice:) var results: [SearchResult] = [] diff --git a/Tests/masTests/Models/SearchResultListSpec.swift b/Tests/masTests/Models/SearchResultListSpec.swift index a7fadf6..4f6f3e5 100644 --- a/Tests/masTests/Models/SearchResultListSpec.swift +++ b/Tests/masTests/Models/SearchResultListSpec.swift @@ -13,7 +13,7 @@ import Quick @testable import mas public class SearchResultListSpec: QuickSpec { - override public func spec() { + override public static func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Models/SearchResultSpec.swift b/Tests/masTests/Models/SearchResultSpec.swift index 4617edd..b3ddc24 100644 --- a/Tests/masTests/Models/SearchResultSpec.swift +++ b/Tests/masTests/Models/SearchResultSpec.swift @@ -13,7 +13,7 @@ import Quick @testable import mas public class SearchResultSpec: QuickSpec { - override public func spec() { + override public static func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Models/SoftwareProductSpec.swift b/Tests/masTests/Models/SoftwareProductSpec.swift index 80cbde3..a223ef3 100644 --- a/Tests/masTests/Models/SoftwareProductSpec.swift +++ b/Tests/masTests/Models/SoftwareProductSpec.swift @@ -13,7 +13,7 @@ import Quick @testable import mas public class SoftwareProductSpec: QuickSpec { - override public func spec() { + override public static func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/OutputListenerSpec.swift b/Tests/masTests/OutputListenerSpec.swift index faef8c7..c5d02a6 100644 --- a/Tests/masTests/OutputListenerSpec.swift +++ b/Tests/masTests/OutputListenerSpec.swift @@ -12,7 +12,7 @@ import Quick @testable import mas public class OutputListenerSpec: QuickSpec { - override public func spec() { + override public static func spec() { beforeSuite { Mas.initialize() }