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

Use a single source of truth for scheme defaults

Browse Source 
Instead of duplicating defaults in `TargetScheme`, use optional values there and default in `SchemeGenerator`.
This commit is contained in:
Brentley Jones
2020-04-13 13:55:51 -05:00
parent d27e8cca9d
commit 1b07c8ce64
2 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/XcodeGenKit/SchemeGenerator.swift
+5 -5
View File
@@ -314,7 +314,7 @@ extension Scheme {
name: name,
build: .init(
targets: Scheme.buildTargets(for: target, project: project),
buildImplicitDependencies: targetScheme.buildImplicitDependencies,
buildImplicitDependencies: targetScheme.buildImplicitDependencies ?? Build.buildImplicitDependenciesDefault,
preActions: targetScheme.preActions,
postActions: targetScheme.postActions
),
@@ -322,15 +322,15 @@ extension Scheme {
config: debugConfig,
commandLineArguments: targetScheme.commandLineArguments,
environmentVariables: targetScheme.environmentVariables,
disableMainThreadChecker: targetScheme.disableMainThreadChecker,
stopOnEveryMainThreadCheckerIssue: targetScheme.stopOnEveryMainThreadCheckerIssue,
disableMainThreadChecker: targetScheme.disableMainThreadChecker ?? Run.disableMainThreadCheckerDefault,
stopOnEveryMainThreadCheckerIssue: targetScheme.stopOnEveryMainThreadCheckerIssue ?? Run.stopOnEveryMainThreadCheckerIssueDefault,
language: targetScheme.language,
region: targetScheme.region
),
test: .init(
config: debugConfig,
gatherCoverageData: targetScheme.gatherCoverageData,
disableMainThreadChecker: targetScheme.disableMainThreadChecker,
gatherCoverageData: targetScheme.gatherCoverageData ?? Test.gatherCoverageDataDefault,
disableMainThreadChecker: targetScheme.disableMainThreadChecker ?? Test.disableMainThreadCheckerDefault,
commandLineArguments: targetScheme.commandLineArguments,
targets: targetScheme.testTargets,
environmentVariables: targetScheme.environmentVariables,