Skip to content
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

[ABW-4014] Bump TCA to 1.17.0 #1423

Merged
merged 15 commits into from
Dec 18, 2024
Merged

[ABW-4014] Bump TCA to 1.17.0 #1423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3deca15
wip
danvleju-rdx Dec 16, 2024
e40f6de
wip
danvleju-rdx Dec 16, 2024
3789d5d
wip
danvleju-rdx Dec 16, 2024
1bc392f
fix tests
danvleju-rdx Dec 17, 2024
7a5b82d
Merge branch 'main' into ABW-4014-bump-tca
danvleju-rdx Dec 17, 2024
2e6d8b3
fix
danvleju-rdx Dec 17, 2024
5d0d80f
add noop
danvleju-rdx Dec 17, 2024
922ab42
Merge branch 'main' into ABW-4014-bump-tca
danvleju-rdx Dec 17, 2024
efef4bd
remove BigInt
danvleju-rdx Dec 17, 2024
5205713
remove textbuilder
danvleju-rdx Dec 17, 2024
3f893f1
remove overture
danvleju-rdx Dec 17, 2024
cce89e6
remove IdentifiedCollections
danvleju-rdx Dec 17, 2024
f59ba09
remove NavigationTransitions
danvleju-rdx Dec 17, 2024
70328ca
remove swift-builders
danvleju-rdx Dec 17, 2024
0383216
fix
danvleju-rdx Dec 17, 2024
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
137 changes: 3 additions & 134 deletions RadixWallet.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

116 changes: 40 additions & 76 deletions RadixWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"originHash" : "7f25d08c2d5bfce10ead9a90a371e548d360b6e5e8779b8ad654bfac475f1dc8",
"originHash" : "fa0ccc46105ce4506ee426a54025794ee1322cffb38f54c107e48179e492ab78",
"pins" : [
{
"identity" : "anycodable",
Expand Down Expand Up @@ -28,15 +28,6 @@
"version" : "0.5.3"
}
},
{
"identity" : "bigint",
"kind" : "remoteSourceControl",
"location" : "https://github.com/attaswift/BigInt",
"state" : {
"revision" : "0ed110f7555c34ff468e72e1686e59721f2b0da6",
"version" : "5.3.0"
}
},
{
"identity" : "codescanner",
"kind" : "remoteSourceControl",
Expand All @@ -60,8 +51,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/combine-schedulers",
"state" : {
"revision" : "9dc9cbe4bc45c65164fa653a563d8d8db61b09bb",
"version" : "1.0.0"
"revision" : "9fa31f4403da54855f1e2aeaeff478f4f0e40b13",
"version" : "1.0.2"
}
},
{
Expand Down Expand Up @@ -112,7 +103,7 @@
{
"identity" : "sargon",
"kind" : "remoteSourceControl",
"location" : "https://github.com/radixdlt/sargon/",
"location" : "https://github.com/radixdlt/sargon",
"state" : {
"revision" : "9dced921809b0d6e9d417fb12025172eb69fc6d7",
"version" : "1.1.88"
Expand Down Expand Up @@ -153,31 +144,22 @@
"version" : "1.1.0"
}
},
{
"identity" : "swift-builders",
"kind" : "remoteSourceControl",
"location" : "https://github.com/davdroman/swift-builders",
"state" : {
"revision" : "c2f1dc3ac3596732359926a5ef5e3ba7009aac21",
"version" : "0.6.0"
}
},
{
"identity" : "swift-case-paths",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-case-paths",
"state" : {
"revision" : "e072139e13f2f3e582251b49835abcf3421ac69a",
"version" : "1.2.3"
"revision" : "bc92c4b27f9a84bfb498cdbfdf35d5a357e9161f",
"version" : "1.5.6"
}
},
{
"identity" : "swift-clocks",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-clocks",
"state" : {
"revision" : "a8421d68068d8f45fbceb418fbf22c5dad4afd33",
"version" : "1.0.2"
"revision" : "b9b24b69e2adda099a1fa381cda1eeec272d5b53",
"version" : "1.0.5"
}
},
{
Expand All @@ -194,44 +176,44 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-composable-architecture",
"state" : {
"revision" : "cf967a28a8605629559533320d604168d733fc9c",
"version" : "1.8.0"
"revision" : "d602618c628e5123f66643437151079d3664970d",
"version" : "1.17.0"
}
},
{
"identity" : "swift-concurrency-extras",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
"state" : {
"revision" : "bb5059bde9022d69ac516803f4f227d8ac967f71",
"version" : "1.1.0"
"revision" : "163409ef7dae9d960b87f34b51587b6609a76c1f",
"version" : "1.3.0"
}
},
{
"identity" : "swift-custom-dump",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-custom-dump",
"state" : {
"revision" : "f01efb26f3a192a0e88dcdb7c3c391ec2fc25d9c",
"version" : "1.3.0"
"revision" : "aec6a73f5c1dc1f1be4f61888094b95cf995d973",
"version" : "1.3.2"
}
},
{
"identity" : "swift-dependencies",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-dependencies",
"state" : {
"revision" : "09e49dd46932adfe80ce672b4b3772d79ee6c21a",
"version" : "1.2.1"
"revision" : "5526c8a27675dc7b18d6fa643abfb64bcb200b77",
"version" : "1.6.2"
}
},
{
"identity" : "swift-dependencies-additions",
"kind" : "remoteSourceControl",
"location" : "https://github.com/tgrapperon/swift-dependencies-additions",
"state" : {
"revision" : "02e7b1801a96828049fe4d3e8bdc5e608ef5ffbc",
"version" : "1.0.1"
"revision" : "7b1d88ec23f80b0b5d4832d51af7647fa5062d8e",
"version" : "1.1.1"
}
},
{
Expand All @@ -248,8 +230,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-identified-collections",
"state" : {
"revision" : "d533cd18b0b456b106694a9899f917ee595f2666",
"version" : "1.0.2"
"revision" : "2f5ab6e091dd032b63dacbda052405756010dc3b",
"version" : "1.1.0"
}
},
{
Expand Down Expand Up @@ -288,6 +270,15 @@
"version" : "0.1.0"
}
},
{
"identity" : "swift-navigation",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-navigation",
"state" : {
"revision" : "16a27ab7ae0abfefbbcba73581b3e2380b47a579",
"version" : "2.2.2"
}
},
{
"identity" : "swift-nonempty",
"kind" : "remoteSourceControl",
Expand All @@ -307,27 +298,27 @@
}
},
{
"identity" : "swift-overture",
"identity" : "swift-perception",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-overture.git",
"location" : "https://github.com/pointfreeco/swift-perception",
"state" : {
"revision" : "7977acd7597f413717058acc1e080731249a1d7e",
"version" : "0.5.0"
"revision" : "8d52279b9809ef27eabe7d5420f03734528f19da",
"version" : "1.4.1"
}
},
{
"identity" : "swift-perception",
"identity" : "swift-sharing",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-perception",
"location" : "https://github.com/pointfreeco/swift-sharing",
"state" : {
"revision" : "42240120b2a8797595433288ab4118f8042214c3",
"version" : "1.1.1"
"revision" : "b68bf99b05cb974392f6ffa380351e9b7391e233",
"version" : "1.1.0"
}
},
{
"identity" : "swift-syntax",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-syntax",
"location" : "https://github.com/swiftlang/swift-syntax",
"state" : {
"revision" : "64889f0c732f210a935a0ad7cda38f77f876262d",
"version" : "509.1.1"
Expand Down Expand Up @@ -360,24 +351,6 @@
"version" : "1.0.0"
}
},
{
"identity" : "swiftui-navigation",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swiftui-navigation.git",
"state" : {
"revision" : "d9e72f3083c08375794afa216fb2f89c0114f303",
"version" : "1.2.1"
}
},
{
"identity" : "swiftui-navigation-transitions",
"kind" : "remoteSourceControl",
"location" : "https://github.com/davdroman/swiftui-navigation-transitions",
"state" : {
"revision" : "a6a3c70ad5d771bd1e927fb55897231cd9592024",
"version" : "0.13.3"
}
},
{
"identity" : "swiftyjson",
"kind" : "remoteSourceControl",
Expand All @@ -387,15 +360,6 @@
"version" : "5.0.2"
}
},
{
"identity" : "textbuilder",
"kind" : "remoteSourceControl",
"location" : "https://github.com/davdroman/TextBuilder",
"state" : {
"revision" : "65b7c7bb9b163f4fc2d755c52a89a6f3040300df",
"version" : "3.0.1"
}
},
{
"identity" : "webrtc",
"kind" : "remoteSourceControl",
Expand All @@ -419,8 +383,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
"state" : {
"revision" : "6f30bdba373bbd7fbfe241dddd732651f2fbd1e2",
"version" : "1.1.2"
"revision" : "a3f634d1a409c7979cabc0a71b3f26ffa9fc8af1",
"version" : "1.4.3"
}
}
],
Expand Down
4 changes: 2 additions & 2 deletions RadixWallet/Clients/AccountLockersClient/AccountLockersClient+Test.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ extension AccountLockersClient: TestDependencyKey {

static let testValue = Self(
startMonitoring: unimplemented("\(Self.self).startMonitoring"),
claims: unimplemented("\(Self.self).claims"),
dappsWithClaims: unimplemented("\(Self.self).dappsWithClaims"),
claims: noop.claims,
dappsWithClaims: noop.dappsWithClaims,
claimContent: unimplemented("\(Self.self).claimContent"),
forceRefresh: unimplemented("\(Self.self).forceRefresh")
)
Expand Down
6 changes: 3 additions & 3 deletions RadixWallet/Clients/AccountPortfoliosClient/AccountPortfoliosClient+Mock.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ extension AccountPortfoliosClient: TestDependencyKey {
static let testValue = AccountPortfoliosClient(
fetchAccountPortfolios: unimplemented("\(AccountPortfoliosClient.self).fetchAccountPortfolios"),
fetchAccountPortfolio: unimplemented("\(AccountPortfoliosClient.self).fetchAccountPortfolio"),
portfolioUpdates: unimplemented("\(AccountPortfoliosClient.self).fetchAccountPortfolio"),
portfolioForAccount: unimplemented("\(AccountPortfoliosClient.self).portfolioForAccount"),
portfolios: unimplemented("\(AccountPortfoliosClient.self).portfolios"),
portfolioUpdates: unimplemented("\(AccountPortfoliosClient.self).portfolioUpdates", placeholder: noop.portfolioUpdates),
portfolioForAccount: unimplemented("\(AccountPortfoliosClient.self).portfolioForAccount", placeholder: noop.portfolioForAccount),
portfolios: unimplemented("\(AccountPortfoliosClient.self).portfolios", placeholder: noop.portfolios),
syncAccountsDeletedOnLedger: unimplemented("\(AccountPortfoliosClient.self).syncAccountsDeletedOnLedger")
)

Expand Down
8 changes: 4 additions & 4 deletions RadixWallet/Clients/AccountsClient/AccountsClient+Test.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ extension AccountsClient: TestDependencyKey {
)

static let testValue = Self(
getCurrentNetworkID: unimplemented("\(Self.self).getCurrentNetworkID"),
nextAppearanceID: unimplemented("\(Self.self).nextAppearanceID"),
getCurrentNetworkID: unimplemented("\(Self.self).getCurrentNetworkID", placeholder: noop.getCurrentNetworkID),
nextAppearanceID: unimplemented("\(Self.self).nextAppearanceID", placeholder: noop.nextAppearanceID),
getAccountsOnCurrentNetwork: unimplemented("\(Self.self).getAccountsOnCurrentNetwork"),
getHiddenAccountsOnCurrentNetwork: unimplemented("\(Self.self).getHiddenAccountsOnCurrentNetwork"),
accountsOnCurrentNetwork: unimplemented("\(Self.self).accountsOnCurrentNetwork"),
accountUpdates: unimplemented("\(Self.self).accountUpdates"),
accountsOnCurrentNetwork: unimplemented("\(Self.self).accountsOnCurrentNetwork", placeholder: noop.accountsOnCurrentNetwork),
accountUpdates: unimplemented("\(Self.self).accountUpdates", placeholder: noop.accountUpdates),
newVirtualAccount: unimplemented("\(Self.self).newVirtualAccount"),
saveVirtualAccounts: unimplemented("\(Self.self).saveVirtualAccounts"),
getAccountByAddress: unimplemented("\(Self.self).getAccountByAddress"),
Expand Down
2 changes: 1 addition & 1 deletion RadixWallet/Clients/AppEventsClient/AppEventsClient+Test.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ extension AppEventsClient: TestDependencyKey {

static let testValue = Self(
handleEvent: unimplemented("\(Self.self).handleEvent"),
events: unimplemented("\(Self.self).events")
events: unimplemented("\(Self.self).events", placeholder: noop.events)
)
}

Expand Down
6 changes: 3 additions & 3 deletions RadixWallet/Clients/AppPreferencesClient/AppPreferencesClient+Test.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ extension AppPreferencesClient: TestDependencyKey {
static let previewValue = Self.noop

static let testValue = Self(
appPreferenceUpdates: unimplemented("\(Self.self).appPreferenceUpdates"),
getPreferences: unimplemented("\(Self.self).getPreferences"),
appPreferenceUpdates: unimplemented("\(Self.self).appPreferenceUpdates", placeholder: noop.appPreferenceUpdates),
getPreferences: unimplemented("\(Self.self).getPreferences", placeholder: noop.getPreferences),
updatePreferences: unimplemented("\(Self.self).updatePreferences"),
extractProfile: unimplemented("\(Self.self).extractProfile"),
extractProfile: unimplemented("\(Self.self).extractProfile", placeholder: noop.extractProfile),
deleteProfileAndFactorSources: unimplemented("\(Self.self).deleteProfileAndFactorSources"),
setIsCloudBackupEnabled: unimplemented("\(Self.self).setIsCloudBackupEnabled")
)
Expand Down
2 changes: 1 addition & 1 deletion RadixWallet/Clients/AuthorizedDappsClient/AuthorizedDappsClient+Test.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ extension AuthorizedDappsClient: TestDependencyKey {

static let testValue = Self(
getAuthorizedDapps: unimplemented("\(Self.self).getAuthorizedDapps"),
authorizedDappValues: unimplemented("\(Self.self).authorizedDappValues"),
authorizedDappValues: unimplemented("\(Self.self).authorizedDappValues", placeholder: noop.authorizedDappValues),
addAuthorizedDapp: unimplemented("\(Self.self).addAuthorizedDapp"),
forgetAuthorizedDapp: unimplemented("\(Self.self).forgetAuthorizedDapp"),
updateAuthorizedDapp: unimplemented("\(Self.self).updateAuthorizedDapp"),
Expand Down
2 changes: 1 addition & 1 deletion RadixWallet/Clients/CameraPermissionClient/CameraPermissionClient+Test.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ extension CameraPermissionClient: TestDependencyKey {
static let previewValue = Self.noop

static let testValue = Self(
getCameraAccess: unimplemented("\(Self.self).getCameraAccess")
getCameraAccess: unimplemented("\(Self.self).getCameraAccess", placeholder: noop.getCameraAccess)
)
}

Expand Down
4 changes: 2 additions & 2 deletions RadixWallet/Clients/CloudBackupClient/CloudBackupClient+Test.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ extension CloudBackupClient: TestDependencyKey {
)

static let testValue = Self(
isCloudProfileSyncEnabled: unimplemented("\(Self.self).isCloudProfileSyncEnabled"),
isCloudProfileSyncEnabled: noop.isCloudProfileSyncEnabled,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not use unimplemented(description:placeholder:)? Same for other occurrences.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because the tests where these clients are used fail when unimplemented is used

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Start the fail with the update to 1.17.0?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe we can use Sargon .sample values for noop in most clients? The fact that we throw is just because we did not have sample value for most types before Sargon.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That’s a good idea, but it’ll take some time to go through all the noops, so I’m leaving it as a future improvement.

startAutomaticBackups: unimplemented("\(Self.self).startAutomaticBackups"),
migrateProfilesFromKeychain: unimplemented("\(Self.self).migrateProfilesFromKeychain"),
deleteProfileBackup: unimplemented("\(Self.self).deleteProfileBackup"),
checkAccountStatus: unimplemented("\(Self.self).checkAccountStatus"),
lastBackup: unimplemented("\(Self.self).lastBackup"),
lastBackup: noop.lastBackup,
loadProfile: unimplemented("\(Self.self).loadProfile"),
loadProfileHeaders: unimplemented("\(Self.self).loadProfileHeaders"),
claimProfileOnICloud: unimplemented("\(Self.self).claimProfileOnICloud")
Expand Down
4 changes: 2 additions & 2 deletions RadixWallet/Clients/DappInteractionClient/DappInteractionClient+Test.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ extension DappInteractionClient: TestDependencyKey {
static let previewValue = Self.noop

static let testValue = Self(
interactions: unimplemented("\(Self.self).requests"),
addWalletInteraction: unimplemented("\(Self.self).addWalletRequest"),
interactions: unimplemented("\(Self.self).requests", placeholder: noop.interactions),
addWalletInteraction: unimplemented("\(Self.self).addWalletRequest", placeholder: noop.addWalletInteraction),
completeInteraction: unimplemented("\(Self.self).sendResponse")
)

Expand Down
2 changes: 1 addition & 1 deletion RadixWallet/Clients/DeepLinkHandlerClient/DeepLinkHandlerClient+Test.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ extension DeepLinkHandlerClient: TestDependencyKey {
static let testValue = Self(
handleDeepLink: unimplemented("\(Self.self).handleDeepLink"),
setDeepLink: unimplemented("\(Self.self).setDeepLink"),
hasDeepLink: unimplemented("\(Self.self).hasDeepLink")
hasDeepLink: noop.hasDeepLink
)
}

Expand Down
6 changes: 3 additions & 3 deletions RadixWallet/Clients/FactorSourcesClient/FactorSourcesClient+Test.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ extension FactorSourcesClient: TestDependencyKey {

static let testValue = Self(
indicesOfEntitiesControlledByFactorSource: unimplemented("\(Self.self).indicesOfEntitiesControlledByFactorSource"),
getCurrentNetworkID: unimplemented("\(Self.self).getCurrentNetworkID"),
getCurrentNetworkID: noop.getCurrentNetworkID,
getMainDeviceFactorSource: unimplemented("\(Self.self).getMainDeviceFactorSource"),
createNewMainDeviceFactorSource: unimplemented("\(Self.self).createNewMainDeviceFactorSource"),
getFactorSources: unimplemented("\(Self.self).getFactorSources"),
factorSourcesAsyncSequence: unimplemented("\(Self.self).factorSourcesAsyncSequence"),
factorSourcesAsyncSequence: noop.factorSourcesAsyncSequence,
nextEntityIndexForFactorSource: unimplemented("\(Self.self).nextEntityIndexForFactorSource"),
addPrivateHDFactorSource: unimplemented("\(Self.self).addPrivateHDFactorSource"),
checkIfHasOlympiaFactorSourceForAccounts: unimplemented("\(Self.self).checkIfHasOlympiaFactorSourceForAccounts"),
checkIfHasOlympiaFactorSourceForAccounts: noop.checkIfHasOlympiaFactorSourceForAccounts,
saveFactorSource: unimplemented("\(Self.self).saveFactorSource"),
updateFactorSource: unimplemented("\(Self.self).updateFactorSource"),
getSigningFactors: unimplemented("\(Self.self).getSigningFactors"),
Expand Down
2 changes: 1 addition & 1 deletion RadixWallet/Clients/FaucetClient/FaucetClient+Test.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ extension FaucetClient: TestDependencyKey {

static let testValue: FaucetClient = Self(
getFreeXRD: unimplemented("\(Self.self).getFreeXRD"),
isAllowedToUseFaucet: unimplemented("\(Self.self).isAllowedToUseFaucet")
isAllowedToUseFaucet: unimplemented("\(Self.self).isAllowedToUseFaucet", placeholder: noop.isAllowedToUseFaucet)
)
}

Expand Down
Loading
Loading