Skip to content

Commit ce57b79

Browse files
authored
chore: ci
1 parent 8deaa00 commit ce57b79

File tree

9 files changed

+23
-16
lines changed

9 files changed

+23
-16
lines changed

.github/workflows/ios.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ on:
99
jobs:
1010
build:
1111
name: Build and Test default scheme using any available iPhone simulator
12-
runs-on: macos-14
12+
runs-on: macos-15
1313

1414
steps:
1515
- name: Checkout
1616
uses: actions/checkout@v3
1717
- name: Select Xcode Version
18-
run: sudo xcode-select -switch /Applications/Xcode_15.4.app
18+
run: sudo xcode-select -switch /Applications/Xcode_16.3.app
1919
- name: Set Default Scheme
2020
run: |
2121
scheme_list=$(xcodebuild -list -json | tr -d "\n")
@@ -25,6 +25,6 @@ jobs:
2525
- name: List Devices
2626
run: xcrun xctrace list devices 2>&1
2727
- name: Build
28-
run: xcodebuild build-for-testing -scheme BDKSwiftExampleWallet -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5'
28+
run: xcodebuild build-for-testing -scheme BDKSwiftExampleWallet -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16,OS=18.4'
2929
- name: Run tests
30-
run: xcodebuild test-without-building -scheme BDKSwiftExampleWallet -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5'
30+
run: xcodebuild test-without-building -scheme BDKSwiftExampleWallet -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16,OS=18.4'

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,10 @@ fastlane/test_output
9090
iOSInjectionProject/
9191

9292
# Other
93-
.DS_Store
93+
.DS_Store
94+
95+
# Xcode Source Packages (SPM)
96+
SourcePackages/
97+
98+
# VS Code specific
99+
.vscode/

BDKSwiftExampleWallet/Extensions/BDK+Extensions/Amount+Extensions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import BitcoinDevKit
99
import Foundation
1010

11-
extension Amount: Equatable {
11+
extension Amount: @retroactive Equatable {
1212
public static func == (lhs: Amount, rhs: Amount) -> Bool {
1313
return lhs.toSat() == rhs.toSat()
1414
}

BDKSwiftExampleWallet/Extensions/BDK+Extensions/Balance+Extensions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import BitcoinDevKit
99
import Foundation
1010

11-
extension Balance: Equatable {
11+
extension Balance: @retroactive Equatable {
1212
public static func == (lhs: Balance, rhs: Balance) -> Bool {
1313
return lhs.immature == rhs.immature && lhs.trustedPending == rhs.trustedPending
1414
&& lhs.untrustedPending == rhs.untrustedPending && lhs.confirmed == rhs.confirmed

BDKSwiftExampleWallet/Extensions/BDK+Extensions/Connection+Extensions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ extension Connection {
99
if FileManager.default.fileExists(atPath: walletDataDirectoryURL.path) {
1010
try FileManager.default.removeItem(at: walletDataDirectoryURL)
1111
}
12-
12+
1313
try FileManager.default.ensureDirectoryExists(at: walletDataDirectoryURL)
1414
try FileManager.default.removeOldFlatFileIfNeeded(at: documentsDirectoryURL)
1515
let persistenceBackendPath = walletDataDirectoryURL.appendingPathComponent("wallet.sqlite")

BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,13 @@ private class BDKService {
9292
let localOutputs = wallet.listUnspent()
9393
return localOutputs
9494
}
95-
95+
9696
func createWallet(words: String?) throws {
9797
self.connection = try Connection.createConnection()
9898
guard let connection = connection else {
9999
throw WalletError.dbNotFound
100100
}
101-
101+
102102
let savedURL = try? keyClient.getEsploraURL()
103103
let baseUrl = savedURL ?? network.url
104104

@@ -138,7 +138,7 @@ private class BDKService {
138138
try keyClient.saveEsploraURL(baseUrl)
139139
self.esploraURL = baseUrl
140140
updateEsploraClient()
141-
141+
142142
let wallet = try Wallet(
143143
descriptor: descriptor,
144144
changeDescriptor: changeDescriptor,
@@ -153,7 +153,7 @@ private class BDKService {
153153
guard let connection = connection else {
154154
throw WalletError.dbNotFound
155155
}
156-
156+
157157
let savedURL = try? keyClient.getEsploraURL()
158158
let baseUrl = savedURL ?? network.url
159159

@@ -208,7 +208,7 @@ private class BDKService {
208208
guard let connection = connection else {
209209
throw WalletError.dbNotFound
210210
}
211-
211+
212212
let savedURL = try? keyClient.getEsploraURL()
213213

214214
let baseUrl = savedURL ?? network.url
@@ -243,7 +243,7 @@ private class BDKService {
243243
try keyClient.saveEsploraURL(baseUrl)
244244
self.esploraURL = baseUrl
245245
updateEsploraClient()
246-
246+
247247
let wallet = try Wallet(
248248
descriptor: descriptor,
249249
changeDescriptor: changeDescriptor,

BDKSwiftExampleWallet/Utilities/Constants.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
// Created by Matthew Ramsden on 6/4/23.
66
//
77

8+
import BitcoinDevKit
89
import Foundation
910
import SwiftUI
10-
import BitcoinDevKit
1111

1212
struct Constants {
1313
struct Config {

BDKSwiftExampleWallet/View Model/Receive/ReceiveViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ extension ReceiveViewModel {
110110
func readerSession(_ session: NFCNDEFReaderSession, didDetectNDEFs messages: [NFCNDEFMessage]) {
111111
if let message = messages.first,
112112
let record = message.records.first,
113-
let payload = String(data: record.payload, encoding: .utf8)
113+
let _ = String(data: record.payload, encoding: .utf8)
114114
{
115115
// Handle response
116116
}

BDKSwiftExampleWallet/View Model/Settings/SettingsViewModel.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import BitcoinDevKit
99
import Foundation
1010
import SwiftUI
1111

12+
@MainActor
1213
class SettingsViewModel: ObservableObject {
1314
let bdkClient: BDKClient
1415

0 commit comments

Comments
 (0)