diff --git a/Package.resolved b/Package.resolved index dfcbb2b..80d3efe 100644 --- a/Package.resolved +++ b/Package.resolved @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Quick/Nimble.git", "state" : { - "revision" : "6416749c3c0488664fff6b42f8bf3ea8dc282ca1", - "version" : "13.6.0" + "revision" : "1f3bde57bde12f5e7b07909848c071e9b73d6edc", + "version" : "10.0.0" } }, { @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Quick/Quick.git", "state" : { - "revision" : "1163a1b1b114a657c7432b63dd1f92ce99fe11a6", - "version" : "7.6.2" + "revision" : "f9d519828bb03dfc8125467d8f7b93131951124c", + "version" : "5.0.1" } }, { @@ -54,15 +54,6 @@ "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", @@ -72,15 +63,6 @@ "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 021e71f..4e48ff7 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: "13.6.0"), - .package(url: "https://github.com/Quick/Quick.git", from: "7.6.2"), + .package(url: "https://github.com/Quick/Nimble.git", from: "10.0.0"), + .package(url: "https://github.com/Quick/Quick.git", from: "5.0.1"), .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 23dd488..4cfb4da 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 static func spec() { + override public func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/HomeSpec.swift b/Tests/masTests/Commands/HomeSpec.swift index 3e33524..097855e 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 static func spec() { + override public func spec() { let storeSearch = StoreSearchMock() let openCommand = OpenSystemCommandMock() diff --git a/Tests/masTests/Commands/InfoSpec.swift b/Tests/masTests/Commands/InfoSpec.swift index 35ac88a..7271451 100644 --- a/Tests/masTests/Commands/InfoSpec.swift +++ b/Tests/masTests/Commands/InfoSpec.swift @@ -13,7 +13,7 @@ import Quick @testable import mas public class InfoSpec: QuickSpec { - override public static func spec() { + override public func spec() { let storeSearch = StoreSearchMock() beforeSuite { diff --git a/Tests/masTests/Commands/InstallSpec.swift b/Tests/masTests/Commands/InstallSpec.swift index 8580fe0..4baeead 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 static func spec() { + override public func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/ListSpec.swift b/Tests/masTests/Commands/ListSpec.swift index 811ed7f..7388e80 100644 --- a/Tests/masTests/Commands/ListSpec.swift +++ b/Tests/masTests/Commands/ListSpec.swift @@ -13,7 +13,7 @@ import Quick @testable import mas public class ListSpec: QuickSpec { - override public static func spec() { + override public func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/LuckySpec.swift b/Tests/masTests/Commands/LuckySpec.swift index 5a7adb0..4e373c2 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 static func spec() { + override public 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 610d91c..13693fb 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 static func spec() { + override public func spec() { let storeSearch = StoreSearchMock() let openCommand = OpenSystemCommandMock() diff --git a/Tests/masTests/Commands/OutdatedSpec.swift b/Tests/masTests/Commands/OutdatedSpec.swift index f1890de..d47b067 100644 --- a/Tests/masTests/Commands/OutdatedSpec.swift +++ b/Tests/masTests/Commands/OutdatedSpec.swift @@ -13,7 +13,7 @@ import Quick @testable import mas public class OutdatedSpec: QuickSpec { - override public static func spec() { + override public func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/PurchaseSpec.swift b/Tests/masTests/Commands/PurchaseSpec.swift index e186f55..51f84f5 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 static func spec() { + override public func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/ResetSpec.swift b/Tests/masTests/Commands/ResetSpec.swift index 411c101..ca39e2b 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 static func spec() { + override public func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/SearchSpec.swift b/Tests/masTests/Commands/SearchSpec.swift index 6a1faa7..2496ad0 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 static func spec() { + override public func spec() { let storeSearch = StoreSearchMock() beforeSuite { diff --git a/Tests/masTests/Commands/SignInSpec.swift b/Tests/masTests/Commands/SignInSpec.swift index 20c0f96..799d093 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 static func spec() { + override public func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/SignOutSpec.swift b/Tests/masTests/Commands/SignOutSpec.swift index 3424ef2..a5b5466 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 static func spec() { + override public func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/UninstallSpec.swift b/Tests/masTests/Commands/UninstallSpec.swift index d650044..13613b8 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 static func spec() { + override public func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/UpgradeSpec.swift b/Tests/masTests/Commands/UpgradeSpec.swift index e5a8406..5c104bb 100644 --- a/Tests/masTests/Commands/UpgradeSpec.swift +++ b/Tests/masTests/Commands/UpgradeSpec.swift @@ -13,7 +13,7 @@ import Quick @testable import mas public class UpgradeSpec: QuickSpec { - override public static func spec() { + override public func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Commands/VendorSpec.swift b/Tests/masTests/Commands/VendorSpec.swift index ac7bc84..624f3a3 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 static func spec() { + override public func spec() { let storeSearch = StoreSearchMock() let openCommand = OpenSystemCommandMock() diff --git a/Tests/masTests/Commands/VersionSpec.swift b/Tests/masTests/Commands/VersionSpec.swift index ec08193..ced12bc 100644 --- a/Tests/masTests/Commands/VersionSpec.swift +++ b/Tests/masTests/Commands/VersionSpec.swift @@ -13,7 +13,7 @@ import Quick @testable import mas public class VersionSpec: QuickSpec { - override public static func spec() { + override public func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Controllers/MasAppLibrarySpec.swift b/Tests/masTests/Controllers/MasAppLibrarySpec.swift index 4580b0f..fbb85fb 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 static func spec() { + override public 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 9a3b7ff..b6ce5df 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 static func spec() { + override public func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/ExternalCommands/OpenSystemCommandSpec.swift b/Tests/masTests/ExternalCommands/OpenSystemCommandSpec.swift index db3e484..a9a5f0e 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 static func spec() { + override public func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Formatters/AppListFormatterSpec.swift b/Tests/masTests/Formatters/AppListFormatterSpec.swift index a9e23ab..98ed50f 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 static func spec() { + override public 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 29ee188..f92731d 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 static func spec() { + override public 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 86b2575..2804491 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 static func spec() { + override public func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Models/SearchResultSpec.swift b/Tests/masTests/Models/SearchResultSpec.swift index 7330da8..460e961 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 static func spec() { + override public func spec() { beforeSuite { Mas.initialize() } diff --git a/Tests/masTests/Models/SoftwareProductSpec.swift b/Tests/masTests/Models/SoftwareProductSpec.swift index a223ef3..80cbde3 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 static func spec() { + override public func spec() { beforeSuite { Mas.initialize() }