Renaming libraries, split catalog in multiple toml files

accounts-journey/build.gradle.kts

@@ -29,22 +29,15 @@ dependencies {
     implementation(libs.bundles.navigation)
     testImplementation(projects.testData)
 
-    androidTestImplementation(libs.navigation.testing)
-
     // Backbase libraries
     implementation(platform(backbase.bom))
-    implementation(backbase.bundles.common)
+    implementation(midTier.bundles.common)
     implementation(libs.bundles.navigation)
 
     testImplementation(libs.archCore)
-    androidTestImplementation(projects.fakeAccountsUseCase)
-    androidTestImplementation(libs.archCore)
-    androidTestImplementation(libs.navigation.testing)
-    androidTestImplementation(libs.koinTest)
-    androidTestImplementation(libs.coroutines)
-    androidTestImplementation(libs.coroutinesTest)
-    androidTestImplementation(libs.testParameterInjector)
-    androidTestUtil(libs.orchestrator)
 
     androidTestImplementation(projects.fakeAccountsUseCase)
+    androidTestImplementation(libs.bundles.test.instrumented)
+
+    androidTestUtil(libs.orchestrator)
 }

accounts-use-case/build.gradle.kts

@@ -14,6 +14,5 @@ dependencies {
 
     // Backbase libraries
     implementation(platform(backbase.bom))
-    implementation(backbase.gen.arrangements.client)
-
+    implementation(clients.arrangements)
 }

app-common/build.gradle.kts

@@ -16,13 +16,13 @@ dependencies {
     implementation(projects.accountsUseCase)
     implementation(libs.bundles.navigation)
 
-    coreLibraryDesugaring(libs.desugar.jdk.libs)
+    coreLibraryDesugaring(libs.coreLibraryDesugaring)
 
     // Backbase libraries
     implementation(platform(backbase.bom))
-    implementation(backbase.bundles.clients)
-    implementation(backbase.bundles.common)
-    implementation(backbase.bundles.foundation)
+    implementation(clients.bundles.clients)
+    implementation(midTier.bundles.common)
+    implementation(foundation.bundles.foundation)
     implementation(backbase.bundles.journeys)
-    implementation(backbase.bundles.use.cases)
-}
+    implementation(backbase.bundles.useCases)
+}

app/build.gradle.kts

@@ -89,15 +89,14 @@ dependencies {
     implementation(libs.bundles.navigation)
     implementation(libs.bundles.ui)
 
-    coreLibraryDesugaring(libs.desugar.jdk.libs)
-    androidTestImplementation(libs.bundles.test.instrumented)
+    coreLibraryDesugaring(libs.coreLibraryDesugaring)
 
     testImplementation(libs.bundles.test)
 
     // Backbase libraries
-    implementation(backbase.bundles.clients)
-    implementation(backbase.bundles.common)
-    implementation(backbase.bundles.foundation)
+    implementation(clients.bundles.clients)
+    implementation(midTier.bundles.common)
+    implementation(foundation.bundles.foundation)
     implementation(backbase.bundles.journeys)
-    implementation(backbase.bundles.use.cases)
+    implementation(backbase.bundles.useCases)
 }

buildSrc/build.gradle.kts

@@ -24,6 +24,6 @@ dependencies {
 
     implementation(libs.detekt.gradle.plugin)
     implementation(libs.gradle.versions.gradle.plugin)
-    implementation(libs.navigation.safe.args.gradle.plugin)
+    implementation(libs.androidx.navigation.safe.args.gradle.plugin)
     implementation(libs.poko.gradle.plugin)
 }

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

@@ -91,10 +91,8 @@ dependencies {
     implementation(libs.findBundle("koin").get())
     implementation(libs.findBundle("ui").get())
 
-    testImplementation(platform(libs.findLibrary("junit5-bom").get()))
+    testImplementation(platform(libs.findLibrary("junit-bom").get()))
     testImplementation(libs.findBundle("test").get())
 
     testRuntimeOnly(libs.findBundle("test-runtime").get())
-
-    androidTestImplementation(libs.findBundle("test-instrumented").get())
 }

gradle/backbase.versions.toml

@@ -1,60 +1,38 @@
 [versions]
 ## A
-access-control-client-2-entitlements-use-case = "6.0.0"
-authentication-journey = "7.2.0"
+accessControlEntitlements = "6.0.0"
+authentication = "7.2.0"
 
 ## B
 bom = "2024.09.01"
 
 ## F
-feature-filter-use-case = "6.0.0"
+featureFilter = "6.0.0"
 
 ## M
-more-menu-journey = "6.1.0"
+moreMenu = "6.1.0"
 
 ## W
-workspaces-journey = "7.1.0"
+workspaces = "7.1.0"
 
 [libraries]
 ## A
-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" }
-authentication-journey = { group = "com.backbase.android.identity.journey", name = "authentication-journey", version.ref = "authentication-journey" }
-authentication-use-case = { group = "com.backbase.android.identity.journey", name = "identity-auth-client-1-authentication-use-case", version.ref = "authentication-journey" }
+accessControlEntitlementsUseCase = { group = "com.backbase.android.retail.feature_filter", name = "accesscontrol-client-2-entitlements-use-case", version.ref = "accessControlEntitlements" }
+authentication-journey = { group = "com.backbase.android.identity.journey", name = "authentication-journey", version.ref = "authentication" }
+authentication-use-case = { group = "com.backbase.android.identity.journey", name = "identity-auth-client-1-authentication-use-case", version.ref = "authentication" }
 
 ## B
 bom = { module = "com.backbase.android.platform:bom", version.ref = "bom" }
-business-journey-common = { group = "com.backbase.android.business.journey", name = "journey-common", version = "" }
-
-## C
-clients-common-coroutines = { group = "com.backbase.android.clients", name = "clients-common-coroutines", version = "" }
-
-## D
-design-system = { group = "com.backbase.android.design", name = "design-system", version = "" }
 
 ## F
-feature-filter-use-case = { group = "com.backbase.android.retail.feature_filter", name = "feature-filter-use-case", version.ref = "feature-filter-use-case" }
-
-## G
-gen-access-control-client = { group = "com.backbase.android.clients", name = "gen2-accesscontrol-client-3", version = "" }
-gen-arrangements-client = { group = "com.backbase.android.clients", name = "gen2-arrangement-client-2", version = "" }
-
-## J
-journey-test = { group = "com.backbase.android.retail.journey", name = "journey-test", version = "" }
+featureFilterUseCase = { group = "com.backbase.android.retail.feature_filter", name = "feature-filter-use-case", version.ref = "featureFilter" }
 
 ## M
-more-menu-journey = { group = "com.backbase.android.retail.journey", name = "more-journey", version.ref = "more-menu-journey" }
-msdk = { group = "com.backbase.android.sdk", name = "backbase", version = "" }
-
-## R
-retail-journey-common = { group = "com.backbase.android.retail.journey", name = "journey-common", version = "" }
-retail-journey-common-koin = { group = "com.backbase.android.retail.journey", name = "journey-common-koin", version = "" }
-
-## U
-user-manager-client = { group = "com.backbase.android.clients", name = "gen-usermanager-client-2", version = "" }
+moreMenuJourney = { group = "com.backbase.android.retail.journey", name = "more-journey", version.ref = "moreMenu" }
 
 ## W
-workspaces-journey = { group = "com.backbase.android.business.journey", name = "workspaces-journey", version.ref = "workspaces-journey" }
-workspaces-use-case = { group = "com.backbase.android.business.journey.workspaces-journey", name = "accesscontrol-client-2-workspaces-use-case", version.ref = "workspaces-journey" }
+workspaces-journey = { group = "com.backbase.android.business.journey", name = "workspaces-journey", version.ref = "workspaces" }
+workspaces-use-case = { group = "com.backbase.android.business.journey.workspaces-journey", name = "accesscontrol-client-2-workspaces-use-case", version.ref = "workspaces" }
 
 [plugins]
 ## B
@@ -77,38 +55,18 @@ jacoco-root-codecoverage = { id = "jacoco-root-codecoverage" }
 visualiser = { id = "com.backbase.android.visualizer", version = "1.0.0" }
 
 [bundles]
-## C
-clients = [
-    "gen-access-control-client",
-    "gen-arrangements-client",
-    "user-manager-client",
-]
-
-common = [
-    "business-journey-common",
-    "clients-common-coroutines",
-    "retail-journey-common",
-    "retail-journey-common-koin",
-    "journey-test",
-]
-
-## F
-foundation = [
-    "design-system",
-    "msdk",
-]
 
 ## J
 journeys = [
     "authentication-journey",
-    "more-menu-journey",
+    "moreMenuJourney",
     "workspaces-journey",
 ]
 
 ## U
-use-cases = [
-    "access-control-client-entitlements-use-case",
+useCases = [
+    "accessControlEntitlementsUseCase",
     "authentication-use-case",
-    "feature-filter-use-case",
+    "featureFilterUseCase",
     "workspaces-use-case",
 ]

gradle/clients.versions.toml

@@ -0,0 +1,19 @@
+[versions]
+
+[libraries]
+## G
+accessControl = { group = "com.backbase.android.clients", name = "gen2-accesscontrol-client-3", version = "" }
+arrangements = { group = "com.backbase.android.clients", name = "gen2-arrangement-client-2", version = "" }
+
+## U
+userManager = { group = "com.backbase.android.clients", name = "gen-usermanager-client-2", version = "" }
+
+[plugins]
+
+[bundles]
+## C
+clients = [
+    "accessControl",
+    "arrangements",
+    "userManager",
+]

gradle/foundation.versions.toml

@@ -0,0 +1,17 @@
+[versions]
+
+[libraries]
+## D
+design-system = { group = "com.backbase.android.design", name = "design-system", version = "" }
+
+# M
+msdk = { group = "com.backbase.android.sdk", name = "backbase", version = "" }
+
+[plugins]
+
+[bundles]
+## F
+foundation = [
+    "design-system",
+    "msdk",
+]