GitHub/XcodeGen
1
0
Fork 0
mirror of https://github.com/yonaskolb/XcodeGen.git synced 2026-03-18 20:02:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove Spec.configVariants and move to Target.generateSchemes

Browse Source
This commit is contained in:
Yonas Kolb
2017-07-26 19:58:34 +02:00
parent 0426e1bee0
commit 4e35dc6b02
4 changed files with 58 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/XcodeGenKit/Spec/Spec.swift
+2 -5
View File
@@ -19,13 +19,11 @@ public struct Spec {
public var settingGroups: [BuildSettingGroup]
public var configs: [Config]
public var schemes: [Scheme]
public var configVariants: [String]
public init(name: String, targets: [Target] = [], configs: [Config] = [], configVariants: [String] = [], settingGroups: [BuildSettingGroup] = [], schemes: [Scheme] = []) {
public init(name: String, configs: [Config] = [], targets: [Target] = [], settingGroups: [BuildSettingGroup] = [], schemes: [Scheme] = []) {
self.name = name
self.targets = targets
self.configs = configs
self.configVariants = configVariants
self.settingGroups = settingGroups
self.schemes = schemes
}
@@ -63,6 +61,5 @@ extension Spec {
targets = try jsonDictionary.json(atKeyPath: "targets", invalidItemBehaviour: .fail)
}
schemes = try jsonDictionary.json(atKeyPath: "schemes")
configVariants = jsonDictionary.json(atKeyPath: "configVariants") ?? []
}
}
Sources/XcodeGenKit/Spec/Target.swift
+4 -4
View File
@@ -21,7 +21,7 @@ public struct Target {
public var prebuildScripts: [String]
public var postbuildScripts: [String]
public var configs: [String: String]
public var generateSchemes: Bool
public var generateSchemes: [String]
public var filename: String {
var name = self.name
@@ -31,7 +31,7 @@ public struct Target {
return name
}
public init(name: String, type: PBXProductType, platform: Platform, buildSettings: TargetBuildSettings?, configs: [String: String] = [:], sources: [String] = [], sourceExludes: [String] = [], dependencies: [Dependency] = [], prebuildScripts: [String] = [], postbuildScripts: [String] = [], generateSchemes: Bool = false) {
public init(name: String, type: PBXProductType, platform: Platform, buildSettings: TargetBuildSettings?, configs: [String: String] = [:], sources: [String] = [], sourceExludes: [String] = [], dependencies: [Dependency] = [], prebuildScripts: [String] = [], postbuildScripts: [String] = [], generateSchemes: [String] = []) {
self.name = name
self.type = type
self.platform = platform
@@ -42,7 +42,7 @@ public struct Target {
self.dependencies = dependencies
self.prebuildScripts = prebuildScripts
self.postbuildScripts = postbuildScripts
self.generateSchemes = false
self.generateSchemes = generateSchemes
}
}
@@ -77,7 +77,7 @@ extension Target: JSONObjectConvertible {
}
prebuildScripts = jsonDictionary.json(atKeyPath: "prebuildScripts") ?? []
postbuildScripts = jsonDictionary.json(atKeyPath: "postbuildScripts") ?? []
generateSchemes = jsonDictionary.json(atKeyPath: "generateSchemes") ?? false
generateSchemes = jsonDictionary.json(atKeyPath: "generateSchemes") ?? []
}
}