Skip to content

Commit

Permalink
Sendable Swift Types (#44)
Browse files Browse the repository at this point in the history
  • Loading branch information
@CyonAlexRDX
CyonAlexRDX authored Mar 27, 2024
1 parent d2f1495 commit d85164e
Show file tree
Hide file tree
Showing 56 changed files with 10 additions and 56 deletions.
11 changes: 9 additions & 2 deletions Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@

import PackageDescription

let swiftSettings: [SwiftSetting] = [
.enableExperimentalFeature("StrictConcurrency"),
.unsafeFlags(["-warnings-as-errors"])
]

let sargonBinaryTargetName = "SargonCoreRS"
let binaryTarget: Target
let useLocalFramework = true
Expand Down Expand Up @@ -49,15 +54,17 @@ let package = Package(
.target(
name: "Sargon",
dependencies: [.target(name: "SargonUniFFI")],
path: "apple/Sources/Sargon"
path: "apple/Sources/Sargon",
swiftSettings: swiftSettings
),
.testTarget(
name: "SargonTests",
dependencies: [
.target(name: "Sargon"),
.product(name: "CustomDump", package: "swift-custom-dump"),
],
path: "apple/Tests"
path: "apple/Tests",
swiftSettings: swiftSettings
),
]
)
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Address/AccessControllerAddress+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension AccessControllerAddress: @unchecked Sendable {}
extension AccessControllerAddress: AddressProtocol {}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Address/AccountAddress+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension AccountAddress: @unchecked Sendable {}
extension AccountAddress: EntityAddressProtocol {}
1 change: 0 additions & 1 deletion ...e/Sources/Sargon/Extensions/Swiftified/Address/AddressOfAccountOrPersona+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension AddressOfAccountOrPersona: @unchecked Sendable {}
extension AddressOfAccountOrPersona: AddressProtocol {}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Address/ComponentAddress+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension ComponentAddress: @unchecked Sendable {}
extension ComponentAddress: AddressProtocol {}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Address/IdentityAddress+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension IdentityAddress: @unchecked Sendable {}
extension IdentityAddress: EntityAddressProtocol {}
1 change: 0 additions & 1 deletion ...Sources/Sargon/Extensions/Swiftified/Address/LegacyOlympiaAccountAddress+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension LegacyOlympiaAccountAddress: @unchecked Sendable {}
extension LegacyOlympiaAccountAddress: BaseAddressProtocol {}
1 change: 0 additions & 1 deletion .../Sources/Sargon/Extensions/Swiftified/Address/NonFungibleResourceAddress+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension NonFungibleResourceAddress: @unchecked Sendable {}
extension NonFungibleResourceAddress: AddressProtocol {}

extension NonFungibleResourceAddress {
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Address/PackageAddress+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension PackageAddress: @unchecked Sendable {}
extension PackageAddress: AddressProtocol {}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Address/PoolAddress+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension PoolAddress: @unchecked Sendable {}
extension PoolAddress: AddressProtocol {}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Address/ResourceAddress+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension ResourceAddress: @unchecked Sendable {}
extension ResourceAddress: AddressProtocol {}

extension ResourceAddress {
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Address/ValidatorAddress+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension ValidatorAddress: @unchecked Sendable {}
extension ValidatorAddress: AddressProtocol {}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Address/VaultAddress+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension VaultAddress: @unchecked Sendable {}
extension VaultAddress: AddressProtocol {}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Crypto/Derivation/AccountPath+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension AccountPath: @unchecked Sendable {}
extension AccountPath: SargonModel, CAP26PathProtocol {}

extension AccountPath {
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Crypto/Derivation/BIP44LikePath+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
public typealias BIP44LikePath = Bip44LikePath

extension BIP44LikePath: @unchecked Sendable {}
extension BIP44LikePath: SargonModel, HDPathProtocol {}

extension BIP44LikePath: CustomStringConvertible {
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Crypto/Derivation/CAP26Path+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
public typealias CAP26Path = Cap26Path

extension CAP26Path: @unchecked Sendable {}
extension CAP26Path: SargonModel, CAP26PathProtocol {
public func embed() -> CAP26Path {
self
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Crypto/Derivation/GetIDPath+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
public typealias GetIDPath = GetIdPath

extension GetIDPath: @unchecked Sendable {}
extension GetIDPath {
public static let `default`: Self = defaultGetIdPath()
}
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Crypto/Derivation/IdentityPath+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension IdentityPath: @unchecked Sendable {}
extension IdentityPath: SargonModel, CAP26PathProtocol {}

extension IdentityPath {
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Crypto/Derivation/Mnemonic+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension Mnemonic: @unchecked Sendable {}
extension Mnemonic: SargonModel {}

extension Mnemonic: CustomStringConvertible {
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Crypto/Hash/Hash+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension Hash: @unchecked Sendable {}
extension Hash: SargonModel {}

extension Hash {
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Crypto/Hash/IntentHash+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension IntentHash: @unchecked Sendable {}
extension IntentHash: SargonModel {}

extension IntentHash: CustomStringConvertible {
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Crypto/Hash/PublicKeyHash+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension PublicKeyHash: @unchecked Sendable {}
extension PublicKeyHash: SargonModel {}

extension PublicKeyHash {
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Crypto/Hash/SignedIntentHash+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension SignedIntentHash: @unchecked Sendable {}
extension SignedIntentHash: SargonModel {}

extension SignedIntentHash: CustomStringConvertible {
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Crypto/Keys/Ed25519PublicKey+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension Ed25519PublicKey: @unchecked Sendable {}
extension Ed25519PublicKey: PublicKeyProtocol {}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Crypto/Keys/PublicKey+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension PublicKey: @unchecked Sendable {}
extension PublicKey: PublicKeyProtocol {}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Crypto/Keys/Secp256k1PublicKey+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension Secp256k1PublicKey: @unchecked Sendable {}
extension Secp256k1PublicKey: PublicKeyProtocol {}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Crypto/Nonce+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension Nonce: @unchecked Sendable {}
extension Nonce: SargonModel {}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Crypto/SignatureWithPublicKey+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension SignatureWithPublicKey: @unchecked Sendable {}
extension SignatureWithPublicKey: SargonModel {}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Prelude/Bytes/Exactly29Bytes+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension Exactly29Bytes: @unchecked Sendable {}
extension Exactly29Bytes: ExactlyNBytesProtocol {
public static let length = 29
}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Prelude/Bytes/Exactly32Bytes+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension Exactly32Bytes: @unchecked Sendable {}
extension Exactly32Bytes: ExactlyNBytesProtocol {
public static let length = 32
}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Prelude/Bytes/Exactly33Bytes+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension Exactly33Bytes: @unchecked Sendable {}
extension Exactly33Bytes: ExactlyNBytesProtocol {
public static let length = 33
}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Prelude/Bytes/Exactly64Bytes+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension Exactly64Bytes: @unchecked Sendable {}
extension Exactly64Bytes: ExactlyNBytesProtocol {
public static let length = 64
}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Prelude/Bytes/Exactly65Bytes+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension Exactly65Bytes: @unchecked Sendable {}
extension Exactly65Bytes: ExactlyNBytesProtocol {
public static let length = 65
}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Prelude/Decimal192+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension Decimal192: @unchecked Sendable {}
extension Decimal192: SargonModel {}

#if DEBUG
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Prelude/DisplayName+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension DisplayName: @unchecked Sendable {}
extension DisplayName: SargonModel {}

extension DisplayName: CustomStringConvertible {
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Prelude/LocaleConfig+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension LocaleConfig: @unchecked Sendable {}
extension LocaleConfig {
public init(locale: Locale) {
self.init(
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Prelude/NetworkID+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
public typealias NetworkID = NetworkId

extension NetworkID: @unchecked Sendable {}
extension NetworkID: SargonModel {}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Prelude/NonFungibleGlobalID+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
public typealias NonFungibleGlobalID = NonFungibleGlobalId
extension NonFungibleGlobalID: @unchecked Sendable {}
extension NonFungibleGlobalID: SargonModel {}

extension NonFungibleGlobalID {
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Prelude/NonFungibleLocalID+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
public typealias NonFungibleLocalID = NonFungibleLocalId

extension NonFungibleLocalID: @unchecked Sendable {}
extension NonFungibleLocalID: SargonModel {}

extension NonFungibleLocalID: CustomStringConvertible {
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Prelude/NonFungibleLocalIDString+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
public typealias NonFungibleLocalIDString = NonFungibleLocalIdString
extension NonFungibleLocalIDString: @unchecked Sendable {}
extension NonFungibleLocalIDString: SargonModel {}

#if DEBUG
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Prelude/SargonBuildInformation+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension SargonBuildInformation: @unchecked Sendable {}
extension SargonBuildInformation: SargonModel {}

extension SargonBuildInformation {
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Prelude/SargonError+Swiftified.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@
import Foundation

public typealias SargonError = CommonError
extension SargonError: @unchecked Sendable {}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Profile/Account/Account+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension Account: @unchecked Sendable {}
extension Account: EntityProtocol {}

extension Account {
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Profile/Account/AppearanceID+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
public typealias AppearanceID = AppearanceId

extension AppearanceID: @unchecked Sendable {}
extension AppearanceID: SargonModel {}
extension AppearanceID: Identifiable {
public typealias ID = UInt8
Expand Down
1 change: 0 additions & 1 deletion .../Sources/Sargon/Extensions/Swiftified/Profile/Account/ThirdPartyDeposits+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension ThirdPartyDeposits: @unchecked Sendable {}
extension ThirdPartyDeposits: SargonModel {}
1 change: 0 additions & 1 deletion ...es/Sargon/Extensions/Swiftified/Profile/Factor/FactorSource/FactorSource+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension FactorSource: @unchecked Sendable {}
extension FactorSource: SargonModel {}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Profile/Profile+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension Profile: @unchecked Sendable {}
extension Profile: SargonModel {}

extension Profile: Identifiable {
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/RET/Blob+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension Blob: @unchecked Sendable {}
extension Blob: SargonModel {}

extension Blob: CustomStringConvertible {
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/RET/Blobs+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension Blobs: @unchecked Sendable {}
extension Blobs: SargonModel {}

extension Blobs: ExpressibleByArrayLiteral {
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/RET/IntentSignature+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension IntentSignature: @unchecked Sendable {}
extension IntentSignature: SargonModel {}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/RET/SignedIntent+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
extension SignedIntent: @unchecked Sendable {}
extension SignedIntent: SargonModel {}

1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/RET/TransactionManifest+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension TransactionManifest: @unchecked Sendable {}
extension TransactionManifest: SargonModel {}

// MARK: Build Manifest
Expand Down
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Transaction/PerAssetTransfers+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension PerAssetTransfers: @unchecked Sendable {}
extension PerAssetTransfers: SargonModel {}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Transaction/StakeClaim+Swiftified.swift
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extension StakeClaim: @unchecked Sendable {}
extension StakeClaim: SargonModel {}
1 change: 0 additions & 1 deletion apple/Sources/Sargon/Extensions/Swiftified/Wallet+Swiftified.swift
View file

This file was deleted.

1 change: 1 addition & 0 deletions uniffi.toml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[bindings.swift]
module_name = "Sargon"
experimental_sendable_value_types = true

[bindings.kotlin]
package_name = "com.radixdlt.sargon"
Expand Down

0 comments on commit d85164e

Please sign in to comment.