Skip to content

Commit 1b9ca8b

Browse files
authored
Feature/mf 1550 version catalog renaming (#39)
* Added unit tests for AccountListViewModel, AccountDetailViewModel, AccountSummaryUseCase * Added test-data module that contains generic test data and test extension. * Added Jacoco, test coverage and verification * Added AccountsSummaryViewModel onRefresh, onSearch tests * Update README with tests and static code analysis * Added O11Y-API to CATALOG.md * Renaming libraries, split catalog in multiple toml files
1 parent 1000f41 commit 1b9ca8b

File tree

13 files changed

+137
-126
lines changed

13 files changed

+137
-126
lines changed

accounts-journey/build.gradle.kts

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,15 @@ dependencies {
2929
implementation(libs.bundles.navigation)
3030
testImplementation(projects.testData)
3131

32-
androidTestImplementation(libs.navigation.testing)
33-
3432
// Backbase libraries
3533
implementation(platform(backbase.bom))
36-
implementation(backbase.bundles.common)
34+
implementation(midTier.bundles.common)
3735
implementation(libs.bundles.navigation)
3836

3937
testImplementation(libs.archCore)
40-
androidTestImplementation(projects.fakeAccountsUseCase)
41-
androidTestImplementation(libs.archCore)
42-
androidTestImplementation(libs.navigation.testing)
43-
androidTestImplementation(libs.koinTest)
44-
androidTestImplementation(libs.coroutines)
45-
androidTestImplementation(libs.coroutinesTest)
46-
androidTestImplementation(libs.testParameterInjector)
47-
androidTestUtil(libs.orchestrator)
4838

4939
androidTestImplementation(projects.fakeAccountsUseCase)
40+
androidTestImplementation(libs.bundles.test.instrumented)
41+
42+
androidTestUtil(libs.orchestrator)
5043
}

accounts-use-case/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@ dependencies {
1414

1515
// Backbase libraries
1616
implementation(platform(backbase.bom))
17-
implementation(backbase.gen.arrangements.client)
18-
17+
implementation(clients.arrangements)
1918
}

app-common/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ dependencies {
1616
implementation(projects.accountsUseCase)
1717
implementation(libs.bundles.navigation)
1818

19-
coreLibraryDesugaring(libs.desugar.jdk.libs)
19+
coreLibraryDesugaring(libs.coreLibraryDesugaring)
2020

2121
// Backbase libraries
2222
implementation(platform(backbase.bom))
23-
implementation(backbase.bundles.clients)
24-
implementation(backbase.bundles.common)
25-
implementation(backbase.bundles.foundation)
23+
implementation(clients.bundles.clients)
24+
implementation(midTier.bundles.common)
25+
implementation(foundation.bundles.foundation)
2626
implementation(backbase.bundles.journeys)
27-
implementation(backbase.bundles.use.cases)
28-
}
27+
implementation(backbase.bundles.useCases)
28+
}

app/build.gradle.kts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,14 @@ dependencies {
8989
implementation(libs.bundles.navigation)
9090
implementation(libs.bundles.ui)
9191

92-
coreLibraryDesugaring(libs.desugar.jdk.libs)
93-
androidTestImplementation(libs.bundles.test.instrumented)
92+
coreLibraryDesugaring(libs.coreLibraryDesugaring)
9493

9594
testImplementation(libs.bundles.test)
9695

9796
// Backbase libraries
98-
implementation(backbase.bundles.clients)
99-
implementation(backbase.bundles.common)
100-
implementation(backbase.bundles.foundation)
97+
implementation(clients.bundles.clients)
98+
implementation(midTier.bundles.common)
99+
implementation(foundation.bundles.foundation)
101100
implementation(backbase.bundles.journeys)
102-
implementation(backbase.bundles.use.cases)
101+
implementation(backbase.bundles.useCases)
103102
}

buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ dependencies {
2424

2525
implementation(libs.detekt.gradle.plugin)
2626
implementation(libs.gradle.versions.gradle.plugin)
27-
implementation(libs.navigation.safe.args.gradle.plugin)
27+
implementation(libs.androidx.navigation.safe.args.gradle.plugin)
2828
implementation(libs.poko.gradle.plugin)
2929
}

buildSrc/src/main/kotlin/base-android-library-module.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,8 @@ dependencies {
9191
implementation(libs.findBundle("koin").get())
9292
implementation(libs.findBundle("ui").get())
9393

94-
testImplementation(platform(libs.findLibrary("junit5-bom").get()))
94+
testImplementation(platform(libs.findLibrary("junit-bom").get()))
9595
testImplementation(libs.findBundle("test").get())
9696

9797
testRuntimeOnly(libs.findBundle("test-runtime").get())
98-
99-
androidTestImplementation(libs.findBundle("test-instrumented").get())
10098
}

gradle/backbase.versions.toml

Lines changed: 16 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,38 @@
11
[versions]
22
## A
3-
access-control-client-2-entitlements-use-case = "6.0.0"
4-
authentication-journey = "7.2.0"
3+
accessControlEntitlements = "6.0.0"
4+
authentication = "7.2.0"
55

66
## B
77
bom = "2024.09.01"
88

99
## F
10-
feature-filter-use-case = "6.0.0"
10+
featureFilter = "6.0.0"
1111

1212
## M
13-
more-menu-journey = "6.1.0"
13+
moreMenu = "6.1.0"
1414

1515
## W
16-
workspaces-journey = "7.1.0"
16+
workspaces = "7.1.0"
1717

1818
[libraries]
1919
## A
20-
access-control-client-entitlements-use-case = { group = "com.backbase.android.retail.feature_filter", name = "accesscontrol-client-2-entitlements-use-case", version.ref = "access-control-client-2-entitlements-use-case" }
21-
authentication-journey = { group = "com.backbase.android.identity.journey", name = "authentication-journey", version.ref = "authentication-journey" }
22-
authentication-use-case = { group = "com.backbase.android.identity.journey", name = "identity-auth-client-1-authentication-use-case", version.ref = "authentication-journey" }
20+
accessControlEntitlementsUseCase = { group = "com.backbase.android.retail.feature_filter", name = "accesscontrol-client-2-entitlements-use-case", version.ref = "accessControlEntitlements" }
21+
authentication-journey = { group = "com.backbase.android.identity.journey", name = "authentication-journey", version.ref = "authentication" }
22+
authentication-use-case = { group = "com.backbase.android.identity.journey", name = "identity-auth-client-1-authentication-use-case", version.ref = "authentication" }
2323

2424
## B
2525
bom = { module = "com.backbase.android.platform:bom", version.ref = "bom" }
26-
business-journey-common = { group = "com.backbase.android.business.journey", name = "journey-common", version = "" }
27-
28-
## C
29-
clients-common-coroutines = { group = "com.backbase.android.clients", name = "clients-common-coroutines", version = "" }
30-
31-
## D
32-
design-system = { group = "com.backbase.android.design", name = "design-system", version = "" }
3326

3427
## F
35-
feature-filter-use-case = { group = "com.backbase.android.retail.feature_filter", name = "feature-filter-use-case", version.ref = "feature-filter-use-case" }
36-
37-
## G
38-
gen-access-control-client = { group = "com.backbase.android.clients", name = "gen2-accesscontrol-client-3", version = "" }
39-
gen-arrangements-client = { group = "com.backbase.android.clients", name = "gen2-arrangement-client-2", version = "" }
40-
41-
## J
42-
journey-test = { group = "com.backbase.android.retail.journey", name = "journey-test", version = "" }
28+
featureFilterUseCase = { group = "com.backbase.android.retail.feature_filter", name = "feature-filter-use-case", version.ref = "featureFilter" }
4329

4430
## M
45-
more-menu-journey = { group = "com.backbase.android.retail.journey", name = "more-journey", version.ref = "more-menu-journey" }
46-
msdk = { group = "com.backbase.android.sdk", name = "backbase", version = "" }
47-
48-
## R
49-
retail-journey-common = { group = "com.backbase.android.retail.journey", name = "journey-common", version = "" }
50-
retail-journey-common-koin = { group = "com.backbase.android.retail.journey", name = "journey-common-koin", version = "" }
51-
52-
## U
53-
user-manager-client = { group = "com.backbase.android.clients", name = "gen-usermanager-client-2", version = "" }
31+
moreMenuJourney = { group = "com.backbase.android.retail.journey", name = "more-journey", version.ref = "moreMenu" }
5432

5533
## W
56-
workspaces-journey = { group = "com.backbase.android.business.journey", name = "workspaces-journey", version.ref = "workspaces-journey" }
57-
workspaces-use-case = { group = "com.backbase.android.business.journey.workspaces-journey", name = "accesscontrol-client-2-workspaces-use-case", version.ref = "workspaces-journey" }
34+
workspaces-journey = { group = "com.backbase.android.business.journey", name = "workspaces-journey", version.ref = "workspaces" }
35+
workspaces-use-case = { group = "com.backbase.android.business.journey.workspaces-journey", name = "accesscontrol-client-2-workspaces-use-case", version.ref = "workspaces" }
5836

5937
[plugins]
6038
## B
@@ -77,38 +55,18 @@ jacoco-root-codecoverage = { id = "jacoco-root-codecoverage" }
7755
visualiser = { id = "com.backbase.android.visualizer", version = "1.0.0" }
7856

7957
[bundles]
80-
## C
81-
clients = [
82-
"gen-access-control-client",
83-
"gen-arrangements-client",
84-
"user-manager-client",
85-
]
86-
87-
common = [
88-
"business-journey-common",
89-
"clients-common-coroutines",
90-
"retail-journey-common",
91-
"retail-journey-common-koin",
92-
"journey-test",
93-
]
94-
95-
## F
96-
foundation = [
97-
"design-system",
98-
"msdk",
99-
]
10058

10159
## J
10260
journeys = [
10361
"authentication-journey",
104-
"more-menu-journey",
62+
"moreMenuJourney",
10563
"workspaces-journey",
10664
]
10765

10866
## U
109-
use-cases = [
110-
"access-control-client-entitlements-use-case",
67+
useCases = [
68+
"accessControlEntitlementsUseCase",
11169
"authentication-use-case",
112-
"feature-filter-use-case",
70+
"featureFilterUseCase",
11371
"workspaces-use-case",
11472
]

gradle/clients.versions.toml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[versions]
2+
3+
[libraries]
4+
## G
5+
accessControl = { group = "com.backbase.android.clients", name = "gen2-accesscontrol-client-3", version = "" }
6+
arrangements = { group = "com.backbase.android.clients", name = "gen2-arrangement-client-2", version = "" }
7+
8+
## U
9+
userManager = { group = "com.backbase.android.clients", name = "gen-usermanager-client-2", version = "" }
10+
11+
[plugins]
12+
13+
[bundles]
14+
## C
15+
clients = [
16+
"accessControl",
17+
"arrangements",
18+
"userManager",
19+
]

gradle/foundation.versions.toml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[versions]
2+
3+
[libraries]
4+
## D
5+
design-system = { group = "com.backbase.android.design", name = "design-system", version = "" }
6+
7+
# M
8+
msdk = { group = "com.backbase.android.sdk", name = "backbase", version = "" }
9+
10+
[plugins]
11+
12+
[bundles]
13+
## F
14+
foundation = [
15+
"design-system",
16+
"msdk",
17+
]

0 commit comments

Comments
 (0)