Skip to content

Swift 6 compatibility for Xcode 16 #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
superbigroach wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Swift 6 compatibility for Xcode 16 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e69e6c0
fix: update web3swift to allow 3.3.x for Swift 6 compatibility
Dec 1, 2025
9aa2a1b
fix: add try? to contract.method for Swift 6 compatibility
superbigroach Dec 1, 2025
a114a3b
fix: add try to throwing property access for Swift 6 compatibility
Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CircleModularWalletsCore/Sources/Helpers/Utils/Utils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public struct Utils {
abiJson: String,
args: [Any]) -> String? {
guard let contract = try? EthereumContract(abiJson),
let callData = contract.method(functionName, parameters: args, extraData: nil) else {
let callData = try? contract.method(functionName, parameters: args, extraData: nil) else {
logger.utils.notice("This abiJson cannot be parsed or the given contract method cannot be called with the given parameters")
return nil
}
Expand All @@ -94,7 +94,7 @@ public struct Utils {
signature: String,
webauthn: WebAuthnData) throws -> Bool {
do {
let rawClientData = webauthn.clientDataJSON.bytes
let rawClientData = try webauthn.clientDataJSON.bytes
let clientData = try JSONDecoder().decode(CollectedClientData.self, from: Data(rawClientData))
let rawAuthenticatorData = try HexUtils.hexToBytes(hex: webauthn.authenticatorData)
let authenticatorData = try AuthenticatorData(bytes: rawAuthenticatorData)
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/valpackett/SwiftCBOR.git", .upToNextMinor(from: "0.4.7")),
.package(url: "https://github.com/web3swift-team/web3swift.git", .upToNextMinor(from: "3.2.2"))
.package(url: "https://github.com/superbigroach/web3swift.git", .upToNextMajor(from: "3.2.2"))
],
targets: [
.target(
Expand Down