Skip to content

Commit 5530723

Browse files
committed
chore: use gradle version catalog in project level build.gradle.kts file
1 parent 9d3421d commit 5530723

File tree

3 files changed

+40
-35
lines changed

3 files changed

+40
-35
lines changed

app/build.gradle.kts

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ android {
9595
}
9696

9797
jacoco {
98-
val jacoco_version: String by project
99-
toolVersion = jacoco_version
98+
toolVersion = libs.versions.jacoco.get()
10099
reportsDirectory.set(layout.buildDirectory.dir("mergedReportDir"))
101100
}
102101

@@ -217,25 +216,20 @@ fun loadKeyStore(name: String): Properties? {
217216
}
218217
}
219218

220-
val firebase_bom_version: String by project
221-
val hilt_version: String by project
222-
val coroutines_version: String by project
223-
val material_version: String by project
224-
val mockk_version: String by project
225219
dependencies {
226220

227221
implementation("androidx.appcompat:appcompat:1.7.0")
228222
implementation("androidx.core:core-ktx:1.16.0")
229223
implementation("androidx.constraintlayout:constraintlayout:2.2.1")
230224

231225
// Firebase
232-
implementation(platform("com.google.firebase:firebase-bom:$firebase_bom_version"))
226+
implementation(platform("com.google.firebase:firebase-bom:${libs.versions.firebaseBom.get()}"))
233227
implementation("com.google.firebase:firebase-analytics-ktx")
234228
implementation("com.google.firebase:firebase-crashlytics-ktx")
235229

236230
// Dependency Injection
237-
implementation("com.google.dagger:hilt-android:$hilt_version")
238-
kapt("com.google.dagger:hilt-compiler:$hilt_version")
231+
implementation("com.google.dagger:hilt-android:${libs.versions.hilt.get()}")
232+
kapt("com.google.dagger:hilt-compiler:${libs.versions.hilt.get()}")
239233

240234
// Coroutines
241235
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
@@ -256,7 +250,7 @@ dependencies {
256250
implementation("androidx.activity:activity-compose:1.10.1")
257251

258252
// Other UI Libraries
259-
implementation("com.google.android.material:material:$material_version")
253+
implementation("com.google.android.material:material:${libs.versions.material.get()}")
260254

261255
// data
262256
implementation("androidx.datastore:datastore-preferences:1.1.4")
@@ -276,22 +270,22 @@ dependencies {
276270
androidTestImplementation("androidx.test:rules:1.6.1")
277271

278272
// coroutine testing
279-
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version")
280-
androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version")
273+
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${libs.versions.hilt.get()}")
274+
androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${libs.versions.coroutines.get()}")
281275

282276
// google truth for assertions
283277
testImplementation("com.google.truth:truth:1.1.3")
284278
androidTestImplementation("androidx.test.ext:truth:1.6.0")
285279

286280
// mockk
287-
testImplementation("io.mockk:mockk-android:$mockk_version")
288-
testImplementation("io.mockk:mockk-agent:$mockk_version")
289-
androidTestImplementation("io.mockk:mockk-android:$mockk_version")
290-
androidTestImplementation("io.mockk:mockk-agent:$mockk_version")
281+
testImplementation("io.mockk:mockk-android:${libs.versions.mockk.get()}")
282+
testImplementation("io.mockk:mockk-agent:${libs.versions.mockk.get()}")
283+
androidTestImplementation("io.mockk:mockk-android:${libs.versions.mockk.get()}")
284+
androidTestImplementation("io.mockk:mockk-agent:${libs.versions.mockk.get()}")
291285

292286
// hilt testing - https://developer.android.com/training/dependency-injection/hilt-testing
293-
androidTestImplementation("com.google.dagger:hilt-android-testing:$hilt_version")
294-
kaptAndroidTest("com.google.dagger:hilt-android-compiler:$hilt_version")
287+
androidTestImplementation("com.google.dagger:hilt-android-testing:${libs.versions.hilt.get()}")
288+
kaptAndroidTest("com.google.dagger:hilt-android-compiler:${libs.versions.hilt.get()}")
295289

296290
// Android Serial Controller
297291
implementation("com.github.superus8r:UsbSerial:6.1.1")

build.gradle.kts

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
11
buildscript {
2-
extra.apply {
3-
set("coroutines_version", "1.6.4")
4-
set("firebase_bom_version", "32.8.0")
5-
set("hilt_version", "2.56.2")
6-
set("jacoco_version", "0.8.8")
7-
set("kotlin_version", "2.1.20")
8-
set("material_version", "1.12.0")
9-
set("mockk_version", "1.14.2")
10-
}
112
dependencies {
12-
classpath("com.google.dagger:hilt-android-gradle-plugin:${extra["hilt_version"]}")
13-
classpath("com.google.gms:google-services:4.4.1")
14-
classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.9")
3+
classpath(libs.hilt.android.gradle.plugin)
4+
classpath(libs.google.services)
5+
classpath(libs.firebase.crashlytics.gradle)
156
}
167
}
178

189
plugins {
19-
id("com.android.application") version "8.10.1" apply false
20-
id("org.jetbrains.kotlin.android") version "2.1.20" apply false
21-
id("org.jetbrains.kotlin.plugin.compose") version "2.1.20"
22-
id("org.sonarqube") version "3.5.0.2730"
10+
alias(libs.plugins.android.application) apply false
11+
alias(libs.plugins.kotlin.android) apply false
12+
alias(libs.plugins.kotlin.compose)
13+
alias(libs.plugins.sonarqube)
2314
}
2415

2516
tasks.register<Delete>("clean") {

gradle/libs.versions.toml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[versions]
2+
gradle = "8.1.0"
3+
coroutines = "1.6.4"
4+
firebaseBom = "32.8.0"
5+
hilt = "2.56.2"
6+
jacoco = "0.8.8"
7+
kotlin = "2.1.20"
8+
material = "1.12.0"
9+
mockk = "1.14.2"
10+
11+
[libraries]
12+
hilt_android_gradle_plugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" }
13+
google_services = { module = "com.google.gms:google-services", version = "4.4.1" }
14+
firebase_crashlytics_gradle = { module = "com.google.firebase:firebase-crashlytics-gradle", version = "2.9.9" }
15+
16+
[plugins]
17+
android_application = { id = "com.android.application", version.ref = "gradle" }
18+
kotlin_android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
19+
kotlin_compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
20+
sonarqube = { id = "org.sonarqube", version = "3.5.0.2730" }

0 commit comments

Comments
 (0)