Use global code coverage flag in swift package generate-xcodeproj (#2919)

* Use global code coverage flag in `swift package generate-xcodeproj`

There's a conflict between '--enable-code-coverage' in the top-level
options and the same flag in the Xcode-project generation command.
This uses the top-level flag (which is required for the build
parameters, even though it's only ever used by `swift test`) for
both purposes.

* Update swift-argument-parser dependency

Author: natecook1000

Package.swift

@@ -263,7 +263,12 @@ if ProcessInfo.processInfo.environment["SWIFTPM_LLBUILD_FWK"] == nil {
 if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
     package.dependencies += [
         .package(url: "https://github.com/apple/swift-tools-support-core.git", .branch("master")),
-        .package(url: "https://github.com/apple/swift-argument-parser.git", .exact("0.3.0")),
+        // The 'swift-argument-parser' version declared here must match that
+        // used by 'swift-driver' and 'sourcekit-lsp'. Please coordinate
+        // dependency version changes here with those projects.
+        .package(
+            url: "https://github.com/apple/swift-argument-parser.git",
+            .upToNextMinor(from: "0.3.1")),
         .package(url: "https://github.com/apple/swift-driver.git", .branch("master")),
     ]
 } else {

Sources/Commands/Options.swift

@@ -189,7 +189,9 @@ public struct SwiftToolOptions: ParsableArguments {
     }
 
     /// Whether to enable code coverage.
-    @Flag(name: .customLong("enable-code-coverage"), help: "Test with code coverage enabled")
+    @Flag(name: .customLong("code-coverage"),
+          inversion: .prefixedEnableDisable,
+          help: "Enable code coverage")
     var shouldEnableCodeCoverage: Bool = false
 
     // TODO: Does disable-automatic-resolution alias force-resolved-versions?

Sources/Commands/SwiftPackageTool.swift

@@ -540,11 +540,6 @@ extension SwiftPackageTool {
             @Option(help: "Path to xcconfig file", completion: .file())
             var xcconfigOverrides: AbsolutePath?
 
-            @Flag(name: .customLong("code-coverage"),
-                  inversion: .prefixedEnableDisable,
-                  help: "Enable code coverage in the generated project")
-            var isCodeCoverageEnabled: Bool = false
-            
             @Option(name: .customLong("output"),
                     help: "Path where the Xcode project should be generated")
             var outputPath: AbsolutePath?
@@ -559,16 +554,6 @@ extension SwiftPackageTool {
 
             @Flag(help: "Do not add file references for extra files to the generated Xcode project")
             var skipExtraFiles: Bool = false
-            
-            func xcodeprojOptions(with buildFlags: BuildFlags) -> XcodeprojOptions {
-                XcodeprojOptions(
-                    flags: buildFlags,
-                    xcconfigOverrides: xcconfigOverrides,
-                    isCodeCoverageEnabled: isCodeCoverageEnabled,
-                    useLegacySchemeGenerator: useLegacySchemeGenerator,
-                    enableAutogeneration: enableAutogeneration,
-                    addExtraFiles: !skipExtraFiles)
-            }
         }
 
         @OptionGroup()
@@ -577,6 +562,16 @@ extension SwiftPackageTool {
         @OptionGroup()
         var options: Options
 
+        func xcodeprojOptions() -> XcodeprojOptions {
+            XcodeprojOptions(
+                flags: swiftOptions.buildFlags,
+                xcconfigOverrides: options.xcconfigOverrides,
+                isCodeCoverageEnabled: swiftOptions.shouldEnableCodeCoverage,
+                useLegacySchemeGenerator: options.useLegacySchemeGenerator,
+                enableAutogeneration: options.enableAutogeneration,
+                addExtraFiles: !options.skipExtraFiles)
+        }
+
         func run(_ swiftTool: SwiftTool) throws {
             let graph = try swiftTool.loadPackageGraph()
 
@@ -597,7 +592,7 @@ extension SwiftPackageTool {
             }
             let xcodeprojPath = Xcodeproj.buildXcodeprojPath(outputDir: dstdir, projectName: projectName)
 
-            var genOptions = options.xcodeprojOptions(with: swiftOptions.buildFlags)
+            var genOptions = xcodeprojOptions()
             genOptions.manifestLoader = try swiftTool.getManifestLoader()
 
             try Xcodeproj.generate(
@@ -616,7 +611,7 @@ extension SwiftPackageTool {
                     diagnostics: swiftTool.diagnostics,
                     watchmanScriptsDir: swiftTool.buildPath.appending(component: "watchman"),
                     packageRoot: swiftTool.packageRoot!
-                ).runXcodeprojWatcher(options.xcodeprojOptions(with: swiftOptions.buildFlags))
+                ).runXcodeprojWatcher(xcodeprojOptions())
             }
         }
     }