Skip to content

Less Array() and more valueArray #661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yonaskolb merged 10 commits into from
Sep 23, 2019
Merged

Less Array() and more valueArray #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d2e5dbc
Removed redundant Array(Set())
RomanPodymov Sep 23, 2019
7e1e6f0
Removed redundant Array()
RomanPodymov Sep 23, 2019
e095fba
Reverted Set()
RomanPodymov Sep 23, 2019
c190fba
Use .valueArray when possible, removed redundant Array()
RomanPodymov Sep 23, 2019
a275d66
swiftlint autocorrect
RomanPodymov Sep 23, 2019
0f628f3
Merge pull request #1 from yonaskolb/master
RomanPodymov Sep 23, 2019
33bea80
Notes for #661
RomanPodymov Sep 23, 2019
5eb870d
Update CHANGELOG.md
RomanPodymov Sep 23, 2019
c6276f9
Created 2.7.0 Internal section
RomanPodymov Sep 23, 2019
c370105
Add Internal section to the next release
RomanPodymov Sep 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
- Expand template variable in Array of Any [#651](https://github.com/yonaskolb/XcodeGen/pull/651) @kateinoigakukun
- Significantly improve performance when running with a large number files. [#658](https://github.com/yonaskolb/XcodeGen/pull/658) @kateinoigakukun

#### Internal
- Removed needless `Array` initialization. [#661](https://github.com/yonaskolb/XcodeGen/pull/661) @RomanPodymov

## 2.7.0

#### Added
Expand Down
2 changes: 1 addition & 1 deletion Sources/XcodeGenKit/CacheFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class CacheFile {

guard #available(OSX 10.13, *) else { return nil }

let files = Array(Set(project.allFiles))
let files = Set(project.allFiles)
.map { ((try? $0.relativePath(from: project.basePath)) ?? $0).string }
.sorted { $0.localizedStandardCompare($1) == .orderedAscending }
.joined(separator: "\n")
Expand Down
2 changes: 1 addition & 1 deletion Sources/XcodeGenKit/CarthageVersionLoader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ struct CarthageVersionFile: Decodable {
let container = try decoder.container(keyedBy: Platform.self)
data = try Platform.allCases.reduce(into: [:]) { data, platform in
let references = try container.decodeIfPresent([Reference].self, forKey: platform) ?? []
let frameworks = Array(Set(references.map { $0.name })).sorted()
let frameworks = Set(references.map { $0.name }).sorted()
data[platform] = frameworks
}
}
Expand Down
6 changes: 3 additions & 3 deletions Sources/XcodeGenKit/PBXProjGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -879,9 +879,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
Expand Down