Update availability macros for macOS 15 deployment target (#1397)

Author: jmschonfeld

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"
 }

Sources/FoundationEssentials/AttributedString/AttributedString+CharacterView.swift

@@ -123,7 +123,7 @@ extension AttributedString.CharacterView: BidirectionalCollection {
         return _defaultCount
     }
 
-    @available(FoundationPreview 0.1, *)
+    @available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
     @usableFromInline
     internal var _count: Int {
         _characters.count
@@ -153,7 +153,7 @@ extension AttributedString.CharacterView: BidirectionalCollection {
         return _defaultIndex(i, offsetBy: distance)
     }
 
-    @available(FoundationPreview 0.1, *)
+    @available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
     @usableFromInline
     internal func _index(_ i: AttributedString.Index, offsetBy distance: Int) -> AttributedString.Index {
         precondition(i >= startIndex && i <= endIndex, "AttributedString index out of bounds")
@@ -176,7 +176,7 @@ extension AttributedString.CharacterView: BidirectionalCollection {
         return _defaultIndex(i, offsetBy: distance, limitedBy: limit)
     }
 
-    @available(FoundationPreview 0.1, *)
+    @available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
     @usableFromInline
     internal func _index(
         _ i: AttributedString.Index,
@@ -207,7 +207,7 @@ extension AttributedString.CharacterView: BidirectionalCollection {
         return _defaultDistance(from: start, to: end)
     }
 
-    @available(FoundationPreview 0.1, *)
+    @available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
     @usableFromInline
     internal func _distance(from start: AttributedString.Index, to end: AttributedString.Index) -> Int {
         precondition(start >= startIndex && start <= endIndex, "AttributedString index out of bounds")

Sources/FoundationEssentials/AttributedString/AttributedString+Runs.swift

@@ -366,7 +366,7 @@ extension AttributedString.Runs: BidirectionalCollection {
     #endif
     }
 
-    @available(FoundationPreview 0.1, *)
+    @available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
     @usableFromInline
     internal func _index(_ index: Index, offsetBy distance: Int) -> Index {
         guard _isDiscontiguous else {

Sources/FoundationEssentials/AttributedString/AttributedString+UnicodeScalarView.swift

@@ -124,7 +124,7 @@ extension AttributedString.UnicodeScalarView: BidirectionalCollection {
         return _defaultCount
     }
 
-    @available(FoundationPreview 0.1, *)
+    @available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
     @usableFromInline
     internal var _count: Int {
         _unicodeScalars.count
@@ -165,7 +165,7 @@ extension AttributedString.UnicodeScalarView: BidirectionalCollection {
         return _defaultIndex(i, offsetBy: distance, limitedBy: limit)
     }
 
-    @available(FoundationPreview 0.1, *)
+    @available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
     @usableFromInline
     internal func _index(
         _ i: AttributedString.Index,

Sources/FoundationEssentials/AttributedString/Conversion.swift

@@ -41,7 +41,7 @@ extension String {
     }
     #endif
 
-    @available(FoundationPreview 0.1, *)
+    @available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
     @usableFromInline
     internal init(_characters: AttributedString.CharacterView) {
         self.init(_characters._characters)

Sources/FoundationEssentials/AttributedString/FoundationAttributes.swift

@@ -40,13 +40,13 @@ extension AttributeScopes {
         public let writingDirection: WritingDirectionAttribute
 
 #if FOUNDATION_FRAMEWORK
-        @available(FoundationPreview 0.1, *)
+        @available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
         public let agreementConcept: AgreementConceptAttribute
-        @available(FoundationPreview 0.1, *)
+        @available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
         public let agreementArgument: AgreementArgumentAttribute
-        @available(FoundationPreview 0.1, *)
+        @available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
         public let referentConcept: ReferentConceptAttribute
-        @available(FoundationPreview 0.4, *)
+        @available(macOS 15, iOS 18, tvOS 18, watchOS 11, *)
         public let localizedNumberFormat: LocalizedNumberFormatAttribute
 
         // TODO: Support AttributedString markdown in FoundationPreview: https://github.com/apple/swift-foundation/issues/44
@@ -119,23 +119,23 @@ extension AttributeScopes.FoundationAttributes {
 #if FOUNDATION_FRAMEWORK
 
     @frozen
-    @available(FoundationPreview 0.1, *)
+    @available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
     public enum ReferentConceptAttribute : CodableAttributedStringKey, MarkdownDecodableAttributedStringKey {
         public typealias Value = Int
         public static let name = NSAttributedString.Key.referentConcept.rawValue
         public static let markdownName = "referentConcept"
     }
 
     @frozen
-    @available(FoundationPreview 0.1, *)
+    @available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
     public enum AgreementConceptAttribute : CodableAttributedStringKey, MarkdownDecodableAttributedStringKey {
         public typealias Value = Int
         public static let name = NSAttributedString.Key.agreeWithConcept.rawValue
         public static let markdownName = "agreeWithConcept"
     }
 
     @frozen
-    @available(FoundationPreview 0.1, *)
+    @available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
     public enum AgreementArgumentAttribute : CodableAttributedStringKey, MarkdownDecodableAttributedStringKey {
         public typealias Value = Int
         public static let name = NSAttributedString.Key.agreeWithArgument.rawValue
@@ -168,7 +168,7 @@ extension AttributeScopes.FoundationAttributes {
     }
 
     @frozen
-    @available(FoundationPreview 0.4, *)
+    @available(macOS 15, iOS 18, tvOS 18, watchOS 11, *)
     public enum LocalizedNumberFormatAttribute : CodableAttributedStringKey, MarkdownDecodableAttributedStringKey {
         public struct Value: Equatable, Hashable, Codable, Sendable {
             enum Format {
@@ -851,7 +851,7 @@ extension AttributeScopes.FoundationAttributes.PersonNameComponentAttribute : Ob
     public typealias ObjectiveCValue = NSString
 }
 
-@available(FoundationPreview 0.4, *)
+@available(macOS 15, iOS 18, tvOS 18, watchOS 11, *)
 extension AttributeScopes.FoundationAttributes.LocalizedNumberFormatAttribute.Value: _ObjectiveCBridgeable {
     public func _bridgeToObjectiveC() -> __NSLocalizedNumberFormatRule {
         switch self.format {

Sources/FoundationEssentials/Calendar/Calendar.swift

@@ -323,10 +323,10 @@ public struct Calendar : Hashable, Equatable, Sendable {
         case nanosecond
         case calendar
         case timeZone
-        @available(FoundationPreview 0.1, *)
+        @available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
         case isLeapMonth
 
-        @available(FoundationPreview 0.4, *)
+        @available(macOS 15, iOS 18, tvOS 18, watchOS 11, *)
         case dayOfYear
 
         fileprivate var componentSetValue: ComponentSet.RawValue {
@@ -620,7 +620,7 @@ public struct Calendar : Hashable, Equatable, Sendable {
     /// - parameter value: The value of the specified component to add or subtract. The default value is `1`. The value can be negative, which causes subtraction.
     /// - parameter wrappingComponents: If `true`, the component should be incremented and wrap around to zero/one on overflow, and should not cause higher components to be incremented. The default value is `false`.
     /// - returns: A `Sequence` of `Date` values, or an empty sequence if no addition could be performed.
-    @available(FoundationPreview 0.4, *)
+    @available(macOS 15, iOS 18, tvOS 18, watchOS 11, *)
     public func dates(byAdding component: Calendar.Component,
                       value: Int = 1,
                       startingAt start: Date,
@@ -641,7 +641,7 @@ public struct Calendar : Hashable, Equatable, Sendable {
     /// - parameter components: The components to add or subtract.
     /// - parameter wrappingComponents: If `true`, the component should be incremented and wrap around to zero/one on overflow, and should not cause higher components to be incremented. The default value is `false`.
     /// - returns: A `Sequence` of `Date` values, or an empty sequence if no addition could be performed.
-    @available(FoundationPreview 0.4, *)
+    @available(macOS 15, iOS 18, tvOS 18, watchOS 11, *)
     public func dates(byAdding components: DateComponents,
                       startingAt start: Date,
                       in range: Range<Date>? = nil,
@@ -1222,7 +1222,7 @@ public struct Calendar : Hashable, Equatable, Sendable {
     /// - parameter matchingPolicy: Determines the behavior of the search algorithm when the input produces an ambiguous result.
     /// - parameter repeatedTimePolicy: Determines the behavior of the search algorithm when the input produces a time that occurs twice on a particular day.
     /// - parameter direction: Which direction in time to search. The default value is `.forward`, which means later in time.
-    @available(FoundationPreview 0.4, *)
+    @available(macOS 15, iOS 18, tvOS 18, watchOS 11, *)
     public func dates(byMatching components: DateComponents,
                       startingAt start: Date,
                       in range: Range<Date>? = nil,
@@ -1617,7 +1617,7 @@ package struct WeekendRange: Equatable, Hashable {
     }
 }
 
-@available(FoundationPreview 0.4, *)
+@available(macOS 15, iOS 18, tvOS 18, watchOS 11, *)
 extension Calendar.MatchingPolicy: Codable {
     public init(from decoder: Decoder) throws {
         let container = try decoder.singleValueContainer()
@@ -1650,7 +1650,7 @@ extension Calendar.MatchingPolicy: Codable {
     }
 }
 
-@available(FoundationPreview 0.4, *)
+@available(macOS 15, iOS 18, tvOS 18, watchOS 11, *)
 extension Calendar.RepeatedTimePolicy: Codable {
     public init(from decoder: Decoder) throws {
         let container = try decoder.singleValueContainer()

Sources/FoundationEssentials/Calendar/Calendar_Enumerate.swift

@@ -1580,7 +1580,7 @@ extension Calendar {
         return result
     }
 
-    @available(FoundationPreview 0.4, *)
+    @available(macOS 15, iOS 18, tvOS 18, watchOS 11, *)
     internal func dateAfterMatchingDayOfYear(startingAt: Date, components: DateComponents, direction: SearchDirection) throws -> Date? {
         guard let dayOfYear = components.dayOfYear else {
             // Nothing to do

Sources/FoundationEssentials/Calendar/DateComponents.swift

@@ -271,7 +271,7 @@ public struct DateComponents : Hashable, Equatable, Sendable {
     /// A day of the year.
     /// For example, in the Gregorian calendar, can go from 1 to 365 or 1 to 366 in leap years.
     /// - note: This value is interpreted in the context of the calendar in which it is used.
-    @available(FoundationPreview 0.4, *)
+    @available(macOS 15, iOS 18, tvOS 18, watchOS 11, *)
     public var dayOfYear: Int? {
         get { _dayOfYear }
         set { _dayOfYear = converted(newValue) }