Merge pull request #1 from swhitty/swift-5.10

Swift 5.10

Author: swhitty

.github/workflows/build.yml

@@ -6,13 +6,13 @@ on:
   workflow_dispatch:
 
 jobs:
-  xcode_14_3:
-    runs-on: macos-13
+  xcode_15_2:
+    runs-on: macos-14
     env:
-      DEVELOPER_DIR: /Applications/Xcode_14.3.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Version
         run: swift --version
       - name: Build
@@ -22,30 +22,44 @@ jobs:
       - name: Gather code coverage
         run: xcrun llvm-cov export -format="lcov" .build/debug/AllocatedLockPackageTests.xctest/Contents/MacOS/AllocatedLockPackageTests -instr-profile .build/debug/codecov/default.profdata > coverage_report.lcov
       - name: Upload Coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage_report.lcov
 
-  xcode_14_2:
-    runs-on: macos-12
+  xcode_14_3_1:
+    runs-on: macos-13
     env:
-      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Version
+        run: swift --version
+      - name: Build
+        run: swift build --build-tests
+      - name: Test
+        run: swift test
+
+  linux_swift_5_10:
+    runs-on: ubuntu-latest
+    container: swift:5.8
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Version
         run: swift --version
       - name: Build
         run: swift build --build-tests
       - name: Test
         run: swift test --skip-build
 
-  linux_swift_5_7:
+  linux_swift_5_9:
     runs-on: ubuntu-latest
-    container: swift:5.7
+    container: swift:5.8
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Version
         run: swift --version
       - name: Build
@@ -58,7 +72,20 @@ jobs:
     container: swift:5.8
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+      - name: Version
+        run: swift --version
+      - name: Build
+        run: swift build --build-tests
+      - name: Test
+        run: swift test --skip-build
+
+  linux_swift_5_7:
+    runs-on: ubuntu-latest
+    container: swift:5.7
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
       - name: Version
         run: swift --version
       - name: Build

[email protected]

@@ -0,0 +1,38 @@
+// swift-tools-version:5.8
+
+import PackageDescription
+
+let package = Package(
+    name: "AllocatedLock",
+    platforms: [
+ 	   .macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6)
+    ],
+    products: [
+        .library(
+            name: "AllocatedLock",
+            targets: ["AllocatedLock"]
+        )
+    ],
+    targets: [
+        .target(
+            name: "AllocatedLock",
+            path: "Sources",
+            swiftSettings: .upcomingFeatures
+        ),
+        .testTarget(
+            name: "AllocatedLockTests",
+            dependencies: ["AllocatedLock"],
+            path: "Tests",
+            swiftSettings: .upcomingFeatures
+        )
+    ]
+)
+
+extension Array where Element == SwiftSetting {
+
+    static var upcomingFeatures: [SwiftSetting] {
+        [
+            .enableExperimentalFeature("StrictConcurrency")
+        ]
+    }
+}

README.md

@@ -1,7 +1,7 @@
 [![Build](https://github.com/swhitty/AllocatedLock/actions/workflows/build.yml/badge.svg)](https://github.com/swhitty/AllocatedLock/actions/workflows/build.yml)
 [![Codecov](https://codecov.io/gh/swhitty/AllocatedLock/graphs/badge.svg)](https://codecov.io/gh/swhitty/AllocatedLock)
 [![Platforms](https://img.shields.io/badge/platforms-iOS%20|%20Mac%20|%20tvOS%20|%20Linux%20|%20Windows-lightgray.svg)](https://github.com/swhitty/AllocatedLock/blob/main/Package.swift)
-[![Swift 5.8](https://img.shields.io/badge/swift-5.7%20–%205.8-red.svg?style=flat)](https://developer.apple.com/swift)
+[![Swift 5.10](https://img.shields.io/badge/swift-5.7%20–%205.10-red.svg?style=flat)](https://developer.apple.com/swift)
 [![License](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://opensource.org/licenses/MIT)
 [![Twitter](https://img.shields.io/badge/[email protected])](http://twitter.com/simonwhitty)
 

Sources/AllocatedLock.swift

@@ -31,10 +31,6 @@
 
 // Backports the Swift interface around os_unfair_lock_t available in recent Darwin platforms
 //
-@available(iOS, deprecated: 16.0, message: "use OSAllocatedUnfairLock directly")
-@available(tvOS, deprecated: 16.0, message: "use OSAllocatedUnfairLock directly")
-@available(watchOS, deprecated: 9, message: "use OSAllocatedUnfairLock directly")
-@available(macOS, deprecated: 13.0, message: "use OSAllocatedUnfairLock directly")
 public struct AllocatedLock<State>: @unchecked Sendable {
 
     @usableFromInline
@@ -78,7 +74,10 @@ public extension AllocatedLock where State == Void {
 
 #if canImport(Darwin)
 
-@_implementationOnly import os
+import struct os.os_unfair_lock_t
+import struct os.os_unfair_lock
+import func os.os_unfair_lock_lock
+import func os.os_unfair_lock_unlock
 
 extension AllocatedLock {
     @usableFromInline

Tests/AllocatedLockTests.swift

@@ -56,16 +56,17 @@ final class AllocatedLockTests: XCTestCase {
         XCTAssertTrue(value)
     }
 
-    @MainActor
     func testLock_Blocks() async {
         let lock = AllocatedLock()
-        lock.unsafeLock()
 
-        Task {
+        Task { @MainActor in
+            lock.unsafeLock()
             try? await Task.sleep(nanoseconds: 1_000_000_000)
             lock.unsafeUnlock()
         }
 
+        try? await Task.sleep(nanoseconds: 500_000)
+
         let results = await withTaskGroup(of: Bool.self) { group in
             group.addTask {
                 try? await Task.sleep(nanoseconds: 5_000_000)