Merge remote-tracking branch 'origin/main' into release/5.10

Author: swift-ci

CHANGELOG.md

@@ -3,10 +3,6 @@ Note: This is in reverse chronological order, so newer entries are added to the
 Swift Next
 -----------
 
-* [#5728]
-
-  In packages that specify resources using a future tools version, the generated resource bundle accessor will import `Foundation.Bundle` for its own implementation only. _Clients_ of such packages therefore no longer silently import `Foundation`, preventing inadvertent use of Foundation extensions to standard library APIs, which helps to avoid unexpected code size increases.
-
 * [#7010]
 
   On macOS, `swift build` and `swift run` now produce binaries that allow backtraces in debug builds. Pass `SWIFT_BACKTRACE=enable=yes` environment variable to enable backtraces on such binaries when running them.

CMakeLists.txt

@@ -19,6 +19,8 @@ if(CMAKE_VERSION VERSION_LESS 3.16)
     set(CMAKE_LINK_LIBRARY_FLAG "-l")
 endif()
 
+add_compile_options(-DUSE_IMPL_ONLY_IMPORTS)
+
 set(CMAKE_Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift)
 
 if(CMAKE_VERSION VERSION_LESS 3.16 AND CMAKE_SYSTEM_NAME STREQUAL Windows)

Package.swift

@@ -128,6 +128,7 @@ let package = Package(
             name: "PackageDescription",
             exclude: ["CMakeLists.txt"],
             swiftSettings: [
+                .define("USE_IMPL_ONLY_IMPORTS"),
                 .unsafeFlags(["-package-description-version", "999.0"]),
                 .unsafeFlags(["-enable-library-evolution"]),
             ],

Sources/Basics/SQLite.swift

@@ -12,7 +12,11 @@
 
 import Foundation
 
+#if USE_IMPL_ONLY_IMPORTS
 @_implementationOnly import SPMSQLite3
+#else
+import SPMSQLite3
+#endif
 
 /// A minimal SQLite wrapper.
 public final class SQLite {

Sources/Basics/SwiftVersion.swift

@@ -10,7 +10,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if USE_IMPL_ONLY_IMPORTS
 @_implementationOnly import TSCclibc
+#else
+import TSCclibc
+#endif
 
 public struct SwiftVersion {
     /// The version number.

Sources/Build/BuildDescription/ProductBuildDescription.swift

@@ -11,12 +11,17 @@
 //===----------------------------------------------------------------------===//
 
 import Basics
-@_implementationOnly import DriverSupport
 import PackageGraph
 import PackageModel
 import OrderedCollections
 import SPMBuildCore
 
+#if USE_IMPL_ONLY_IMPORTS
+@_implementationOnly import DriverSupport
+#else
+import DriverSupport
+#endif
+
 import struct TSCBasic.SortedArray
 
 /// The build description for a product.

Sources/Build/BuildDescription/SwiftTargetBuildDescription.swift

@@ -16,7 +16,12 @@ import PackageGraph
 import PackageLoading
 import PackageModel
 import SPMBuildCore
+
+#if USE_IMPL_ONLY_IMPORTS
 @_implementationOnly import DriverSupport
+#else
+import DriverSupport
+#endif
 
 import struct TSCBasic.ByteString
 
@@ -373,7 +378,7 @@ public final class SwiftTargetBuildDescription {
 
         let content =
             """
-            \(self.toolsVersion < .vNext ? "import" : "@_implementationOnly import") Foundation
+            import Foundation
 
             extension Foundation.Bundle {
                 static let module: Bundle = {

Sources/Build/BuildManifest/LLBuildManifestBuilder+Swift.swift

@@ -10,8 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_implementationOnly import class DriverSupport.SPMSwiftDriverExecutor
-@_implementationOnly import SwiftDriver
 import struct Basics.InternalError
 import struct Basics.AbsolutePath
 import struct Basics.RelativePath
@@ -24,6 +22,14 @@ import protocol TSCBasic.FileSystem
 import enum TSCBasic.ProcessEnv
 import func TSCBasic.topologicalSort
 
+#if USE_IMPL_ONLY_IMPORTS
+@_implementationOnly import class DriverSupport.SPMSwiftDriverExecutor
+@_implementationOnly import SwiftDriver
+#else
+import class DriverSupport.SPMSwiftDriverExecutor
+import SwiftDriver
+#endif
+
 import PackageModel
 
 extension LLBuildManifestBuilder {

Sources/Build/BuildManifest/LLBuildManifestBuilder.swift

@@ -11,12 +11,18 @@
 //===----------------------------------------------------------------------===//
 
 import Basics
-@_implementationOnly import DriverSupport
 import LLBuildManifest
 import PackageGraph
 import PackageModel
 import SPMBuildCore
+
+#if USE_IMPL_ONLY_IMPORTS
+@_implementationOnly import DriverSupport
 @_implementationOnly import SwiftDriver
+#else
+import DriverSupport
+import SwiftDriver
+#endif
 
 import struct TSCBasic.ByteString
 import enum TSCBasic.ProcessEnv

Sources/Build/BuildOperation.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import Basics
-@_implementationOnly import DriverSupport
 import LLBuildManifest
 import PackageGraph
 import PackageLoading
@@ -31,7 +30,13 @@ import class TSCUtility.MultiLineNinjaProgressAnimation
 import class TSCUtility.NinjaProgressAnimation
 import protocol TSCUtility.ProgressAnimationProtocol
 
+#if USE_IMPL_ONLY_IMPORTS
+@_implementationOnly import DriverSupport
 @_implementationOnly import SwiftDriver
+#else
+import DriverSupport
+import SwiftDriver
+#endif
 
 public final class BuildOperation: PackageStructureDelegate, SPMBuildCore.BuildSystem, BuildErrorAdviceProvider {
     /// The delegate used by the build system.

Sources/Build/BuildPlan/BuildPlan.swift

@@ -18,7 +18,12 @@ import PackageGraph
 import PackageLoading
 import PackageModel
 import SPMBuildCore
+
+#if USE_IMPL_ONLY_IMPORTS
 @_implementationOnly import SwiftDriver
+#else
+import SwiftDriver
+#endif
 
 import enum TSCBasic.ProcessEnv
 

Sources/Commands/PackageTools/ArchiveSource.swift

@@ -67,7 +67,7 @@ extension SwiftPackageTool {
     ) throws  {
         let gitRepositoryProvider = GitRepositoryProvider()
         if gitRepositoryProvider.repositoryExists(at: packageDirectory) &&
-            gitRepositoryProvider.isValidDirectory(packageDirectory){
+            (try? gitRepositoryProvider.isValidDirectory(packageDirectory)) == true {
             let repository = GitRepository(path: packageDirectory, cancellator: cancellator)
             try repository.archive(to: archivePath)
         } else {

Sources/Commands/Utilities/SymbolGraphExtract.swift

@@ -12,11 +12,16 @@
 
 import ArgumentParser
 import Basics
-@_implementationOnly import DriverSupport
 import PackageGraph
 import PackageModel
 import SPMBuildCore
 
+#if USE_IMPL_ONLY_IMPORTS
+@_implementationOnly import DriverSupport
+#else
+import DriverSupport
+#endif
+
 import class TSCBasic.Process
 
 /// A wrapper for swift-symbolgraph-extract tool.

Sources/CoreCommands/SwiftTool.swift

@@ -13,7 +13,6 @@
 import ArgumentParser
 import Basics
 import Dispatch
-@_implementationOnly import DriverSupport
 import class Foundation.NSLock
 import class Foundation.ProcessInfo
 import PackageGraph
@@ -22,6 +21,12 @@ import PackageModel
 import SPMBuildCore
 import Workspace
 
+#if USE_IMPL_ONLY_IMPORTS
+@_implementationOnly import DriverSupport
+#else
+import DriverSupport
+#endif
+
 #if canImport(WinSDK)
 import WinSDK
 #elseif canImport(Darwin)

Sources/PackageCollectionsSigning/CertificatePolicy.swift

@@ -14,8 +14,14 @@ import Dispatch
 import Foundation
 
 import Basics
+
+#if USE_IMPL_ONLY_IMPORTS
 @_implementationOnly import SwiftASN1
 @_implementationOnly import X509
+#else
+import SwiftASN1
+import X509
+#endif
 
 public enum CertificatePolicyKey: Hashable, CustomStringConvertible {
     case `default`(subjectUserID: String? = nil, subjectOrganizationalUnit: String? = nil)

Sources/PackageCollectionsSigning/PackageCollectionSigning.swift

@@ -10,13 +10,21 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_implementationOnly import _CryptoExtras
+
 import Basics
-@_implementationOnly import Crypto
 import Dispatch
 import Foundation
 import PackageCollectionsModel
+
+#if USE_IMPL_ONLY_IMPORTS
+@_implementationOnly import _CryptoExtras
+@_implementationOnly import Crypto
 @_implementationOnly import X509
+#else
+import _CryptoExtras
+import Crypto
+import X509
+#endif
 
 public protocol PackageCollectionSigner {
     /// Signs package collection using the given certificate and key.

Sources/PackageCollectionsSigning/Signature.swift

@@ -25,9 +25,15 @@
 
 import Foundation
 
+#if USE_IMPL_ONLY_IMPORTS
 @_implementationOnly import _CryptoExtras
 @_implementationOnly import Crypto
 @_implementationOnly import X509
+#else
+import _CryptoExtras
+import Crypto
+import X509
+#endif
 
 // The logic in this source file loosely follows https://www.rfc-editor.org/rfc/rfc7515.html
 // for JSON Web Signature (JWS).

Sources/PackageCollectionsSigning/X509Extensions.swift

@@ -10,8 +10,13 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if USE_IMPL_ONLY_IMPORTS
 @_implementationOnly import SwiftASN1
 @_implementationOnly import X509
+#else
+import SwiftASN1
+import X509
+#endif
 
 extension Certificate {
     func hasExtension(oid: ASN1ObjectIdentifier) -> Bool {

Sources/PackageDescription/PackageDescriptionSerialization.swift

@@ -10,7 +10,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if USE_IMPL_ONLY_IMPORTS
 @_implementationOnly import Foundation
+#else
+import Foundation
+#endif
 
 enum Serialization {
     // MARK: - build settings serialization

Sources/PackageLoading/ContextModel.swift

@@ -10,7 +10,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if USE_IMPL_ONLY_IMPORTS
 @_implementationOnly import Foundation
+#else
+import Foundation
+#endif
 
 struct ContextModel {
     let packageDirectory : String

Sources/PackageLoading/ManifestJSONParser.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_implementationOnly import Foundation
+import Foundation
 import PackageModel
 
 import struct Basics.AbsolutePath