Skip to content

Commit 3a300f4

Browse files
committed
Review feedback
1 parent 662a8d6 commit 3a300f4

File tree

4 files changed

+16
-19
lines changed

4 files changed

+16
-19
lines changed

ReleaseTooling/DEVELOP.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ for the process documentation.
4444

4545
### Launch Arguments
4646

47-
See `main.swift` for information on specific launch arguments.
47+
See `main.swift` for information on specific launch arguments.
4848

4949
You can pass in launch arguments with Xcode by selecting the "firebase-releaser" scheme
5050
beside the Run/Stop buttons, clicking "Edit Scheme" and adding them in the "Arguments Passed On Launch"

ReleaseTooling/Sources/ZipBuilder/FrameworkBuilder.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ struct FrameworkBuilder {
569569
return true
570570
}
571571

572-
/// Groups slices for each platform into a minimal set of frameworks
572+
/// Groups slices for each platform into a minimal set of frameworks.
573573
/// - Parameter withName: The framework name.
574574
/// - Parameter fromFolder: The almost complete framework folder. Includes Headers, Info.plist,
575575
/// and Resources.

ReleaseTooling/Sources/ZipBuilder/Platform.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,19 @@ enum Platform: CaseIterable {
4343
var minimumVersion: String {
4444
switch self {
4545
case .iOS: return PlatformMinimum.minimumIOSVersion
46-
case .macOS: return PlatformMinimum.minimumMACOSVersion
46+
case .macOS: return PlatformMinimum.minimumMacOSVersion
4747
case .tvOS: return PlatformMinimum.minimumTVOSVersion
4848
}
4949
}
5050
}
5151

5252
class PlatformMinimum {
5353
fileprivate static var minimumIOSVersion = ""
54-
fileprivate static var minimumMACOSVersion = ""
54+
fileprivate static var minimumMacOSVersion = ""
5555
fileprivate static var minimumTVOSVersion = ""
5656
static func initialize(ios: String, macos: String, tvos: String) {
5757
minimumIOSVersion = ios
58-
minimumMACOSVersion = macos
58+
minimumMacOSVersion = macos
5959
minimumTVOSVersion = tvos
6060
}
6161
}

ReleaseTooling/Sources/ZipBuilder/main.swift

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ struct ZipBuilderTool: ParsableCommand {
8080
var keepBuildArtifacts: Bool
8181

8282
/// Flag to skip building the Catalyst slices.
83-
@Flag(default: false,
83+
@Flag(default: true,
8484
inversion: .prefixedNo,
85-
help: ArgumentHelp("A flag to indicate keeping (not deleting) the build artifacts."))
86-
var skipCatalyst: Bool
85+
help: ArgumentHelp("A flag to indicate skip building the Catalyst slice."))
86+
var includeCatalyst: Bool
8787

8888
/// Flag to run `pod repo update` and `pod cache clean --all`.
8989
@Flag(default: true,
@@ -106,18 +106,15 @@ struct ZipBuilderTool: ParsableCommand {
106106
// MARK: - Platform Arguments
107107

108108
/// The minimum iOS Version to build for.
109-
@Option(default: "10.0",
110-
help: ArgumentHelp("The minimum supported iOS version."))
109+
@Option(default: "10.0", help: ArgumentHelp("The minimum supported iOS version."))
111110
var minimumIOSVersion: String
112111

113112
/// The minimum macOS Version to build for.
114-
@Option(default: "10.12",
115-
help: ArgumentHelp("The minimum supported macOS version."))
116-
var minimumMACOSVersion: String
113+
@Option(default: "10.12", help: ArgumentHelp("The minimum supported macOS version."))
114+
var minimumMacOSVersion: String
117115

118116
/// The minimum tvOS Version to build for.
119-
@Option(default: "10.0",
120-
help: ArgumentHelp("The minimum supported tvOS version."))
117+
@Option(default: "10.0", help: ArgumentHelp("The minimum supported tvOS version."))
121118
var minimumTVOSVersion: String
122119

123120
/// The list of platforms to build for.
@@ -235,11 +232,11 @@ struct ZipBuilderTool: ParsableCommand {
235232

236233
// Set the platform minimum versions.
237234
PlatformMinimum.initialize(ios: minimumIOSVersion,
238-
macos: minimumMACOSVersion,
235+
macos: minimumMacOSVersion,
239236
tvos: minimumTVOSVersion)
240237

241-
// Update iOS target platforms if `--skip-catalyst` was specified.
242-
if skipCatalyst {
238+
// Update iOS target platforms if `--include-catalyst` was specified.
239+
if !includeCatalyst {
243240
SkipCatalyst.set()
244241
}
245242

@@ -315,7 +312,7 @@ struct ZipBuilderTool: ParsableCommand {
315312
}
316313

317314
if !keepBuildArtifacts {
318-
let tempDir = FileManager.default.temporaryDirectory(withName: "random")
315+
let tempDir = FileManager.default.temporaryDirectory(withName: "placeholder")
319316
FileManager.default.removeIfExists(at: tempDir.deletingLastPathComponent())
320317
}
321318

0 commit comments

Comments
 (0)