Skip to content
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

ZipBuilder Spelling Fix #6964

Merged
merged 1 commit into from
Nov 12, 2020
Merged

ZipBuilder Spelling Fix #6964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ReleaseTooling/Sources/ZipBuilder/ZipBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ struct ZipBuilder {
func buildAndAssembleZip(podsToInstall: [CocoaPodUtils.VersionedPod],
inProjectDir projectDir: URL,
minimumIOSVersion: String,
includeDependences: Bool,
includeDependencies: Bool,
includeCarthage: Bool = false) ->
([String: CocoaPodUtils.PodInfo], [String: [URL]], [String: [URL]]?) {
// Remove CocoaPods cache so the build gets updates after a version is rebuilt during the
Expand Down Expand Up @@ -198,7 +198,7 @@ struct ZipBuilder {
paths: paths).build()
}

let podsToBuild = includeDependences ? installedPods : installedPods.filter {
let podsToBuild = includeDependencies ? installedPods : installedPods.filter {
podsToInstall.map { $0.name.components(separatedBy: "/").first }.contains($0.key)
}

Expand Down Expand Up @@ -245,7 +245,7 @@ struct ZipBuilder {
inProjectDir: projectDir,
minimumIOSVersion: minimumIOSVersion,
// Always include dependencies for Firebase zips.
includeDependences: true,
includeDependencies: true,
includeCarthage: includeCarthage)

// We need the Firebase pod to get the version for Carthage and to copy the `Firebase.h` and
Expand Down
6 changes: 3 additions & 3 deletions ReleaseTooling/Sources/ZipBuilder/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct ZipBuilderTool: ParsableCommand {
@Flag(default: true,
inversion: .prefixedEnableDisable,
help: ArgumentHelp("Whether or not to build dependencies of requested pods."))
var buildDependences
var buildDependencies

/// Flag to also build Carthage artifacts.
@Flag(default: false,
Expand Down Expand Up @@ -175,7 +175,7 @@ struct ZipBuilderTool: ParsableCommand {
}

// Validate that Firebase builds are including dependencies.
if !buildDependences, zipPods == nil {
if !buildDependencies, zipPods == nil {
throw ValidationError("""
The `enable-build-dependencies` option cannot be false unless a list of pods is \
specified with the `zip-pods` option.
Expand Down Expand Up @@ -236,7 +236,7 @@ struct ZipBuilderTool: ParsableCommand {
let (installedPods, frameworks, _) = builder.buildAndAssembleZip(podsToInstall: zipPods,
inProjectDir: projectDir,
minimumIOSVersion: minimumIOSVersion,
includeDependences: buildDependences)
includeDependencies: buildDependencies)
let staging = FileManager.default.temporaryDirectory(withName: "staging")
try builder.copyFrameworks(fromPods: Array(installedPods.keys), toDirectory: staging,
frameworkLocations: frameworks)
Expand Down