mirror of
https://github.com/yonaskolb/XcodeGen.git
synced 2026-03-18 20:02:25 +00:00
Merge branch 'support-local-sp' into support-local-sp-with-packages
This commit is contained in:
@@ -235,6 +235,7 @@ public class SchemeGenerator {
|
||||
allowLocationSimulation: allowLocationSimulation,
|
||||
locationScenarioReference: locationScenarioReference,
|
||||
disableMainThreadChecker: scheme.run?.disableMainThreadChecker ?? Scheme.Run.disableMainThreadCheckerDefault,
|
||||
stopOnEveryMainThreadCheckerIssue: scheme.run?.stopOnEveryMainThreadCheckerIssue ?? Scheme.Run.stopOnEveryMainThreadCheckerIssueDefault,
|
||||
commandlineArguments: launchCommandLineArgs,
|
||||
environmentVariables: launchVariables,
|
||||
language: scheme.run?.language,
|
||||
@@ -302,6 +303,7 @@ extension Scheme {
|
||||
postActions: targetScheme.postActions,
|
||||
environmentVariables: targetScheme.environmentVariables,
|
||||
disableMainThreadChecker: targetScheme.disableMainThreadChecker,
|
||||
stopOnEveryMainThreadCheckerIssue: targetScheme.stopOnEveryMainThreadCheckerIssue,
|
||||
language: targetScheme.language,
|
||||
region: targetScheme.region
|
||||
),
|
||||
|
||||
@@ -63,7 +63,7 @@ class SourceGenerator {
|
||||
|
||||
let absolutePath = project.basePath + path.normalize()
|
||||
|
||||
// Get local pakcage's relative path from generating project's root
|
||||
// Get the local package's relative path from the project root
|
||||
let fileReferencePath = try? absolutePath.relativePath(from: projectDirectory ?? project.basePath).string
|
||||
|
||||
let fileReference = addObject(
|
||||
|
||||
Reference in New Issue
Block a user