rename includeCarthageRelatedDependencies to findCarthageFrameworks and includeRelated to findFrameworks

This commit is contained in:
yonaskolb
2019-03-24 22:31:47 +11:00
parent 5accd0e095
commit bcbc83dd75
12 changed files with 43 additions and 43 deletions
@@ -53,9 +53,9 @@ public class CarthageDependencyResolver {
let nonExistentDependencies = target.dependencies.filter { !frameworks.contains($0) }
for dependency in nonExistentDependencies {
switch dependency.type {
case .carthage(let includeRelated):
let includeRelated = includeRelated ?? project.options.includeCarthageRelatedDependencies
if includeRelated {
case .carthage(let findFrameworks):
let findFrameworks = findFrameworks ?? project.options.findCarthageFrameworks
if findFrameworks {
relatedDependencies(for: dependency, in: target.platform)
.filter { !frameworks.contains($0) }
.forEach { frameworks.insert($0) }
+3 -3
View File
@@ -576,9 +576,9 @@ public class PBXProjGenerator {
)
targetFrameworkBuildFiles.append(buildFile)
case .carthage(let includeRelated):
let includeRelated = includeRelated ?? project.options.includeCarthageRelatedDependencies
let allDependencies = includeRelated
case .carthage(let findFrameworks):
let findFrameworks = findFrameworks ?? project.options.findCarthageFrameworks
let allDependencies = findFrameworks
? carthageResolver.relatedDependencies(for: dependency, in: target.platform) : [dependency]
allDependencies.forEach { dependency in
// Static libraries can't link or embed dynamic frameworks