Flip the --disable-explicit-target-dependency-import-checking option to an opt-in enable option.

While we work on optimizing incremental build performance of this check, it would be nice to have it as an opt-in option.

Author: artemcm

Sources/Build/BuildOperation.swift

@@ -133,7 +133,7 @@ public final class BuildOperation: PackageStructureDelegate, SPMBuildCore.BuildS
     // Emit a warning if a target imports another target in this build
     // without specifying it as a dependency in the manifest
     private func verifyTargetImports(in description: BuildDescription) throws {
-        guard !description.disableExplicitTargetDependencyImportChecking else {
+        guard description.enableExplicitTargetDependencyImportChecking else {
             return
         }
         // Ensure the compiler supports the import-scan operation
@@ -193,7 +193,7 @@ public final class BuildOperation: PackageStructureDelegate, SPMBuildCore.BuildS
         try verifyTargetImports(in: buildDescription)
 
         // Create the build system.
-        let buildSystem = try createBuildSystem(with: buildDescription)
+        let buildSystem = try createBuildSystem(buildDescription: buildDescription)
         self.buildSystem = buildSystem
 
         // Perform the build.

Sources/Build/BuildOperationBuildSystemDelegateHandler.swift

@@ -205,9 +205,9 @@ public struct BuildDescription: Codable {
     /// The map of copy commands.
     let copyCommands: [BuildManifest.CmdName: LLBuildManifest.CopyTool]
 
-    /// A flag that inidcates this build should skip checking whether targets only import
+    /// A flag that inidcates this build should perform a check for whether targets only import
     /// their explicitly-declared dependencies
-    let disableExplicitTargetDependencyImportChecking: Bool
+    let enableExplicitTargetDependencyImportChecking: Bool
 
     /// Every target's set of dependencies.
     let targetDependencyMap: [TargetName: [TargetName]]
@@ -232,7 +232,7 @@ public struct BuildDescription: Codable {
         self.swiftFrontendCommands = swiftFrontendCommands
         self.testDiscoveryCommands = testDiscoveryCommands
         self.copyCommands = copyCommands
-        self.disableExplicitTargetDependencyImportChecking = plan.buildParameters.disableExplicitTargetDependencyImportChecking
+        self.enableExplicitTargetDependencyImportChecking = plan.buildParameters.enableExplicitTargetDependencyImportChecking
         self.targetDependencyMap = try plan.targets.reduce(into: [TargetName: [TargetName]]()) {
             let deps = try $1.target.recursiveTargetDependencies().map { $0.c99name }
             $0[$1.target.c99name] = deps

Sources/Commands/Options.swift

@@ -297,10 +297,10 @@ public struct SwiftToolOptions: ParsableArguments {
     @Flag()
     var useIntegratedSwiftDriver: Bool = false
 
-    /// A flag that inidcates this build should skip checking whether targets only import
+    /// A flag that inidcates this build should check whether targets only import
     /// their explicitly-declared dependencies
     @Flag()
-    var disableExplicitTargetDependencyImportChecking: Bool = false
+    var enableExplicitTargetDependencyImportChecking: Bool = false
 
     /// Whether to use the explicit module build flow (with the integrated driver)
     @Flag(name: .customLong("experimental-explicit-module-build"))

Sources/Commands/SwiftTool.swift

@@ -914,7 +914,7 @@ public class SwiftTool {
                 printManifestGraphviz: options.printManifestGraphviz,
                 forceTestDiscovery: options.enableTestDiscovery, // backwards compatibility, remove with --enable-test-discovery
                 isTTY: isTTY,
-                disableExplicitTargetDependencyImportChecking: options.disableExplicitTargetDependencyImportChecking
+                enableExplicitTargetDependencyImportChecking: options.enableExplicitTargetDependencyImportChecking
             )
         })
     }()

Sources/SPMBuildCore/BuildParameters.swift

@@ -127,9 +127,9 @@ public struct BuildParameters: Encodable {
     /// Whether to use the explicit module build flow (with the integrated driver)
     public var useExplicitModuleBuild: Bool
 
-    /// A flag that inidcates this build should skip checking whether targets only import
+    /// A flag that inidcates this build should check whether targets only import
     /// their explicitly-declared dependencies
-    public var disableExplicitTargetDependencyImportChecking: Bool
+    public var enableExplicitTargetDependencyImportChecking: Bool
 
     /// Whether to output a graphviz file visualization of the combined job graph for all targets
     public var printManifestGraphviz: Bool
@@ -203,7 +203,7 @@ public struct BuildParameters: Encodable {
         enableTestability: Bool? = nil,
         forceTestDiscovery: Bool = false,
         isTTY: Bool = false,
-        disableExplicitTargetDependencyImportChecking: Bool = false        
+        enableExplicitTargetDependencyImportChecking: Bool = false
     ) {
         let triple = destinationTriple ?? .getHostTriple(usingSwiftCompiler: toolchain.swiftCompiler)
 
@@ -235,7 +235,7 @@ public struct BuildParameters: Encodable {
         // decide if to enable the use of test manifests based on platform. this is likely to change in the future
         self.testDiscoveryStrategy = triple.isDarwin() ? .objectiveC : .manifest(generate: forceTestDiscovery)
         self.isTTY = isTTY
-        self.disableExplicitTargetDependencyImportChecking = disableExplicitTargetDependencyImportChecking        
+        self.enableExplicitTargetDependencyImportChecking = enableExplicitTargetDependencyImportChecking        
     }
 
     /// The path to the build directory (inside the data directory).

Tests/CommandsTests/BuildToolTests.swift

@@ -80,7 +80,7 @@ final class BuildToolTests: XCTestCase {
         #endif
         fixture(name: "Miscellaneous/ImportOfMissingDependency") { path in
             let fullPath = resolveSymlinks(path)
-            XCTAssertThrowsError(try build([], packagePath: fullPath)) { error in
+            XCTAssertThrowsError(try build(["--enable-explicit-target-dependency-import-checking"], packagePath: fullPath)) { error in
                 guard case SwiftPMProductError.executionFailure(_, _, let stderr) = error else {
                     XCTFail()
                     return
@@ -92,7 +92,7 @@ final class BuildToolTests: XCTestCase {
         // Verify that the disable toggle works as expected
         fixture(name: "Miscellaneous/ImportOfMissingDependency") { path in
             let fullPath = resolveSymlinks(path)
-            XCTAssertThrowsError(try build(["--disable-explicit-target-dependency-import-checking"], packagePath: fullPath)) { error in
+            XCTAssertThrowsError(try build([], packagePath: fullPath)) { error in
                 guard case SwiftPMProductError.executionFailure(_, _, let stderr) = error else {
                     XCTFail()
                     return