add support for localPackages

This commit is contained in:
yonaskolb
2019-09-27 21:36:07 +10:00
parent 41453595cc
commit e9193cfb29
12 changed files with 138 additions and 3 deletions
@@ -96,6 +96,7 @@ class ProjectSpecTests: XCTestCase {
project.settings = invalidSettings
project.configFiles = ["invalidConfig": "invalidConfigFile"]
project.fileGroups = ["invalidFileGroup"]
project.localPackages = ["invalidLocalPackage"]
project.settingGroups = ["settingGroup1": Settings(
configSettings: ["invalidSettingGroupConfig": [:]],
groups: ["invalidSettingGroupSettingGroup"]
@@ -106,6 +107,7 @@ class ProjectSpecTests: XCTestCase {
try expectValidationError(project, .invalidConfigFile(configFile: "invalidConfigFile", config: "invalidConfig"))
try expectValidationError(project, .invalidSettingsGroup("invalidSettingGroup"))
try expectValidationError(project, .invalidFileGroup("invalidFileGroup"))
try expectValidationError(project, .invalidLocalPackage("invalidLocalPackage"))
try expectValidationError(project, .invalidSettingsGroup("invalidSettingGroupSettingGroup"))
try expectValidationError(project, .invalidBuildSettingConfig("invalidSettingGroupConfig"))
}
@@ -467,6 +469,7 @@ class ProjectSpecTests: XCTestCase {
url: "https://github.com/jpsim/Yams",
versionRequirement: .upToNextMajorVersion("2.0.0"))
],
localPackages: ["../../Package"],
options: SpecOptions(minimumXcodeGenVersion: Version(major: 3, minor: 4, patch: 5),
carthageBuildPath: "carthageBuildPath",
carthageExecutablePath: "carthageExecutablePath",
@@ -969,7 +969,8 @@ class SpecLoadingTests: XCTestCase {
"package4": SwiftPackage(url: "package.git", versionRequirement: .branch("master")),
"package5": SwiftPackage(url: "package.git", versionRequirement: .revision("x")),
"package6": SwiftPackage(url: "package.git", versionRequirement: .range(from: "1.2.0", to: "1.2.5")),
])
],
localPackages: ["../../Package"])
let dictionary: [String: Any] = [
"name": "spm",
@@ -980,7 +981,9 @@ class SpecLoadingTests: XCTestCase {
"package4": ["url": "package.git", "branch": "master"],
"package5": ["url": "package.git", "revision": "x"],
"package6": ["url": "package.git", "minVersion": "1.2.0", "maxVersion": "1.2.5"],
]]
],
"localPackages": ["../../Package"]
]
let parsedSpec = try getProjectSpec(dictionary)
try expect(parsedSpec) == project
}