Merge branch 'future' into update-lifetimes-feature

Author: glessard

.github/workflows/automerge_to_future.yml

@@ -1,6 +1,8 @@
 name: Create PR to merge release branch into the main branch
 # At the end of a release cycle and the start of a new one, we may want to automatically forward all changes to the current branch (main) to the branch for the next release (future).
 # This workflow can be disabled earlier in the release cycle in the GitHub UI as described in https://docs.github.com/en/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/disabling-and-enabling-a-workflow
+permissions:
+  contents: read
 on:
   schedule:
     - cron: '0 9 * * *'

.github/workflows/automerge_to_main.yml

@@ -1,6 +1,8 @@
 name: Create PR to merge release branch into the main branch
 # At the end of a release cycle, we may want to automatically include all changes to release branches on the main branch to avoid the need for cherry-picking changes back to release branches
 # This workflow can be disabled earlier in the release cycle in the GitHub UI as described in https://docs.github.com/en/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/disabling-and-enabling-a-workflow
+permissions:
+  contents: read
 on:
   schedule:
     - cron: '0 9 * * *'

.github/workflows/automerge_to_release.yml

@@ -1,6 +1,8 @@
 name: Create PR to merge main into release branch
 # In the first period after branching the release branch, we typically want to include many changes from `main` in the release branch. This workflow automatically creates a PR every Monday to merge main into the release branch.
 # Later in the release cycle we should stop this practice to avoid landing risky changes by disabling this workflow. To do so, disable the workflow as described in https://docs.github.com/en/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/disabling-and-enabling-a-workflow
+permissions:
+  contents: read
 on:
   schedule:
     - cron: '0 9 * * MON'

.github/workflows/pull_request.yml

@@ -1,5 +1,8 @@
 name: Pull request
 
+permissions:
+  contents: read
+
 on:
   pull_request:
     types: [opened, reopened, synchronize]
@@ -19,6 +22,8 @@ jobs:
       macos_versions: '["sequoia"]'
       enable_wasm_sdk_build: true
       wasm_sdk_versions: '["nightly-main"]'
+      enable_android_sdk_build: true
+      android_sdk_versions: '["nightly-main"]'
 
   cmake_build:
     name: Build (CMake)

Benchmarks/Benchmarks/Internationalization/BenchmarkCalendar.swift

@@ -20,6 +20,13 @@ import FoundationInternationalization
 import Foundation
 #endif
 
+#if FOUNDATION_FRAMEWORK
+// FOUNDATION_FRAMEWORK has a scheme per benchmark file, so only include one benchmark here.
+let benchmarks = {
+    calendarBenchmarks()
+}
+#endif
+
 func calendarBenchmarks() {
 
     Benchmark.defaultConfiguration.maxIterations = 1_000
@@ -130,7 +137,6 @@ func calendarBenchmarks() {
     }
 
     // MARK: - Allocations
-
     let reference = Date(timeIntervalSince1970: 1474666555.0) //2016-09-23T14:35:55-0700
 
     let allocationsConfiguration = Benchmark.Configuration(
@@ -208,7 +214,6 @@ func calendarBenchmarks() {
             assert(identifier == "en_US")
         }
     }
-
     // MARK: - Identifiers
 
     Benchmark("identifierFromComponents", configuration: .init(scalingFactor: .mega)) { benchmark in

Benchmarks/Benchmarks/Internationalization/BenchmarkLocale.swift

@@ -20,6 +20,13 @@ import FoundationInternationalization
 import Foundation
 #endif
 
+#if FOUNDATION_FRAMEWORK
+// FOUNDATION_FRAMEWORK has a scheme per benchmark file, so only include one benchmark here.
+let benchmarks = {
+    localeBenchmarks()
+}
+#endif
+
 func localeBenchmarks() {
     Benchmark.defaultConfiguration.maxIterations = 1_000
     Benchmark.defaultConfiguration.maxDuration = .seconds(3)
@@ -57,4 +64,3 @@ func localeBenchmarks() {
         }
     }
 }
-

Benchmarks/Benchmarks/Internationalization/BenchmarkTimeZone.swift

@@ -0,0 +1,76 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2022-2023 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
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import Benchmark
+import func Benchmark.blackHole
+
+#if os(macOS) && USE_PACKAGE
+import FoundationEssentials
+import FoundationInternationalization
+#else
+import Foundation
+#endif
+
+#if FOUNDATION_FRAMEWORK
+// FOUNDATION_FRAMEWORK has a scheme per benchmark file, so only include one benchmark here.
+let benchmarks = {
+    timeZoneBenchmarks()
+}
+#endif
+
+let testDates = {
+    var now = Date.now
+    var dates: [Date] = []
+    for i in 0...10000 {
+        dates.append(Date(timeInterval: Double(i * 3600), since: now))
+    }
+    return dates
+}()
+
+func timeZoneBenchmarks() {
+
+    Benchmark.defaultConfiguration.maxIterations = 1_000
+    Benchmark.defaultConfiguration.maxDuration = .seconds(3)
+    Benchmark.defaultConfiguration.scalingFactor = .kilo
+    Benchmark.defaultConfiguration.metrics = [.cpuTotal, .mallocCountTotal, .throughput, .peakMemoryResident]
+
+    guard let t = TimeZone(identifier: "America/Los_Angeles") else {
+        fatalError("unexpected failure when creating time zone")
+    }
+
+    Benchmark("secondsFromGMT", configuration: .init(scalingFactor: .mega)) { benchmark in
+        for d in testDates {
+            let s = t.secondsFromGMT(for: d)
+            blackHole(s)
+        }
+    }
+
+    Benchmark("creatingTimeZones", configuration: .init(scalingFactor: .mega)) { benchmark in
+        for name in NSTimeZone.knownTimeZoneNames {
+            let t = TimeZone(identifier: name)
+            blackHole(t)
+        }
+    }
+
+    Benchmark("secondsFromGMT_manyTimeZones", configuration: .init(scalingFactor: .mega)) { benchmark in
+        for name in NSTimeZone.knownTimeZoneNames {
+            let t = TimeZone(identifier: name)!
+            for d in testDates {
+                let s = t.secondsFromGMT(for: d)
+                blackHole(s)
+            }
+            blackHole(t)
+        }
+    }
+}
+
+

Benchmarks/Benchmarks/Internationalization/InternationalizationBenchmark.swift

@@ -1,6 +1,10 @@
 import Benchmark
 
+
+#if os(macOS) && USE_PACKAGE
 let benchmarks = {
     calendarBenchmarks()
     localeBenchmarks()
+    timeZoneBenchmarks()
 }
+#endif

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: [