Merge pull request swiftlang#1405 from swiftlang/automerge/merge-main-2025-07-07_09-01

Merge `main` into `release/6.2`

Author: parkera

Benchmarks/Benchmarks/Formatting/BenchmarkFormatting.swift

@@ -16,6 +16,7 @@ import Dispatch
 
 #if os(macOS) && USE_PACKAGE
 import FoundationEssentials
+import FoundationInternationalization
 #else
 import Foundation
 #endif

Benchmarks/Benchmarks/Internationalization/BenchmarkCalendar.swift

@@ -20,7 +20,8 @@ import FoundationInternationalization
 import Foundation
 #endif
 
-let benchmarks = {
+func calendarBenchmarks() {
+
     Benchmark.defaultConfiguration.maxIterations = 1_000
     Benchmark.defaultConfiguration.maxDuration = .seconds(3)
     Benchmark.defaultConfiguration.scalingFactor = .kilo
@@ -229,3 +230,4 @@ let benchmarks = {
         }
     }
 }
+

Benchmarks/Benchmarks/Internationalization/BenchmarkLocale.swift

@@ -20,7 +20,7 @@ import FoundationInternationalization
 import Foundation
 #endif
 
-let benchmarks = {
+func localeBenchmarks() {
     Benchmark.defaultConfiguration.maxIterations = 1_000
     Benchmark.defaultConfiguration.maxDuration = .seconds(3)
     Benchmark.defaultConfiguration.scalingFactor = .kilo

Benchmarks/Benchmarks/Internationalization/InternationalizationBenchmark.swift

@@ -0,0 +1,6 @@
+import Benchmark
+
+let benchmarks = {
+    calendarBenchmarks()
+    localeBenchmarks()
+}

Benchmarks/Benchmarks/String/BenchmarkString.swift

@@ -19,7 +19,7 @@ import FoundationEssentials
 import Foundation
 #endif
 
-#if !os(macOS)
+#if !FOUNDATION_FRAMEWORK
 private func autoreleasepool<T>(_ block: () -> T) -> T { block() }
 #endif
 
@@ -157,7 +157,7 @@ let benchmarks = {
     let str = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 
     Benchmark("read-utf8") { benchmark in
-        let rootURL = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true).appendingPathComponent(UUID().uuidString, isDirectory: true)
+        let rootURL = URL.temporaryDirectory.appendingPathComponent(UUID().uuidString, isDirectory: true)
         #if compiler(>=6)
         let fileURL = rootURL.appending(path: "benchmark.txt", directoryHint: .notDirectory)
         #else
@@ -178,7 +178,7 @@ let benchmarks = {
     }
 
     Benchmark("read-utf16") { benchmark in
-        let rootURL = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true).appendingPathComponent(UUID().uuidString, isDirectory: true)
+        let rootURL = URL.temporaryDirectory.appendingPathComponent(UUID().uuidString, isDirectory: true)
         #if compiler(>=6)
         let fileURL = rootURL.appending(path: "benchmark.txt", directoryHint: .notDirectory)
         #else

Benchmarks/Package.swift

@@ -54,7 +54,7 @@ print("swift-foundation benchmarks: \(usePackage.description)")
 var packageDependency : [Package.Dependency] = [.package(url: "https://github.com/ordo-one/package-benchmark.git", from: "1.11.1")]
 var targetDependency : [Target.Dependency] = [.product(name: "Benchmark", package: "package-benchmark")]
 var i18nTargetDependencies : [Target.Dependency] = []
-var swiftSettings : [SwiftSetting] = []
+var swiftSettings : [SwiftSetting] = [.unsafeFlags(["-Rmodule-loading"]), .enableUpcomingFeature("MemberImportVisibility")]
 
 switch usePackage {
     case .useLocalPackage(let root):

CMakeLists.txt

@@ -94,14 +94,11 @@ list(APPEND CMAKE_MODULE_PATH ${SwiftFoundation_SOURCE_DIR}/cmake/modules)
 
 # Availability Macros (only applies to FoundationEssentials and FoundationInternationalization)
 set(_SwiftFoundation_BaseAvailability "macOS 15, iOS 18, tvOS 18, watchOS 11")
+set(_SwiftFoundation_macOS26Availability "macOS 26, iOS 26, tvOS 26, watchOS 26")
 set(_SwiftFoundation_FutureAvailability "macOS 10000, iOS 10000, tvOS 10000, watchOS 10000")
 
 # All versions to define for each availability name
 list(APPEND _SwiftFoundation_versions
-    "0.1"
-    "0.2"
-    "0.3"
-    "0.4"
     "6.0.2"
     "6.1"
     "6.2"
@@ -110,16 +107,12 @@ list(APPEND _SwiftFoundation_versions
 # Each availability name to define
 list(APPEND _SwiftFoundation_availability_names
     "FoundationPreview"
-    "FoundationPredicate"
-    "FoundationPredicateRegex"
     "FoundationSpan")
 
 # The aligned availability for each name (in the same order)
 list(APPEND _SwiftFoundation_availability_releases
     ${_SwiftFoundation_BaseAvailability}
-    ${_SwiftFoundation_BaseAvailability}
-    ${_SwiftFoundation_BaseAvailability}
-    ${_SwiftFoundation_FutureAvailability})
+    ${_SwiftFoundation_macOS26Availability})
 
 foreach(version ${_SwiftFoundation_versions})
     foreach(name release IN ZIP_LISTS _SwiftFoundation_availability_names _SwiftFoundation_availability_releases)

Package.swift

@@ -7,17 +7,16 @@ import CompilerPluginSupport
 // Availability Macros
 
 let availabilityTags: [_Availability] = [
-    _Availability("FoundationPreview"), // Default FoundationPreview availability,
-    _Availability("FoundationPredicate"), // Predicate relies on pack parameter runtime support
-    _Availability("FoundationPredicateRegex"), // Predicate regexes rely on new stdlib APIs
-    _Availability("FoundationSpan", availability: .future), // Availability of Span types
+    _Availability("FoundationPreview"), // Default FoundationPreview availability
+    _Availability("FoundationSpan", availability: .macOS26), // Availability of Span types
 ]
-let versionNumbers = ["0.1", "0.2", "0.3", "0.4", "6.0.2", "6.1", "6.2"]
+let versionNumbers = ["6.0.2", "6.1", "6.2"]
 
 // Availability Macro Utilities
 
 enum _OSAvailability: String {
     case alwaysAvailable = "macOS 15, iOS 18, tvOS 18, watchOS 11" // This should match the package's deployment target
+    case macOS26 = "macOS 26, iOS 26, tvOS 26, watchOS 26"
     // Use 10000 for future availability to avoid compiler magic around the 9999 version number but ensure it is greater than 9999
     case future = "macOS 10000, iOS 10000, tvOS 10000, watchOS 10000"
 }