Merge branch 'main' of github.com:apple/swift-package-manager into maxd/test-toolchain-argument

# Conflicts:
#	Tests/BuildTests/BuildPlanTests.swift

Author: MaxDesiatov

.gitignore

@@ -18,3 +18,4 @@ Package.resolved
 .docc-build
 .vscode
 Utilities/InstalledSwiftPMConfiguration/config.json
+.devcontainer

CHANGELOG.md

@@ -2,8 +2,8 @@ Note: This is in reverse chronological order, so newer entries are added to the
 
 * [#7530]
 
-  Makes it possible for packages to depend on each other if such dependency doesn't form any target-level cycles. For example,
-  package `A` can depend on `B` and `B` on `A` unless targets in `B` depend on products of `A` that depend on some of the same
+  Starting from tools-version 6.0 makes it possible for packages to depend on each other if such dependency doesn't form any target-level cycles.
+  For example, package `A` can depend on `B` and `B` on `A` unless targets in `B` depend on products of `A` that depend on some of the same
   targets from `B` and vice versa.
 
 Swift 6.0

CODEOWNERS

@@ -26,4 +26,4 @@
 
 Sources/XCBuildSupport/* @jakepetroules
 
-* @bnbarham @MaxDesiatov @jakepetroules @francescomikulis
+* @bnbarham @MaxDesiatov @jakepetroules @francescomikulis @xedin

Fixtures/Miscellaneous/CheckTestLibraryEnvironmentVariable/Package.swift

@@ -0,0 +1,10 @@
+// swift-tools-version: 5.10
+
+import PackageDescription
+
+let package = Package(
+    name: "CheckTestLibraryEnvironmentVariable",
+    targets: [
+        .testTarget(name: "CheckTestLibraryEnvironmentVariableTests"),
+    ]
+)

Fixtures/Miscellaneous/CheckTestLibraryEnvironmentVariable/Tests/CheckTestLibraryEnvironmentVariableTests/CheckTestLibraryEnvironmentVariableTests.swift

@@ -0,0 +1,8 @@
+import XCTest
+
+final class CheckTestLibraryEnvironmentVariableTests: XCTestCase {
+    func testEnviromentVariable() throws {
+        let envvar = ProcessInfo.processInfo.environment["SWIFT_PM_TEST_LIBRARY"]
+        XCTAssertEqual(envvar, "XCTest")
+    }
+}

Package.swift

@@ -827,7 +827,7 @@ if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
         .package(url: "https://github.com/apple/swift-crypto.git", .upToNextMinor(from: "3.0.0")),
         .package(url: "https://github.com/apple/swift-syntax.git", branch: relatedDependenciesBranch),
         .package(url: "https://github.com/apple/swift-system.git", .upToNextMinor(from: "1.1.1")),
-        .package(url: "https://github.com/apple/swift-collections.git", .upToNextMinor(from: "1.0.1")),
+        .package(url: "https://github.com/apple/swift-collections.git", "1.0.1" ..< "1.2.0"),
         .package(url: "https://github.com/apple/swift-certificates.git", .upToNextMinor(from: "1.0.1")),
     ]
 } else {

Sources/Build/BuildDescription/PluginDescription.swift

@@ -29,6 +29,9 @@ public final class PluginDescription: Codable {
     /// the plugin).
     public let targetName: String
 
+    /// The language-level target name.
+    public let targetC99Name: String
+
     /// The names of any plugin products in that package that vend the plugin
     /// to other packages.
     public let productNames: [String]
@@ -56,6 +59,7 @@ public final class PluginDescription: Codable {
 
         self.package = package.identity
         self.targetName = target.name
+        self.targetC99Name = target.c99name
         self.productNames = products.map(\.name)
         self.toolsVersion = toolsVersion
         self.sources = target.sources

Sources/Build/BuildDescription/ResolvedModule+BuildDescription.swift

@@ -17,7 +17,7 @@ import SPMBuildCore
 
 extension ResolvedModule {
     func tempsPath(_ buildParameters: BuildParameters) -> AbsolutePath {
-        let suffix = buildParameters.suffix(triple: self.buildTriple)
+        let suffix = buildParameters.suffix
         return buildParameters.buildPath.appending(component: "\(self.c99name)\(suffix).build")
     }
 }

Sources/Build/BuildDescription/SwiftTargetBuildDescription.swift

@@ -101,7 +101,7 @@ public enum TargetBuildDescription {
     var buildParameters: BuildParameters {
         switch self {
         case .swift(let swiftTargetBuildDescription):
-            return swiftTargetBuildDescription.defaultBuildParameters
+            return swiftTargetBuildDescription.buildParameters
         case .clang(let clangTargetBuildDescription):
             return clangTargetBuildDescription.buildParameters
         }