Address availability and compiler versions

Author: glessard

Package.swift

@@ -10,7 +10,7 @@ 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 of Span types
+    _Availability("FoundationSpan", availability: .future), // Availability of Span types
 ]
 let versionNumbers = ["0.1", "0.2", "0.3", "0.4", "6.0.2", "6.1", "6.2"]
 

README.md

@@ -18,7 +18,7 @@ On all other Swift platforms, `swift-foundation` is available as part of the too
 ## Building and Testing
 
 > [!NOTE]
-> Building swift-foundation requires the in-development Swift 6.0 toolchain. You can download the Swift 6.0 nightly toolchain from [the Swift website](https://swift.org/install).
+> Building swift-foundation requires the in-development Swift 6.2 toolchain. You can download the Swift 6.2 nightly toolchain from [the Swift website](https://swift.org/install).
 
 Before building Foundation, first ensure that you have a Swift toolchain installed. Next, check out the _Getting Started_ section of the [Foundation Build Process](Foundation_Build_Process.md#getting-started) guide for detailed steps on building and testing.
 

Sources/FoundationEssentials/Data/Data.swift

@@ -605,7 +605,9 @@ internal final class __DataStorage : @unchecked Sendable {
 
 @frozen
 @available(macOS 10.10, iOS 8.0, watchOS 2.0, tvOS 9.0, *)
+#if compiler(>=6.2)
 @_addressableForDependencies
+#endif
 public struct Data : Equatable, Hashable, RandomAccessCollection, MutableCollection, RangeReplaceableCollection, MutableDataProtocol, ContiguousBytes, Sendable {
 
     public typealias Index = Int
@@ -2201,7 +2203,6 @@ public struct Data : Equatable, Hashable, RandomAccessCollection, MutableCollect
         return try _representation.withUnsafeBytes(body)
     }
 
-#if compiler(>=6.2)
     @available(FoundationSpan 6.2, *)
     public var bytes: RawSpan {
         @lifetime(borrow self)
@@ -2297,7 +2298,6 @@ public struct Data : Equatable, Hashable, RandomAccessCollection, MutableCollect
 #endif
         }
     }
-#endif
 
     @_alwaysEmitIntoClient
     public func withContiguousStorageIfAvailable<ResultType>(_ body: (_ buffer: UnsafeBufferPointer<UInt8>) throws -> ResultType) rethrows -> ResultType? {
@@ -2971,7 +2971,6 @@ extension Data : Codable {
     }
 }
 
-#if compiler(>=6.2)
 // TODO: remove once _overrideLifetime is public in the standard library
 
 /// Unsafely discard any lifetime dependency on the `dependent` argument. Return
@@ -3028,4 +3027,3 @@ internal func _overrideLifetime<
   // should be expressed by a builtin that is hidden within the function body.
   dependent
 }
-#endif

Tests/FoundationEssentialsTests/DataTests.swift

@@ -1634,8 +1634,9 @@ class DataTests : XCTestCase {
         // source.advanced(by: 5)
     }
 
-    @available(FoundationSpan 6.2, *)
     func test_InlineDataSpan() throws {
+        guard #available(FoundationSpan 6.2, *) else { throw XCTSkip("Span not available") }
+
         var source = Data()
         var span = source.span
         XCTAssertTrue(span.isEmpty)
@@ -1647,16 +1648,18 @@ class DataTests : XCTestCase {
         XCTAssertEqual(span[0], 1)
     }
 
-    @available(FoundationSpan 6.2, *)
     func test_InlineSliceDataSpan() throws {
+        guard #available(FoundationSpan 6.2, *) else { throw XCTSkip("Span not available") }
+
         let source = Data(0 ... .max)
         let span = source.span
         XCTAssertEqual(span.count, source.count)
         XCTAssertEqual(span[span.indices.last!], .max)
     }
 
-    @available(FoundationSpan 6.2, *)
     func test_LargeSliceDataSpan() throws {
+        guard #available(FoundationSpan 6.2, *) else { throw XCTSkip("Span not available") }
+
 #if _pointerBitWidth(_64)
         let count = Int(Int32.max)
 #elseif _pointerBitWidth(_32)
@@ -1671,8 +1674,9 @@ class DataTests : XCTestCase {
         XCTAssertFalse(span.isEmpty)
     }
 
-    @available(FoundationSpan 6.2, *)
     func test_InlineDataMutableSpan() throws {
+        guard #available(FoundationSpan 6.2, *) else { throw XCTSkip("Span not available") }
+
         var source = Data()
         var span = source.mutableSpan
         XCTAssertTrue(span.isEmpty)
@@ -1688,8 +1692,9 @@ class DataTests : XCTestCase {
         XCTAssertEqual(source[i], v)
     }
 
-    @available(FoundationSpan 6.2, *)
     func test_InlineSliceDataMutableSpan() throws {
+        guard #available(FoundationSpan 6.2, *) else { throw XCTSkip("Span not available") }
+
         var source = Data(0..<100)
         let count = source.count
         var span = source.mutableSpan
@@ -1699,15 +1704,16 @@ class DataTests : XCTestCase {
         XCTAssertEqual(source[i], .max)
     }
 
-    @available(FoundationSpan 6.2, *)
     func test_LargeSliceDataMutableSpan() throws {
-  #if _pointerBitWidth(_64)
+        guard #available(FoundationSpan 6.2, *) else { throw XCTSkip("Span not available") }
+
+#if _pointerBitWidth(_64)
         var count = Int(Int32.max)
-  #elseif _pointerBitWidth(_32)
+#elseif _pointerBitWidth(_32)
         var count = Int(Int16.max)
-  #else
+#else
         #error("This test needs updating")
-  #endif
+#endif
 
         var source = Data(repeating: 0, count: count).dropFirst()
         XCTAssertNotEqual(source.startIndex, 0)
@@ -1720,8 +1726,9 @@ class DataTests : XCTestCase {
         XCTAssertEqual(source[i+1], .max)
     }
 
-    @available(FoundationSpan 6.2, *)
     func test_InlineDataMutableRawSpan() throws {
+        guard #available(FoundationSpan 6.2, *) else { throw XCTSkip("Span not available") }
+
         var source = Data()
         var span = source.mutableBytes
         XCTAssertTrue(span.isEmpty)
@@ -1737,8 +1744,9 @@ class DataTests : XCTestCase {
         XCTAssertEqual(source[i], v)
     }
 
-    @available(FoundationSpan 6.2, *)
     func test_InlineSliceDataMutableRawSpan() throws {
+        guard #available(FoundationSpan 6.2, *) else { throw XCTSkip("Span not available") }
+
         var source = Data(0..<100)
         let count = source.count
         var span = source.mutableBytes
@@ -1748,8 +1756,9 @@ class DataTests : XCTestCase {
         XCTAssertEqual(source[i], .max)
     }
 
-    @available(FoundationSpan 6.2, *)
     func test_LargeSliceDataMutableRawSpan() throws {
+        guard #available(FoundationSpan 6.2, *) else { throw XCTSkip("Span not available") }
+
 #if _pointerBitWidth(_64)
         var count = Int(Int32.max)
 #elseif _pointerBitWidth(_32)