From 0bc2f3415efa79caca407c83dcdf049cd741e858 Mon Sep 17 00:00:00 2001 From: Yonas Kolb Date: Tue, 26 Dec 2017 22:46:36 +0800 Subject: [PATCH] minor --- Sources/ProjectSpec/SpecValidation.swift | 4 ++-- Sources/ProjectSpec/SpecValidationError.swift | 4 ++-- Sources/ProjectSpec/Yaml.swift | 2 +- Tests/XcodeGenKitTests/ProjectSpecTests.swift | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Sources/ProjectSpec/SpecValidation.swift b/Sources/ProjectSpec/SpecValidation.swift index 00cd3880..ab8411b7 100644 --- a/Sources/ProjectSpec/SpecValidation.swift +++ b/Sources/ProjectSpec/SpecValidation.swift @@ -89,10 +89,10 @@ extension ProjectSpec { if scheme.configVariants.isEmpty { if !configs.contains(where: { $0.type == .debug }) { - errors.append(.missingConfigTypeForGeneratedTargetScheme(target: target.name, configType: .debug)) + errors.append(.missingConfigForTargetScheme(target: target.name, configType: .debug)) } if !configs.contains(where: { $0.type == .release }) { - errors.append(.missingConfigTypeForGeneratedTargetScheme(target: target.name, configType: .release)) + errors.append(.missingConfigForTargetScheme(target: target.name, configType: .release)) } } diff --git a/Sources/ProjectSpec/SpecValidationError.swift b/Sources/ProjectSpec/SpecValidationError.swift index ee06a667..117c8644 100644 --- a/Sources/ProjectSpec/SpecValidationError.swift +++ b/Sources/ProjectSpec/SpecValidationError.swift @@ -18,7 +18,7 @@ public struct SpecValidationError: Error, CustomStringConvertible { case invalidBuildScriptPath(target: String, name: String?, path: String) case invalidFileGroup(String) case invalidConfigFileConfig(String) - case missingConfigTypeForGeneratedTargetScheme(target: String, configType: ConfigType) + case missingConfigForTargetScheme(target: String, configType: ConfigType) public var description: String { switch self { @@ -48,7 +48,7 @@ public struct SpecValidationError: Error, CustomStringConvertible { return "Invalid file group \(group.quoted)" case let .invalidConfigFileConfig(config): return "Config file has invalid config \(config.quoted)" - case let .missingConfigTypeForGeneratedTargetScheme(target, configType): + case let .missingConfigForTargetScheme(target, configType): return "Target \(target.quoted) is missing a config of type \(configType.rawValue) to generate its scheme" } } diff --git a/Sources/ProjectSpec/Yaml.swift b/Sources/ProjectSpec/Yaml.swift index 1e28241c..af47471c 100644 --- a/Sources/ProjectSpec/Yaml.swift +++ b/Sources/ProjectSpec/Yaml.swift @@ -10,7 +10,7 @@ public func loadYamlDictionary(path: Path) throws -> [String: Any] { guard let yaml = try Yams.load(yaml: string) else { return [:] } - return filterNull(yaml) as! [String: Any] + return filterNull(yaml) as? [String: Any] ?? [:] } fileprivate func filterNull(_ object: Any) -> Any { diff --git a/Tests/XcodeGenKitTests/ProjectSpecTests.swift b/Tests/XcodeGenKitTests/ProjectSpecTests.swift index a98bfabb..fc02ce9e 100644 --- a/Tests/XcodeGenKitTests/ProjectSpecTests.swift +++ b/Tests/XcodeGenKitTests/ProjectSpecTests.swift @@ -125,8 +125,8 @@ func projectSpecTests() { try expectValidationError(spec, .invalidBuildScriptPath(target: "target1", name: "prebuildScript1", path: "invalidPrebuildScript")) try expectValidationError(spec, .invalidBuildScriptPath(target: "target1", name: nil, path: "invalidPostbuildScript")) - try expectValidationError(spec, .missingConfigTypeForGeneratedTargetScheme(target: "target1", configType: .debug)) - try expectValidationError(spec, .missingConfigTypeForGeneratedTargetScheme(target: "target1", configType: .release)) + try expectValidationError(spec, .missingConfigForTargetScheme(target: "target1", configType: .debug)) + try expectValidationError(spec, .missingConfigForTargetScheme(target: "target1", configType: .release)) spec.targets[0].scheme?.configVariants = ["invalidVariant"] try expectValidationError(spec, .invalidTargetSchemeConfigVariant(target: "target1", configVariant: "invalidVariant", configType: .debug))