format code

This commit is contained in:
Yonas Kolb
2017-09-26 14:22:15 +02:00
parent fae35d6d67
commit 8a7bfa12fc
5 changed files with 10 additions and 12 deletions
+1 -2
View File
@@ -31,7 +31,6 @@ public struct ProjectSpec {
public var bundleIdPrefix: String?
public init() {
}
}
@@ -98,7 +97,7 @@ extension ProjectSpec.Options: Equatable {
public static func ==(lhs: ProjectSpec.Options, rhs: ProjectSpec.Options) -> Bool {
return lhs.carthageBuildPath == rhs.carthageBuildPath &&
lhs.bundleIdPrefix == rhs.bundleIdPrefix
lhs.bundleIdPrefix == rhs.bundleIdPrefix
}
}
+1 -1
View File
@@ -14,7 +14,7 @@ public enum SettingsPresetFile {
case config(ConfigType)
case platform(Platform)
case product(PBXProductType)
case productPlatform(PBXProductType,Platform)
case productPlatform(PBXProductType, Platform)
case base
var path: String {
+6 -7
View File
@@ -16,7 +16,7 @@ public struct SpecLoader {
public static func loadSpec(path: Path) throws -> ProjectSpec {
let dictionary = try loadDictionary(path: path)
let filteredDictionary = SpecLoader.filterNull(dictionary) as! [String:Any]
let filteredDictionary = SpecLoader.filterNull(dictionary) as! [String: Any]
return try ProjectSpec(jsonDictionary: filteredDictionary)
}
@@ -66,16 +66,15 @@ public struct SpecLoader {
return merged
}
private static func filterNull(_ object:Any) -> Any {
var returnedValue : Any = object
if let dict = object as? [String:Any] {
var mutabledic : [String: Any] = [:]
private static func filterNull(_ object: Any) -> Any {
var returnedValue: Any = object
if let dict = object as? [String: Any] {
var mutabledic: [String: Any] = [:]
for (key, value) in dict {
mutabledic[key] = SpecLoader.filterNull(value)
}
returnedValue = mutabledic
}
else if let array = object as? [Any] {
} else if let array = object as? [Any] {
var mutableArray: [Any] = array
for (index, value) in array.enumerated() {
mutableArray[index] = SpecLoader.filterNull(value)
@@ -37,7 +37,7 @@ func projectGeneratorTests() {
let buildConfigs = project.pbxproj.configurationLists.getReference(target.buildConfigurationList),
let buildConfigReference = buildConfigs.buildConfigurations.first,
let buildConfig = project.pbxproj.buildConfigurations.getReference(buildConfigReference) else {
throw failure("Build Config not found")
throw failure("Build Config not found")
}
try expect(buildConfig.buildSettings["PRODUCT_BUNDLE_IDENTIFIER"] as? String) == "com.test.MyFramework"
}
@@ -85,7 +85,7 @@ func projectGeneratorTests() {
var expectedTargetDebugSettings = BuildSettings()
expectedTargetDebugSettings += SettingsPresetFile.platform(.iOS).getBuildSettings()
expectedTargetDebugSettings += SettingsPresetFile.product(.application).getBuildSettings()
expectedTargetDebugSettings += SettingsPresetFile.productPlatform(.application,.iOS).getBuildSettings()
expectedTargetDebugSettings += SettingsPresetFile.productPlatform(.application, .iOS).getBuildSettings()
expectedTargetDebugSettings += ["SETTING 2": "value 2", "SETTING 3": "value 3", "SETTING": "value"]
try expect(targetDebugSettings.equals(expectedTargetDebugSettings)).beTrue()
View File