Merge branch 'main' into 6.2-merge-main

Author: dschaefer2

Package.swift

@@ -815,11 +815,17 @@ let package = Package(
                 "Archiver/Inputs/invalid_archive.tar.gz",
                 "Archiver/Inputs/invalid_archive.zip",
                 "processInputs/long-stdout-stderr",
+                "processInputs/long-stdout-stderr.bat",
                 "processInputs/exit4",
+                "processInputs/exit4.bat",
                 "processInputs/simple-stdout-stderr",
+                "processInputs/simple-stdout-stderr.bat",
                 "processInputs/deadlock-if-blocking-io",
+                "processInputs/deadlock-if-blocking-io.bat",
                 "processInputs/echo",
+                "processInputs/echo.bat",
                 "processInputs/in-to-out",
+                "processInputs/in-to-out.bat",
             ]
         ),
         .testTarget(

Sources/Basics/Concurrency/AsyncProcess.swift

@@ -387,6 +387,20 @@ package final class AsyncProcess {
         self.loggingHandler = loggingHandler ?? AsyncProcess.loggingHandler
     }
 
+    package convenience init(
+        args: [String],
+        environment: Environment = .current,
+        outputRedirection: OutputRedirection = .collect,
+        loggingHandler: LoggingHandler? = .none
+    ) {
+        self.init(
+            arguments: args,
+            environment: environment,
+            outputRedirection: outputRedirection,
+            loggingHandler: loggingHandler
+        )
+    }
+
     package convenience init(
         args: String...,
         environment: Environment = .current,

Sources/Commands/SwiftRunCommand.swift

@@ -274,7 +274,8 @@ public struct SwiftRunCommand: AsyncSwiftCommand {
         // If the executable is implicit, search through root products.
         let rootExecutables = graph.rootPackages
             .flatMap { $0.products }
-            .filter { $0.type == .executable || $0.type == .snippet }
+            // The type checker slows down significantly when ProductTypes arent explicitly typed.
+            .filter { $0.type == ProductType.executable || $0.type == ProductType.snippet }
             .map { $0.name }
 
         // Error out if the package contains no executables.

Sources/PackageDescription/PackageDependency.swift

@@ -511,7 +511,6 @@ extension Package.Dependency {
     /// ```
     ///
     /// - Parameters:
-    ///   - name: The name of the package, or nil to deduce it from the URL.
     ///   - url: The valid Git URL of the package.
     ///   - range: The custom version range requirement.
     ///
@@ -534,7 +533,6 @@ extension Package.Dependency {
     /// ```
     ///
     /// - Parameters:
-    ///   - name: The name of the package, or nil to deduce it from the URL.
     ///   - url: The valid Git URL of the package.
     ///   - range: The custom version range requirement.
     ///   - traits: The trait configuration of this dependency. Defaults to enabling the default traits.
@@ -585,7 +583,6 @@ extension Package.Dependency {
     /// ```
     ///
     /// - Parameters:
-    ///   - name: The name of the package, or `nil` to deduce it from the URL.
     ///   - url: The valid Git URL of the package.
     ///   - range: The closed version range requirement.
     ///
@@ -608,7 +605,6 @@ extension Package.Dependency {
     /// ```
     ///
     /// - Parameters:
-    ///   - name: The name of the package, or `nil` to deduce it from the URL.
     ///   - url: The valid Git URL of the package.
     ///   - range: The closed version range requirement.
     ///   - traits: The trait configuration of this dependency. Defaults to enabling the default traits.
@@ -788,7 +784,6 @@ extension Package.Dependency {
     /// Adds a remote package dependency given a version requirement.
     ///
     /// - Parameters:
-    ///   - name: The name of the package, or nil to deduce it from the URL.
     ///   - url: The valid Git URL of the package.
     ///   - requirement: A dependency requirement. See static methods on `Package.Dependency.Requirement` for available options.
     ///

Sources/PackageDescription/PackageDescription.docc/Curation/BuildSettingCondition.md

@@ -6,5 +6,6 @@
 
 - ``when(platforms:)``
 - ``when(configuration:)``
-- ``when(platforms:configuration:)-2991l``
 - ``when(platforms:configuration:)-475co``
+- ``when(platforms:configuration:traits:)``
+- ``when(platforms:configuration:)-2991l``

Sources/PackageDescription/PackageDescription.docc/Curation/Dependency.md

@@ -5,20 +5,52 @@
 ### Creating a Package Dependency
 
 - ``package(name:path:)``
+- ``package(name:path:traits:)``
+- ``package(path:)``
+- ``package(path:traits:)``
 - ``package(url:from:)``
 - ``package(url:_:)-2ys47``
 - ``package(url:_:)-1r6rc``
 - ``package(url:branch:)``
 - ``package(url:revision:)``
 - ``package(url:exact:)``
-- ``package(path:)``
+- ``package(url:exact:traits:)``
+- ``package(url:_:traits:)-(_,Range<Version>,_)``
+- ``package(url:_:traits:)-(_,ClosedRange<Version>,_)``
+- ``package(url:branch:traits:)``
+- ``package(url:from:traits:)``
+- ``package(url:revision:traits:)``
+- ``package(id:_:)-(_,Range<Version>)``
+- ``package(id:_:)-(_,ClosedRange<Version>)``
+- ``package(id:_:traits:)-(_,Range<Version>,_)``
+- ``package(id:_:traits:)-(_,ClosedRange<Version>,_)``
+- ``package(id:exact:)``
+- ``package(id:exact:traits:)``
+- ``package(id:from:)``
+- ``package(id:from:traits:)``
+- ``package(name:url:_:)-(String?,_,_)``
+- ``package(name:url:_:)-(_,_,Range<Version>)``
+- ``package(name:url:_:)-(_,_,ClosedRange<Version>)``
+- ``package(name:url:branch:)``
+- ``package(name:url:from:)``
+- ``package(name:url:revision:)``
+- ``package(url:_:)-(_,Package.Dependency.Requirement)``
+- ``name``
+- ``url``
 
 ### Declaring Requirements
 
 - ``requirement-swift.property``
 - ``Requirement-swift.enum``
+- ``traits``
+- ``Trait``
+- ``RegistryRequirement``
+- ``SourceControlRequirement``
 
 ### Describing a Package Dependency
 
+- ``name``
+- ``url``
 - ``kind-swift.property``
+- ``Kind``
 - ``Version``

Sources/PackageDescription/PackageDescription.docc/Curation/Extensions/CLanguageStandard-hash.md

@@ -6,4 +6,4 @@
 
 Hashes the C language standard by feeding the item into the given hasher.
 
-- Parameter into: The hasher.
+- Parameter hasher: The hasher.

Sources/PackageDescription/PackageDescription.docc/Curation/Extensions/CXXLanguageStandard-hash.md

@@ -6,4 +6,4 @@
 
 Hashes the C++ language standard by feeding the item into the given hasher.
 
-- Parameter into: The hasher.
+- Parameter hasher: The hasher.

Sources/PackageDescription/PackageDescription.docc/Curation/Extensions/LanguageTag-hash.md

@@ -6,4 +6,4 @@
 
 Hashes the language tag by feeding the item into the given hasher.
 
-- Parameter into: The hasher.
+- Parameter hasher: The hasher.

Sources/PackageDescription/PackageDescription.docc/Curation/Extensions/Library-LibraryType-hash.md

@@ -11,4 +11,4 @@ Implement this method to conform to the Hashable protocol. The components used f
 > Important:
 > Never call finalize() on hasher. Doing so may become a compile-time error in the future.
 
-- Parameter into: The hasher to use when combining the components of this instance.
+- Parameter hasher: The hasher to use when combining the components of this instance.

Sources/PackageDescription/PackageDescription.docc/Curation/Extensions/Resource-Localization-hash.md

@@ -6,4 +6,4 @@
 
 Hashes the localization by feeding the item into the given hasher.
 
-- Parameter into: The hasher.
+- Parameter hasher: The hasher.

Sources/PackageDescription/PackageDescription.docc/Curation/Extensions/Target-TargetType-hash.md

@@ -6,6 +6,6 @@
 
 Hashes the target type by feeding the item into the given hasher.
 
-- Parameter into: The hasher.
+- Parameter hasher: The hasher.
 
 

Sources/PackageDescription/PackageDescription.docc/Curation/LanguageTag.md

@@ -4,7 +4,6 @@
 
 ### Creating a Language Tag
 
-- ``init(_:)``
 - <doc:/documentation/PackageDescription/LanguageTag/init(extendedGraphemeClusterLiteral:)-36buv>
 - ``init(stringLiteral:)``
 - <doc:/documentation/PackageDescription/LanguageTag/init(unicodeScalarLiteral:)-1j41k>
@@ -13,7 +12,6 @@
 
 ### Describing a Language Tag
 
-- ``tag``
 - ``description``
 
 ### Hashing

Sources/PackageDescription/PackageDescription.docc/Curation/Package.md

@@ -4,7 +4,13 @@
 
 ### Creating a Package
 
+- ``Package/init(name:defaultLocalization:platforms:pkgConfig:providers:products:dependencies:targets:swiftLanguageModes:cLanguageStandard:cxxLanguageStandard:)``
+- ``Package/init(name:defaultLocalization:platforms:pkgConfig:providers:products:traits:dependencies:targets:swiftLanguageModes:cLanguageStandard:cxxLanguageStandard:)``
 - ``Package/init(name:defaultLocalization:platforms:pkgConfig:providers:products:dependencies:targets:swiftLanguageVersions:cLanguageStandard:cxxLanguageStandard:)``
+- ``Package/init(name:platforms:pkgConfig:providers:products:dependencies:targets:swiftLanguageVersions:cLanguageStandard:cxxLanguageStandard:)``
+- ``Package/init(name:pkgConfig:providers:products:dependencies:targets:swiftLanguageVersions:cLanguageStandard:cxxLanguageStandard:)-(_,_,_,_,_,_,[Int]?,_,_)``
+- ``Package/init(name:pkgConfig:providers:products:dependencies:targets:swiftLanguageVersions:cLanguageStandard:cxxLanguageStandard:)-(_,_,_,_,_,_,[SwiftVersion]?,_,_)``
+
 
 ### Naming the Package
 
@@ -37,16 +43,23 @@
 - ``Package/pkgConfig``
 - ``Package/providers``
 
+### Configuring Traits
+
+- ``Package/traits``
+- ``Trait``
+
 ### Declaring Package Dependencies
 
 - ``Package/dependencies``
 - ``Package/Dependency``
 
 ### Declaring Supported Languages
 
+- ``SwiftLanguageMode``
 - ``SwiftVersion``
 - ``CLanguageStandard``
 - ``CXXLanguageStandard``
+- ``Package/swiftLanguageModes``
 - ``Package/swiftLanguageVersions``
 - ``Package/cLanguageStandard``
 - ``Package/cxxLanguageStandard``

Sources/PackageDescription/PackageDescription.docc/Curation/Platform.md

@@ -9,10 +9,12 @@
 - ``macOS``
 - ``tvOS``
 - ``watchOS``
+- ``visionOS``
 - ``macCatalyst``
 - ``driverKit``
 - ``android``
 - ``linux``
+- ``freebsd``
 - ``openbsd``
 - ``wasi``
 - ``windows``

Sources/PackageDescription/PackageDescription.docc/Curation/Resource.md

@@ -7,3 +7,4 @@
 - ``process(_:localization:)``
 - ``Localization``
 - ``copy(_:)``
+- ``embedInCode(_:)``

Sources/PackageDescription/PackageDescription.docc/Curation/SupportedPlatforms.md

@@ -51,15 +51,10 @@
 - <doc:/documentation/PackageDescription/Platform/driverKit>
 - ``DriverKitVersion``
 
-### Supporting Linux
-
-- <doc:/documentation/PackageDescription/Platform/linux>
-
-### Type methods
+### Supporting Custom Platforms
 
 - ``custom(_:versionString:)``
 
 ### Operator Functions
 
 - ``!=(_:_:)``
-- ``==(_:_:)``

Sources/PackageDescription/PackageDescription.docc/Curation/SwiftVersion.md

@@ -4,22 +4,14 @@
 
 ### Creating a Target Dependency
 
+- ``product(name:package:moduleAliases:condition:)``
 - ``product(name:package:condition:)``
 - ``product(name:package:)-fp0j``
 - ``product(name:package:)-2nako``
-- ``product(name:package:moduleAliases:)``
-- ``product(name:package:moduleAliases:condition:)``
+- ``productItem(name:package:condition:)``
 - ``target(name:condition:)``
 - ``target(name:)``
 - ``byName(name:condition:)``
 - ``byName(name:)``
 - ``TargetDependencyCondition``
 - ``init(stringLiteral:)``
-- ``init(extendedGraphemeClusterLiteral:)``
-- ``init(unicodeScalarLiteral:)``
-
-### Identifying related types
-
-- ``ExtendedGraphemeClusterLiteralType``
-- ``StringLiteralType``
-- ``UnicodeScalarLiteralType``

Sources/PackageDescription/PackageDescription.docc/Curation/Target-Dependency.md

@@ -5,4 +5,6 @@
 ### Creating a Dependency Condition
 
 - ``when(platforms:)-5bxhc``
+- ``when(traits:)``
+- ``when(platforms:traits:)``
 - ``when(platforms:)-4djh6``

Sources/PackageDescription/PackageDescription.docc/Curation/Target-TargetDependencyCondition.md

@@ -30,11 +30,29 @@
 
 ### Creating an Executable Target
 
-- ``executableTarget(name:dependencies:path:exclude:sources:resources:publicHeadersPath:cSettings:cxxSettings:swiftSettings:linkerSettings:)``
+- ``executableTarget(name:dependencies:path:exclude:sources:resources:publicHeadersPath:packageAccess:cSettings:cxxSettings:swiftSettings:linkerSettings:plugins:)``
 - ``executableTarget(name:dependencies:path:exclude:sources:resources:publicHeadersPath:cSettings:cxxSettings:swiftSettings:linkerSettings:plugins:)``
+- ``executableTarget(name:dependencies:path:exclude:sources:resources:publicHeadersPath:cSettings:cxxSettings:swiftSettings:linkerSettings:)``
+
+### Creating a Regular Target
+
+- ``target(name:dependencies:path:exclude:sources:resources:publicHeadersPath:packageAccess:cSettings:cxxSettings:swiftSettings:linkerSettings:plugins:)``
+- ``target(name:dependencies:path:exclude:sources:resources:publicHeadersPath:cSettings:cxxSettings:swiftSettings:linkerSettings:plugins:)``
+- ``target(name:dependencies:path:exclude:sources:resources:publicHeadersPath:cSettings:cxxSettings:swiftSettings:linkerSettings:)``
+- ``target(name:dependencies:path:exclude:sources:publicHeadersPath:cSettings:cxxSettings:swiftSettings:linkerSettings:)``
+- ``target(name:dependencies:path:exclude:sources:publicHeadersPath:)``
+
+### Creating a Test Target
+
+- ``testTarget(name:dependencies:path:exclude:sources:resources:packageAccess:cSettings:cxxSettings:swiftSettings:linkerSettings:plugins:)``
+- ``testTarget(name:dependencies:path:exclude:sources:resources:cSettings:cxxSettings:swiftSettings:linkerSettings:plugins:)``
+- ``testTarget(name:dependencies:path:exclude:sources:resources:cSettings:cxxSettings:swiftSettings:linkerSettings:)``
+- ``testTarget(name:dependencies:path:exclude:sources:cSettings:cxxSettings:swiftSettings:linkerSettings:)``
+- ``testTarget(name:dependencies:path:exclude:sources:)``
 
 ### Creating a Plugin Target
 
+- ``plugin(name:capability:dependencies:path:exclude:sources:packageAccess:)``
 - ``plugin(name:capability:dependencies:path:exclude:sources:)``
 - ``pluginCapability-swift.property``
 - ``PluginCapability-swift.enum``
@@ -61,6 +79,7 @@
 - ``SwiftSetting``
 - ``LinkerSetting``
 - ``PluginUsage``
+- ``packageAccess``
 
 ### Describing the Target Type
 

Sources/PackageDescription/PackageDescription.docc/Curation/Target.md

@@ -171,6 +171,7 @@ public final class Package {
     ///   - pkgConfig: The name to use for C modules. If present, the Swift
     ///           Package Manager searches for a `<name>.pc` file to get the
     ///           additional flags required for a system target.
+    ///   - providers: The system package providers that this package uses.
     ///   - products: The list of products that this package makes available for clients to use.
     ///   - dependencies: The list of package dependencies.
     ///   - targets: The list of targets that are part of this package.
@@ -211,6 +212,7 @@ public final class Package {
     ///   - pkgConfig: The name to use for C modules. If present, the Swift
     ///           Package Manager searches for a `<name>.pc` file to get the
     ///           additional flags required for a system target.
+    ///   - providers: The system package providers that this package uses.
     ///   - products: The list of products that this package makes available for clients to use.
     ///   - dependencies: The list of package dependencies.
     ///   - targets: The list of targets that are part of this package.