Merge pull request #26 from StarryInternet/sendable

Make all types Sendable

Author: klundberg

.github/workflows/ci.yml

@@ -41,7 +41,7 @@ jobs:
           set -o pipefail && xcodebuild \
            -scheme CombineCoreBluetooth \
            -workspace ./CombineCoreBluetooth.xcworkspace/ \
-           -destination "platform=iOS Simulator,OS=16.2,name=iPhone 14" \
+           -destination "platform=iOS Simulator,OS=latest,name=iPhone 14" \
            -sdk iphonesimulator \
            -enableCodeCoverage YES \
            -disableAutomaticPackageResolution \

CombineCoreBluetooth.xcodeproj/project.pbxproj

@@ -15,6 +15,7 @@
 		00371A0227EE588C00C2F766 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 00371A0127EE588C00C2F766 /* Preview Assets.xcassets */; };
 		00371A2327F02B1900C2F766 /* CentralView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00371A2227F02B1900C2F766 /* CentralView.swift */; };
 		00482BE828308A4D0053B7C1 /* PeripheralTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00482BE728308A4D0053B7C1 /* PeripheralTests.swift */; };
+		006CA40A2ACB7D2300DDA85D /* ConcurrencyExtras in Frameworks */ = {isa = PBXBuildFile; productRef = 006CA4092ACB7D2300DDA85D /* ConcurrencyExtras */; };
 		00CF0B78288DD73700FD88E1 /* PeripheralError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00CF0B77288DD73700FD88E1 /* PeripheralError.swift */; };
 		00D8C7432A69A6E20069EC00 /* PeripheralManagerError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00D8C7422A69A6E20069EC00 /* PeripheralManagerError.swift */; };
 		EB443FB927C6BDE10005CCEA /* Exports.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB443F9C27C6BDE00005CCEA /* Exports.swift */; };
@@ -66,7 +67,6 @@
 		00CF0B77288DD73700FD88E1 /* PeripheralError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PeripheralError.swift; sourceTree = "<group>"; };
 		00D8C7422A69A6E20069EC00 /* PeripheralManagerError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PeripheralManagerError.swift; sourceTree = "<group>"; };
 		EB443F8E27C6BCA70005CCEA /* CombineCoreBluetooth.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CombineCoreBluetooth.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		EB443F9927C6BDE00005CCEA /* CombineCoreBluetooth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CombineCoreBluetooth.h; sourceTree = "<group>"; };
 		EB443F9C27C6BDE00005CCEA /* Exports.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Exports.swift; sourceTree = "<group>"; };
 		EB443F9E27C6BDE00005CCEA /* Publisher+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Publisher+Extensions.swift"; sourceTree = "<group>"; };
 		EB443F9F27C6BDE00005CCEA /* Unimplemented.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Unimplemented.swift; sourceTree = "<group>"; };
@@ -116,6 +116,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				EB443FDD27C6C1940005CCEA /* CombineCoreBluetooth.framework in Frameworks */,
+				006CA40A2ACB7D2300DDA85D /* ConcurrencyExtras in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -169,7 +170,6 @@
 		EB443F9827C6BDE00005CCEA /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				EB443F9927C6BDE00005CCEA /* CombineCoreBluetooth.h */,
 				EB443F9A27C6BDE00005CCEA /* CombineCoreBluetooth */,
 			);
 			path = Sources;
@@ -346,6 +346,9 @@
 				EB443FDF27C6C1940005CCEA /* PBXTargetDependency */,
 			);
 			name = "CombineCoreBluetooth Tests";
+			packageProductDependencies = (
+				006CA4092ACB7D2300DDA85D /* ConcurrencyExtras */,
+			);
 			productName = "CombineCoreBluetooth-iOSTests";
 			productReference = EB443FD927C6C1940005CCEA /* CombineCoreBluetooth Tests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
@@ -380,6 +383,9 @@
 				Base,
 			);
 			mainGroup = EB443F8427C6BCA70005CCEA;
+			packageReferences = (
+				006CA4082ACB7D2300DDA85D /* XCRemoteSwiftPackageReference "swift-concurrency-extras" */,
+			);
 			productRefGroup = EB443F8F27C6BCA70005CCEA /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -617,6 +623,7 @@
 				SUPPORTS_MACCATALYST = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_STRICT_CONCURRENCY = complete;
 				TVOS_DEPLOYMENT_TARGET = 13.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -682,6 +689,7 @@
 				SUPPORTS_MACCATALYST = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_STRICT_CONCURRENCY = complete;
 				TVOS_DEPLOYMENT_TARGET = 13.0;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -827,11 +835,28 @@
 		};
 /* End XCConfigurationList section */
 
+/* Begin XCRemoteSwiftPackageReference section */
+		006CA4082ACB7D2300DDA85D /* XCRemoteSwiftPackageReference "swift-concurrency-extras" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/pointfreeco/swift-concurrency-extras.git";
+			requirement = {
+				kind = versionRange;
+				maximumVersion = 2.0.0;
+				minimumVersion = 0.1.0;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
 /* Begin XCSwiftPackageProductDependency section */
 		0014FFB127F0359600D2A122 /* CombineCoreBluetooth */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = CombineCoreBluetooth;
 		};
+		006CA4092ACB7D2300DDA85D /* ConcurrencyExtras */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 006CA4082ACB7D2300DDA85D /* XCRemoteSwiftPackageReference "swift-concurrency-extras" */;
+			productName = ConcurrencyExtras;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = EB443F8527C6BCA70005CCEA /* Project object */;

CombineCoreBluetooth.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,16 +1,8 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.6
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
-#if swift(>=5.6)
-let dependencies: [Package.Dependency] = [
-  .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
-]
-#else
-let dependencies: [Package.Dependency] = []
-#endif
-
 let package = Package(
   name: "CombineCoreBluetooth",
   platforms: [
@@ -25,15 +17,24 @@ let package = Package(
       targets: ["CombineCoreBluetooth"]
     ),
   ],
-  dependencies: dependencies,
+  dependencies: [
+    .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", "0.1.0"..<"2.0.0"),
+    .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0")
+  ],
   targets: [
     .target(
       name: "CombineCoreBluetooth",
-      dependencies: []
+      dependencies: [
+      ],
+      swiftSettings: [
+      ]
     ),
     .testTarget(
       name: "CombineCoreBluetoothTests",
-      dependencies: ["CombineCoreBluetooth"]
+      dependencies: [
+        "CombineCoreBluetooth",
+        .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
+      ]
     ),
   ]
 )

Package.resolved

@@ -10,8 +10,8 @@ CombineCoreBluetooth is a library that bridges Apple's `CoreBluetooth` framework
 ## Requirements:
 
 - iOS 13, tvOS 13, macOS 10.15, or watchOS 6
-- Xcode 12 or higher
-- Swift 5.3 or higher
+- Xcode 13.3 or higher
+- Swift 5.6 or higher
 
 ## Installation
 

Package.swift

@@ -1,11 +1,12 @@
 import Foundation
+@preconcurrency import CoreBluetooth
 
-public struct Central {
+public struct Central: Sendable {
   let rawValue: CBCentral?
 
   public let identifier: UUID
 
-  let _maximumUpdateValueLength: () -> Int
+  let _maximumUpdateValueLength: @Sendable () -> Int
 
   public var maximumUpdateValueLength: Int {
     _maximumUpdateValueLength()

README.md

@@ -1,4 +1,5 @@
 import Foundation
+@preconcurrency import CoreBluetooth
 
 extension Central {
   init(cbcentral: CBCentral) {

Sources/CombineCoreBluetooth.h

@@ -3,7 +3,7 @@ import Foundation
 extension Central {
   public static func unimplemented(
     identifier: UUID,
-    maximumUpdateValueLength: @escaping () -> Int = _Internal._unimplemented("maximumUpdateValueLength")
+    maximumUpdateValueLength: @escaping @Sendable () -> Int = _Internal._unimplemented("maximumUpdateValueLength")
   ) -> Self {
     return .init(
       rawValue: nil,