mirror of
https://github.com/mas-cli/mas
synced 2024-11-22 03:23:08 +00:00
Downgrade Nimble & Quick to fix testing on newer Xcode versions.
Resolve #583 Signed-off-by: Ross Goldberg <484615+rgoldberg@users.noreply.github.com>
This commit is contained in:
parent
916718b415
commit
7cd8c1436b
27 changed files with 31 additions and 49 deletions
|
@ -23,8 +23,8 @@
|
||||||
"kind" : "remoteSourceControl",
|
"kind" : "remoteSourceControl",
|
||||||
"location" : "https://github.com/Quick/Nimble.git",
|
"location" : "https://github.com/Quick/Nimble.git",
|
||||||
"state" : {
|
"state" : {
|
||||||
"revision" : "6416749c3c0488664fff6b42f8bf3ea8dc282ca1",
|
"revision" : "1f3bde57bde12f5e7b07909848c071e9b73d6edc",
|
||||||
"version" : "13.6.0"
|
"version" : "10.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -41,8 +41,8 @@
|
||||||
"kind" : "remoteSourceControl",
|
"kind" : "remoteSourceControl",
|
||||||
"location" : "https://github.com/Quick/Quick.git",
|
"location" : "https://github.com/Quick/Quick.git",
|
||||||
"state" : {
|
"state" : {
|
||||||
"revision" : "1163a1b1b114a657c7432b63dd1f92ce99fe11a6",
|
"revision" : "f9d519828bb03dfc8125467d8f7b93131951124c",
|
||||||
"version" : "7.6.2"
|
"version" : "5.0.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -54,15 +54,6 @@
|
||||||
"version" : "2.1.1"
|
"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",
|
"identity" : "swift-argument-parser",
|
||||||
"kind" : "remoteSourceControl",
|
"kind" : "remoteSourceControl",
|
||||||
|
@ -72,15 +63,6 @@
|
||||||
"version" : "1.5.0"
|
"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",
|
"identity" : "version",
|
||||||
"kind" : "remoteSourceControl",
|
"kind" : "remoteSourceControl",
|
||||||
|
|
|
@ -17,8 +17,8 @@ let package = Package(
|
||||||
],
|
],
|
||||||
dependencies: [
|
dependencies: [
|
||||||
// Dependencies declare other packages that this package depends on.
|
// 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/Nimble.git", from: "10.0.0"),
|
||||||
.package(url: "https://github.com/Quick/Quick.git", from: "7.6.2"),
|
.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/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/PromiseKit.git", from: "6.22.1"),
|
||||||
.package(url: "https://github.com/mxcl/Version.git", from: "2.1.0"),
|
.package(url: "https://github.com/mxcl/Version.git", from: "2.1.0"),
|
||||||
|
|
|
@ -13,7 +13,7 @@ import Quick
|
||||||
|
|
||||||
// Deprecated test
|
// Deprecated test
|
||||||
public class AccountSpec: QuickSpec {
|
public class AccountSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
beforeSuite {
|
beforeSuite {
|
||||||
Mas.initialize()
|
Mas.initialize()
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class HomeSpec: QuickSpec {
|
public class HomeSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
let storeSearch = StoreSearchMock()
|
let storeSearch = StoreSearchMock()
|
||||||
let openCommand = OpenSystemCommandMock()
|
let openCommand = OpenSystemCommandMock()
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class InfoSpec: QuickSpec {
|
public class InfoSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
let storeSearch = StoreSearchMock()
|
let storeSearch = StoreSearchMock()
|
||||||
|
|
||||||
beforeSuite {
|
beforeSuite {
|
||||||
|
|
|
@ -12,7 +12,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class InstallSpec: QuickSpec {
|
public class InstallSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
beforeSuite {
|
beforeSuite {
|
||||||
Mas.initialize()
|
Mas.initialize()
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class ListSpec: QuickSpec {
|
public class ListSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
beforeSuite {
|
beforeSuite {
|
||||||
Mas.initialize()
|
Mas.initialize()
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class LuckySpec: QuickSpec {
|
public class LuckySpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
let networkSession = NetworkSessionMockFromFile(responseFile: "search/slack.json")
|
let networkSession = NetworkSessionMockFromFile(responseFile: "search/slack.json")
|
||||||
let storeSearch = MasStoreSearch(networkManager: NetworkManager(session: networkSession))
|
let storeSearch = MasStoreSearch(networkManager: NetworkManager(session: networkSession))
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class OpenSpec: QuickSpec {
|
public class OpenSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
let storeSearch = StoreSearchMock()
|
let storeSearch = StoreSearchMock()
|
||||||
let openCommand = OpenSystemCommandMock()
|
let openCommand = OpenSystemCommandMock()
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class OutdatedSpec: QuickSpec {
|
public class OutdatedSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
beforeSuite {
|
beforeSuite {
|
||||||
Mas.initialize()
|
Mas.initialize()
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class PurchaseSpec: QuickSpec {
|
public class PurchaseSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
beforeSuite {
|
beforeSuite {
|
||||||
Mas.initialize()
|
Mas.initialize()
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class ResetSpec: QuickSpec {
|
public class ResetSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
beforeSuite {
|
beforeSuite {
|
||||||
Mas.initialize()
|
Mas.initialize()
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class SearchSpec: QuickSpec {
|
public class SearchSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
let storeSearch = StoreSearchMock()
|
let storeSearch = StoreSearchMock()
|
||||||
|
|
||||||
beforeSuite {
|
beforeSuite {
|
||||||
|
|
|
@ -13,7 +13,7 @@ import Quick
|
||||||
|
|
||||||
// Deprecated test
|
// Deprecated test
|
||||||
public class SignInSpec: QuickSpec {
|
public class SignInSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
beforeSuite {
|
beforeSuite {
|
||||||
Mas.initialize()
|
Mas.initialize()
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class SignOutSpec: QuickSpec {
|
public class SignOutSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
beforeSuite {
|
beforeSuite {
|
||||||
Mas.initialize()
|
Mas.initialize()
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class UninstallSpec: QuickSpec {
|
public class UninstallSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
beforeSuite {
|
beforeSuite {
|
||||||
Mas.initialize()
|
Mas.initialize()
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class UpgradeSpec: QuickSpec {
|
public class UpgradeSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
beforeSuite {
|
beforeSuite {
|
||||||
Mas.initialize()
|
Mas.initialize()
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class VendorSpec: QuickSpec {
|
public class VendorSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
let storeSearch = StoreSearchMock()
|
let storeSearch = StoreSearchMock()
|
||||||
let openCommand = OpenSystemCommandMock()
|
let openCommand = OpenSystemCommandMock()
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class VersionSpec: QuickSpec {
|
public class VersionSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
beforeSuite {
|
beforeSuite {
|
||||||
Mas.initialize()
|
Mas.initialize()
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class MasAppLibrarySpec: QuickSpec {
|
public class MasAppLibrarySpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
let library = MasAppLibrary(softwareMap: SoftwareMapMock(products: apps))
|
let library = MasAppLibrary(softwareMap: SoftwareMapMock(products: apps))
|
||||||
|
|
||||||
beforeSuite {
|
beforeSuite {
|
||||||
|
|
|
@ -12,7 +12,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class MasStoreSearchSpec: QuickSpec {
|
public class MasStoreSearchSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
beforeSuite {
|
beforeSuite {
|
||||||
Mas.initialize()
|
Mas.initialize()
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class OpenSystemCommandSpec: QuickSpec {
|
public class OpenSystemCommandSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
beforeSuite {
|
beforeSuite {
|
||||||
Mas.initialize()
|
Mas.initialize()
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class AppListsFormatterSpec: QuickSpec {
|
public class AppListsFormatterSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
// static func reference
|
// static func reference
|
||||||
let format = AppListFormatter.format(products:)
|
let format = AppListFormatter.format(products:)
|
||||||
var products: [SoftwareProduct] = []
|
var products: [SoftwareProduct] = []
|
||||||
|
|
|
@ -12,7 +12,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class SearchResultsFormatterSpec: QuickSpec {
|
public class SearchResultsFormatterSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
// static func reference
|
// static func reference
|
||||||
let format = SearchResultFormatter.format(results:includePrice:)
|
let format = SearchResultFormatter.format(results:includePrice:)
|
||||||
var results: [SearchResult] = []
|
var results: [SearchResult] = []
|
||||||
|
|
|
@ -13,7 +13,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class SearchResultListSpec: QuickSpec {
|
public class SearchResultListSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
beforeSuite {
|
beforeSuite {
|
||||||
Mas.initialize()
|
Mas.initialize()
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class SearchResultSpec: QuickSpec {
|
public class SearchResultSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
beforeSuite {
|
beforeSuite {
|
||||||
Mas.initialize()
|
Mas.initialize()
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ import Quick
|
||||||
@testable import mas
|
@testable import mas
|
||||||
|
|
||||||
public class SoftwareProductSpec: QuickSpec {
|
public class SoftwareProductSpec: QuickSpec {
|
||||||
override public static func spec() {
|
override public func spec() {
|
||||||
beforeSuite {
|
beforeSuite {
|
||||||
Mas.initialize()
|
Mas.initialize()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue