Skip to content

Commit 063a279

Browse files
committed
Migrate to use libs.versions.toml
1 parent 9dda539 commit 063a279

35 files changed

Lines changed: 597 additions & 647 deletions

File tree

‎.github/workflows/android-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: burrunan/gradle-cache-action@v3.0.2
2222
with:
2323
gradle-dependencies-cache-key: |
24-
buildSrc/**/Deps.kt
24+
gradle/libs.versions.toml
2525
concurrent: true
2626
arguments: |
2727
spotlessCheck

‎.github/workflows/android.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
uses: burrunan/gradle-cache-action@v3.0.2
2626
with:
2727
gradle-dependencies-cache-key: |
28-
buildSrc/**/Deps.kt
28+
gradle/libs.versions.toml
2929
concurrent: true
3030
arguments: |
3131
spotlessCheck

‎app/build.gradle‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55

66
import tm.alashow.buildSrc.App
7-
import tm.alashow.buildSrc.Deps
87

98
apply plugin: "com.android.application"
109
apply plugin: "dagger.hilt.android.plugin"
@@ -99,20 +98,20 @@ dependencies {
9998
implementation(project(":modules:ui-album"))
10099
implementation(project(":modules:ui-downloads"))
101100

102-
implementation(Deps.Kotlin.coroutinesAndroid)
101+
implementation(libs.kotlinx.coroutines.android)
103102

104103
// utils
105-
//implementation(Deps.Utils.proguardSnippets)
104+
// implementation(libs.proguardSnippets)
106105

107-
ksp(Deps.Android.Lifecycle.compiler)
106+
ksp(libs.androidx.lifecycle.compiler)
108107

109108
// dagger-2
110-
implementation(Deps.Dagger.hilt)
111-
ksp(Deps.Dagger.compiler)
112-
ksp(Deps.Dagger.hiltCompiler)
109+
implementation(libs.hilt.android)
110+
ksp(libs.dagger.compiler)
111+
ksp(libs.hilt.compiler)
113112

114113
// leak canary
115-
//debugImplementation Deps.LeakCanary.leakCanary
114+
//debugImplementation(libs.leakcanary)
116115
}
117116

118117
apply plugin: "com.google.gms.google-services"

‎build.gradle‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
* Copyright (C) 2021, Alashov Berkeli
33
* All rights reserved.
44
*/
5-
6-
7-
import tm.alashow.buildSrc.Deps
8-
95
// Top-level build file where you can add configuration options common to all sub-projects/modules.
106

117
buildscript {
@@ -17,25 +13,24 @@ buildscript {
1713
}
1814

1915
dependencies {
20-
classpath Deps.Android.gradle
21-
classpath Deps.Kotlin.gradle
22-
classpath Deps.Kotlin.composeCompiler
23-
classpath Deps.Kotlin.serialization
24-
classpath Deps.Kotlin.ksp
25-
classpath Deps.Gradle.googleServices
26-
classpath Deps.Gradle.playPublisher
27-
classpath Deps.Firebase.crashlyticsGradle
28-
classpath Deps.Android.navigationSafeArgs
29-
classpath Deps.Dagger.hiltGradle
16+
classpath(libs.gradle.android)
17+
classpath(libs.kotlin.gradle.plugin)
18+
classpath(libs.kotlin.compose.compiler.plugin)
19+
classpath(libs.kotlin.serialization.plugin)
20+
classpath(libs.kotlin.ksp.plugin)
21+
classpath(libs.gradle.googleServices)
22+
classpath(libs.gradle.playPublisher)
23+
classpath(libs.firebase.crashlytics.gradle)
24+
classpath(libs.androidx.navigation.safeArgs)
25+
classpath(libs.hilt.gradle.plugin)
3026
}
3127
}
3228

3329
plugins {
34-
id "com.diffplug.spotless" version "6.1.0"
35-
id "com.github.ben-manes.versions" version "0.54.0"
36-
id "com.kncept.junit.reporter" version "2.1.0"
30+
alias(libs.plugins.spotless)
31+
alias(libs.plugins.versions)
32+
alias(libs.plugins.junit.reporter)
3733
}
38-
3934
allprojects {
4035
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
4136
kotlinOptions {

‎buildSrc/src/main/java/tm/alashow/buildSrc/Deps.kt‎

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

0 commit comments

Comments
 (0)