From c190fba8bc0a14828552ed4b6e43b8141dcacaed Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Mon, 23 Sep 2019 09:41:31 +0200 Subject: [PATCH] Use .valueArray when possible, removed redundant Array() --- Sources/XcodeGenKit/PBXProjGenerator.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/XcodeGenKit/PBXProjGenerator.swift b/Sources/XcodeGenKit/PBXProjGenerator.swift index 4af316cb..70512fe8 100644 --- a/Sources/XcodeGenKit/PBXProjGenerator.swift +++ b/Sources/XcodeGenKit/PBXProjGenerator.swift @@ -209,7 +209,7 @@ public class PBXProjGenerator { let knownRegions = sourceGenerator.knownRegions.sorted() pbxProject.knownRegions = knownRegions.isEmpty ? ["en"] : knownRegions - let allTargets: [PBXTarget] = Array(targetObjects.values) + Array(targetAggregateObjects.values) + let allTargets: [PBXTarget] = targetObjects.valueArray + targetAggregateObjects.valueArray pbxProject.targets = allTargets .sorted { $0.name < $1.name } pbxProject.attributes = projectAttributes @@ -885,9 +885,9 @@ public class PBXProjGenerator { let configFrameworkBuildPaths: [String] if !carthageDependencies.isEmpty { let carthagePlatformBuildPath = "$(PROJECT_DIR)/" + carthageResolver.buildPath(for: target.platform) - configFrameworkBuildPaths = [carthagePlatformBuildPath] + Array(frameworkBuildPaths).sorted() + configFrameworkBuildPaths = [carthagePlatformBuildPath] + frameworkBuildPaths.sorted() } else { - configFrameworkBuildPaths = Array(frameworkBuildPaths).sorted() + configFrameworkBuildPaths = frameworkBuildPaths.sorted() } // set framework search paths