Change TargetGroup enum param to packageAccess bool in target declaration (#6463)

* Change TargetGroup enum param to packageAccess bool in target declaration
Resolves rdar://108361064

Author: elsh

Fixtures/Miscellaneous/TargetGrouping/libPkg/Package.swift

@@ -0,0 +1,19 @@
+// swift-tools-version:999.0
+import PackageDescription
+
+let package = Package(
+    name: "libPkg",
+    products: [
+        .executable(name: "ExampleApp", targets: ["ExampleApp"]),
+        .library(name: "MainLib", targets: ["MainLib"]),
+    ],
+    targets: [
+        .executableTarget(name: "ExampleApp", dependencies: ["MainLib"], packageAccess: false),
+        .target(name: "MainLib", dependencies: ["Core"], packageAccess: true),
+        .target(name: "Core", dependencies: ["DataManager"]),
+        .target(name: "DataManager", dependencies: ["DataModel"]),
+        .target(name: "DataModel"),
+        .testTarget(name: "MainLibTests", dependencies: ["MainLib"]),
+        .testTarget(name: "BlackBoxTests", dependencies: ["MainLib"], packageAccess: false)
+    ]
+)

Fixtures/Miscellaneous/TargetPackageAccess/libPkg/Package.swift

@@ -385,17 +385,14 @@ public final class SwiftTargetBuildDescription {
         try self.fileSystem.writeIfChanged(path: path, bytes: stream.bytes)
     }
 
-    private func packageNameArgumentIfSupported(with pkg: ResolvedPackage, group: Target.Group) -> [String] {
+    private func packageNameArgumentIfSupported(with pkg: ResolvedPackage, packageAccess: Bool) -> [String] {
         let flag = "-package-name"
         if pkg.manifest.usePackageNameFlag,
            driverSupport.checkToolchainDriverFlags(flags: [flag], toolchain:  self.buildParameters.toolchain, fileSystem: self.fileSystem) {
-            switch group {
-            case .package:
+            if packageAccess {
                 let pkgID = pkg.identity.description.spm_mangledToC99ExtendedIdentifier()
                 return [flag, pkgID]
-            case .excluded:
-                return []
-            }
+            } 
         }
         return []
     }
@@ -520,7 +517,7 @@ public final class SwiftTargetBuildDescription {
             }
         }
 
-        args += self.packageNameArgumentIfSupported(with: self.package, group: self.target.group)
+        args += self.packageNameArgumentIfSupported(with: self.package, packageAccess: self.target.packageAccess)
         args += try self.macroArguments()
 
         return args
@@ -534,7 +531,7 @@ public final class SwiftTargetBuildDescription {
 
         result.append("-module-name")
         result.append(self.target.c99name)
-        result.append(contentsOf: packageNameArgumentIfSupported(with: self.package, group: self.target.group))
+        result.append(contentsOf: packageNameArgumentIfSupported(with: self.package, packageAccess: self.target.packageAccess))
         if !scanInvocation {
             result.append("-emit-dependencies")
 
@@ -580,7 +577,7 @@ public final class SwiftTargetBuildDescription {
         result.append("-emit-module")
         result.append("-emit-module-path")
         result.append(self.moduleOutputPath.pathString)
-        result.append(contentsOf: packageNameArgumentIfSupported(with: self.package, group: self.target.group))
+        result.append(contentsOf: packageNameArgumentIfSupported(with: self.package, packageAccess: self.target.packageAccess))
         result += self.buildParameters.toolchain.extraFlags.swiftCompilerFlags
 
         result.append("-Xfrontend")
@@ -626,7 +623,7 @@ public final class SwiftTargetBuildDescription {
 
         result.append("-module-name")
         result.append(self.target.c99name)
-        result.append(contentsOf: packageNameArgumentIfSupported(with: self.package, group: self.target.group))
+        result.append(contentsOf: packageNameArgumentIfSupported(with: self.package, packageAccess: self.target.packageAccess))
         result.append("-incremental")
         result.append("-emit-dependencies")
 

Fixtures/Miscellaneous/TargetGrouping/libPkg/Sources/Core/Core.swift renamed to Fixtures/Miscellaneous/TargetPackageAccess/libPkg/Sources/Core/Core.swift

@@ -282,8 +282,8 @@ public class BuildPlan: SPMBuildCore.BuildPlan {
 
                 let discoveryTarget = SwiftTarget(
                     name: discoveryTargetName,
-                    group: .package, // test target is allowed access to package decls by default
                     dependencies: testProduct.underlyingProduct.targets.map { .target($0, conditions: []) },
+                    packageAccess: true, // test target is allowed access to package decls by default
                     testDiscoverySrc: Sources(paths: discoveryPaths, root: discoveryDerivedDir)
                 )
                 let discoveryResolvedTarget = ResolvedTarget(
@@ -314,9 +314,9 @@ public class BuildPlan: SPMBuildCore.BuildPlan {
 
                 let entryPointTarget = SwiftTarget(
                     name: testProduct.name,
-                    group: .package, // test target is allowed access to package decls by default
                     type: .library,
                     dependencies: testProduct.underlyingProduct.targets.map { .target($0, conditions: []) } + [.target(discoveryTarget, conditions: [])],
+                    packageAccess: true, // test target is allowed access to package decls
                     testEntryPointSources: entryPointSources
                 )
                 let entryPointResolvedTarget = ResolvedTarget(
@@ -344,8 +344,8 @@ public class BuildPlan: SPMBuildCore.BuildPlan {
                         // Allow using the explicitly-specified test entry point target, but still perform test discovery and thus declare a dependency on the discovery targets.
                         let entryPointTarget = SwiftTarget(
                             name: entryPointResolvedTarget.underlyingTarget.name,
-                            group: entryPointResolvedTarget.group,
                             dependencies: entryPointResolvedTarget.underlyingTarget.dependencies + [.target(discoveryTargets.target, conditions: [])],
+                            packageAccess: entryPointResolvedTarget.packageAccess,
                             testEntryPointSources: entryPointResolvedTarget.underlyingTarget.sources
                         )
                         let entryPointResolvedTarget = ResolvedTarget(
@@ -999,18 +999,18 @@ private extension PackageModel.SwiftTarget {
     /// Initialize a SwiftTarget representing a test entry point.
     convenience init(
         name: String,
-        group: Group,
         type: PackageModel.Target.Kind? = nil,
         dependencies: [PackageModel.Target.Dependency],
+        packageAccess: Bool,
         testEntryPointSources sources: Sources
     ) {
         self.init(
             name: name,
-            group: group,
             type: type ?? .executable,
             path: .root,
             sources: sources,
             dependencies: dependencies,
+            packageAccess: packageAccess,
             swiftVersion: .v5,
             usesUnsafeFlags: false
         )

Fixtures/Miscellaneous/TargetGrouping/libPkg/Sources/DataManager/File.swift renamed to Fixtures/Miscellaneous/TargetPackageAccess/libPkg/Sources/DataManager/File.swift

@@ -16,23 +16,23 @@ public extension Target {
     @available(_PackageDescription, introduced: 999.0)
     static func macro(
         name: String,
-        group: TargetGroup = .package,
         dependencies: [Dependency] = [],
         path: String? = nil,
         exclude: [String] = [],
         sources: [String]? = nil,
+        packageAccess: Bool = true,
         swiftSettings: [SwiftSetting]? = nil,
         linkerSettings: [LinkerSetting]? = nil,
         plugins: [PluginUsage]? = nil
     ) -> Target {
         return Target(name: name,
-                      group: group,
                       dependencies: dependencies,
                       path: path,
                       exclude: exclude,
                       sources: sources,
                       publicHeadersPath: nil,
                       type: .macro,
+                      packageAccess: packageAccess,
                       swiftSettings: swiftSettings,
                       linkerSettings: linkerSettings,
                       plugins: plugins)

Fixtures/Miscellaneous/TargetGrouping/libPkg/Sources/DataModel/File.swift renamed to Fixtures/Miscellaneous/TargetPackageAccess/libPkg/Sources/DataModel/File.swift

@@ -166,11 +166,6 @@ enum Serialization {
         case `macro`
     }
 
-    enum TargetGroup: Codable {
-        case package
-        case excluded
-    }
-
     enum PluginCapability: Codable {
         case buildTool
         case command(intent: PluginCommandIntent, permissions: [PluginPermission])
@@ -201,7 +196,6 @@ enum Serialization {
 
     struct Target: Codable {
         let name: String
-        let group: TargetGroup
         let path: String?
         let url: String?
         let sources: [String]?
@@ -210,6 +204,7 @@ enum Serialization {
         let dependencies: [TargetDependency]
         let publicHeadersPath: String?
         let type: TargetType
+        let packageAccess: Bool
         let pkgConfig: String?
         let providers: [SystemPackageProvider]?
         let pluginCapability: PluginCapability?

Fixtures/Miscellaneous/TargetGrouping/libPkg/Sources/ExampleApp/main.swift renamed to Fixtures/Miscellaneous/TargetPackageAccess/libPkg/Sources/ExampleApp/main.swift

@@ -219,15 +219,6 @@ extension Serialization.TargetType {
     }
 }
 
-extension Serialization.TargetGroup {
-    init(_ type: PackageDescription.Target.TargetGroup) {
-        switch type {
-        case .package: self = .package
-        case .excluded: self = .excluded
-        }
-    }
-}
-
 extension Serialization.PluginCapability {
     init(_ capability: PackageDescription.Target.PluginCapability) {
         switch capability {
@@ -279,7 +270,7 @@ extension Serialization.PluginUsage {
 extension Serialization.Target {
     init(_ target: PackageDescription.Target) {
         self.name = target.name
-        self.group = .init(target.group)
+        self.packageAccess = target.packageAccess
         self.path = target.path
         self.url = target.url
         self.sources = target.sources