Merge branch 'main' into lifetime-attribute-revert-main

Author: glessard

.github/workflows/automerge_to_main.yml

@@ -13,7 +13,7 @@ jobs:
     uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@main
     with:
       base_branch: main
-      head_branch: release/6.2
+      head_branch: release/6.3
     permissions:
       contents: write
       pull-requests: write

.github/workflows/automerge_to_release.yml

@@ -12,7 +12,7 @@ jobs:
     name: Create PR to merge main into release branch
     uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@main
     with:
-      base_branch: release/6.2
+      base_branch: release/6.3
     permissions:
       contents: write
       pull-requests: write

CMakeLists.txt

@@ -102,6 +102,7 @@ list(APPEND _SwiftFoundation_versions
     "6.1"
     "6.2"
     "6.3"
+    "6.4"
     )
 
 # Each availability name to define

Package.swift

@@ -9,7 +9,7 @@ import CompilerPluginSupport
 let availabilityTags: [_Availability] = [
     _Availability("FoundationPreview"), // Default FoundationPreview availability
 ]
-let versionNumbers = ["6.0.2", "6.1", "6.2", "6.3"]
+let versionNumbers = ["6.0.2", "6.1", "6.2", "6.3", "6.4"]
 
 // Availability Macro Utilities
 
@@ -140,7 +140,8 @@ let package = Package(
             "ProcessInfo/CMakeLists.txt",
             "FileManager/CMakeLists.txt",
             "URL/CMakeLists.txt",
-            "NotificationCenter/CMakeLists.txt"
+            "NotificationCenter/CMakeLists.txt",
+            "ProgressManager/CMakeLists.txt",
           ],
           cSettings: [
             .define("_GNU_SOURCE", .when(platforms: [.linux]))
@@ -185,7 +186,7 @@ let package = Package(
                 "Locale/CMakeLists.txt",
                 "Calendar/CMakeLists.txt",
                 "CMakeLists.txt",
-                "Predicate/CMakeLists.txt"
+                "Predicate/CMakeLists.txt",
             ],
             cSettings: wasiLibcCSettings,
             swiftSettings: [

Sources/FoundationEssentials/AttributedString/AttributeScope.swift

@@ -17,7 +17,7 @@
 // }
 // An AttributeScope can contain other scopes as well.
 @available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
-public protocol AttributeScope : DecodingConfigurationProviding, EncodingConfigurationProviding {
+public protocol AttributeScope : DecodingConfigurationProviding, EncodingConfigurationProviding, SendableMetatype {
     static var decodingConfiguration: AttributeScopeCodableConfiguration { get }
     static var encodingConfiguration: AttributeScopeCodableConfiguration { get }
 }

Sources/FoundationEssentials/AttributedString/AttributedStringAttribute.swift

@@ -95,7 +95,7 @@ extension AttributedString {
 
 // Developers define new attributes by implementing AttributeKey.
 @available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
-public protocol AttributedStringKey {
+public protocol AttributedStringKey : SendableMetatype {
     associatedtype Value : Hashable
     static var name : String { get }
 

Sources/FoundationEssentials/CMakeLists.txt

@@ -27,6 +27,7 @@ add_library(FoundationEssentials
     Logging.swift
     OutputBuffer.swift
     Platform.swift
+    Progress+Stub.swift
     SortComparator.swift
     UUID_Wrappers.swift
     UUID.swift
@@ -45,6 +46,7 @@ add_subdirectory(Locale)
 add_subdirectory(NotificationCenter)
 add_subdirectory(Predicate)
 add_subdirectory(ProcessInfo)
+add_subdirectory(ProgressManager)
 add_subdirectory(PropertyList)
 add_subdirectory(String)
 add_subdirectory(TimeZone)

Sources/FoundationEssentials/Data/CMakeLists.txt

@@ -2,7 +2,7 @@
 ##
 ## This source file is part of the Swift open source project
 ##
-## Copyright (c) 2024 Apple Inc. and the Swift project authors
+## Copyright (c) 2024-2025 Apple Inc. and the Swift project authors
 ## Licensed under Apache License v2.0
 ##
 ## See LICENSE.txt for license information
@@ -13,13 +13,23 @@
 ##===----------------------------------------------------------------------===##
 
 target_sources(FoundationEssentials PRIVATE
+    Representations/Data+Inline.swift
+    Representations/Data+InlineSlice.swift
+    Representations/Data+LargeSlice.swift
+    Representations/Data+Representation.swift
+    Representations/DataStorage.swift
+    
     Collections+DataProtocol.swift
     ContiguousBytes.swift
+    Data.swift
     Data+Base64.swift
+    Data+Bridging.swift
+    Data+Deprecated.swift
     Data+Error.swift
+    Data+Iterator.swift
     Data+Reading.swift
-    Data+Stub.swift
+    Data+Searching.swift
     Data+Writing.swift
-    Data.swift
     DataProtocol.swift
+    PathOrURL.swift
     Pointers+DataProtocol.swift)

Sources/FoundationEssentials/Data/ContiguousBytes.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2018 Apple Inc. and the Swift project authors
+// Copyright (c) 2018-2025 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
@@ -39,6 +39,9 @@ extension ArraySlice : ContiguousBytes where Element == UInt8 { }
 @available(macOS 10.10, iOS 8.0, watchOS 2.0, tvOS 9.0, *)
 extension ContiguousArray : ContiguousBytes where Element == UInt8 { }
 
+@available(macOS 10.10, iOS 8.0, watchOS 2.0, tvOS 9.0, *)
+extension Data : ContiguousBytes { }
+
 //===--- Pointer Conformances ---------------------------------------------===//
 
 @available(macOS 10.10, iOS 8.0, watchOS 2.0, tvOS 9.0, *)

Sources/FoundationEssentials/Data/Data+Base64.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2023-2024 Apple Inc. and the Swift project authors
+// Copyright (c) 2023-2025 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
@@ -25,6 +25,56 @@ import WinSDK
 import WASILibc
 #endif
 
+#if !FOUNDATION_FRAMEWORK
+extension Data {
+    
+    @available(macOS 10.10, iOS 8.0, watchOS 2.0, tvOS 9.0, *)
+    public struct Base64EncodingOptions : OptionSet, Sendable {
+        public let rawValue: UInt
+        
+        public init(rawValue: UInt) {
+            self.rawValue = rawValue
+        }
+        /// Set the maximum line length to 64 characters, after which a line ending is inserted.
+        public static let lineLength64Characters = Base64EncodingOptions(rawValue: 1 << 0)
+        /// Set the maximum line length to 76 characters, after which a line ending is inserted.
+        public static let lineLength76Characters = Base64EncodingOptions(rawValue: 1 << 1)
+        /// When a maximum line length is set, specify that the line ending to insert should include a carriage return.
+        public static let endLineWithCarriageReturn = Base64EncodingOptions(rawValue: 1 << 4)
+        /// When a maximum line length is set, specify that the line ending to insert should include a line feed.
+        public static let endLineWithLineFeed       = Base64EncodingOptions(rawValue: 1 << 5)
+    }
+    
+    @available(macOS 10.10, iOS 8.0, watchOS 2.0, tvOS 9.0, *)
+    public struct Base64DecodingOptions : OptionSet, Sendable {
+        public let rawValue: UInt
+        
+        public init(rawValue: UInt) {
+            self.rawValue = rawValue
+        }
+        /// Modify the decoding algorithm so that it ignores unknown non-Base-64 bytes, including line ending characters.
+        public static let ignoreUnknownCharacters = Base64DecodingOptions(rawValue: 1 << 0)
+    }
+}
+#else
+@available(macOS 10.10, iOS 8.0, watchOS 2.0, tvOS 9.0, *)
+extension Data {
+    // These types are typealiased to the `NSData` options for framework builds only.
+    public typealias Base64EncodingOptions = NSData.Base64EncodingOptions
+    public typealias Base64DecodingOptions = NSData.Base64DecodingOptions
+}
+#endif //!FOUNDATION_FRAMEWORK
+
+extension Data.Base64EncodingOptions {
+    /// Use the base64url alphabet to encode the data
+    @available(FoundationPreview 6.3, *)
+    public static let base64URLAlphabet = Self(rawValue: 1 << 6)
+    
+    /// Omit the `=` padding characters in the end of the base64 encoded result
+    @available(FoundationPreview 6.3, *)
+    public static let omitPaddingCharacter = Self(rawValue: 1 << 7)
+}
+
 @available(macOS 10.10, iOS 8.0, watchOS 2.0, tvOS 9.0, *)
 extension Data {