Skip to content

Commit eb38a85

Browse files
committed
refactor: remove libs.versions.toml catalog file
1 parent 9fc948d commit eb38a85

File tree

4 files changed

+26
-35
lines changed

4 files changed

+26
-35
lines changed

auth/build.gradle.kts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id("com.android.library")
55
id("com.vanniktech.maven.publish")
66
id("org.jetbrains.kotlin.android")
7-
alias(libs.plugins.compose.compiler)
7+
id("org.jetbrains.kotlin.plugin.compose") version Config.kotlinVersion
88
}
99

1010
android {
@@ -74,17 +74,17 @@ android {
7474
}
7575

7676
dependencies {
77-
implementation(platform(libs.androidx.compose.bom))
78-
implementation(libs.androidx.compose.ui)
79-
implementation(libs.androidx.compose.ui.graphics)
80-
implementation(libs.androidx.compose.material3)
81-
implementation(libs.androidx.compose.foundation)
82-
implementation(libs.androidx.compose.ui.tooling)
83-
implementation(libs.androidx.compose.ui.tooling.preview)
84-
implementation(libs.androidx.activity.compose)
77+
implementation(platform(Config.Libs.Androidx.Compose.bom))
78+
implementation(Config.Libs.Androidx.Compose.ui)
79+
implementation(Config.Libs.Androidx.Compose.uiGraphics)
80+
implementation(Config.Libs.Androidx.Compose.material3)
81+
implementation(Config.Libs.Androidx.Compose.foundation)
82+
implementation(Config.Libs.Androidx.Compose.tooling)
83+
implementation(Config.Libs.Androidx.Compose.toolingPreview)
84+
implementation(Config.Libs.Androidx.Compose.activityCompose)
8585
implementation(Config.Libs.Androidx.materialDesign)
8686
implementation(Config.Libs.Androidx.activity)
87-
implementation(libs.androidx.compose.material.icons.extended)
87+
implementation(Config.Libs.Androidx.Compose.materialIconsExtended)
8888
// The new activity result APIs force us to include Fragment 1.3.0
8989
// See https://issuetracker.google.com/issues/152554847
9090
implementation(Config.Libs.Androidx.fragment)
@@ -116,7 +116,7 @@ dependencies {
116116
testImplementation(Config.Libs.Test.robolectric)
117117
testImplementation(Config.Libs.Test.kotlinReflect)
118118
testImplementation(Config.Libs.Provider.facebook)
119-
testImplementation(libs.androidx.ui.test.junit4)
119+
testImplementation(Config.Libs.Test.composeUiTestJunit4)
120120

121121
debugImplementation(project(":internal:lintchecks"))
122122
}

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ buildscript {
1919

2020
plugins {
2121
id("com.github.ben-manes.versions") version "0.20.0"
22-
alias(libs.plugins.compose.compiler) apply false
22+
id("org.jetbrains.kotlin.plugin.compose") version Config.kotlinVersion apply false
2323
}
2424

2525
allprojects {

buildSrc/src/main/kotlin/Config.kt

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ object Config {
22
const val version = "10.0.0-SNAPSHOT"
33
val submodules = listOf("auth", "common", "firestore", "database", "storage")
44

5-
private const val kotlinVersion = "2.2.0"
5+
const val kotlinVersion = "2.2.0"
66

77
object SdkVersions {
88
const val compile = 35
@@ -41,6 +41,18 @@ object Config {
4141
const val pagingRxJava = "androidx.paging:paging-rxjava3:3.0.0"
4242
const val recyclerView = "androidx.recyclerview:recyclerview:1.2.1"
4343
const val materialDesign = "com.google.android.material:material:1.4.0"
44+
45+
object Compose {
46+
const val bom = "androidx.compose:compose-bom:2025.08.00"
47+
const val ui = "androidx.compose.ui:ui"
48+
const val uiGraphics = "androidx.compose.ui:ui-graphics"
49+
const val toolingPreview = "androidx.compose.ui:ui-tooling-preview"
50+
const val tooling = "androidx.compose.ui:ui-tooling"
51+
const val foundation = "androidx.compose.foundation:foundation"
52+
const val material3 = "androidx.compose.material3:material3"
53+
const val materialIconsExtended = "androidx.compose.material:material-icons-extended"
54+
const val activityCompose = "androidx.activity:activity-compose:1.9.0"
55+
}
4456
}
4557

4658
object Firebase {
@@ -84,6 +96,7 @@ object Config {
8496
const val rules = "androidx.test:rules:1.5.0"
8597

8698
const val kotlinReflect = "org.jetbrains.kotlin:kotlin-reflect"
99+
const val composeUiTestJunit4 = "androidx.compose.ui:ui-test-junit4"
87100
}
88101

89102
object Lint {

gradle/libs.versions.toml

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)