Skip to content
This repository was archived by the owner on Jul 16, 2024. It is now read-only.

Commit 423d675

Browse files
authored
Adopt Hilt 2.41 (#31)
* Bump version * Replace `dagger.hilt.android.plugin` with `com.google.dagger.hilt.android` * Remove `androidx.hilt:hilt-lifecycle-viewmodel`
1 parent e562b92 commit 423d675

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

buildSrc/src/main/kotlin/Extensions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ inline fun <reified T : BaseExtension> Project.setupCommon(
157157
create("online")
158158
}
159159
dependencies {
160-
implementations(*Libs.hilt, *Libs.room, *Libs.moshi)
160+
implementations(Libs.hilt, *Libs.room, *Libs.moshi)
161161
kapts(Libs.moshiCompiler, Libs.roomCompiler, Libs.hiltCompiler)
162162
}
163163
applyPlugins(Plugins.kotlinParcelize, Plugins.hilt)

buildSrc/src/main/kotlin/Libs.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ private const val srlVersion = "2.0.3"
66
private const val glideVersion = "4.13.0"
77
private const val coilVersion = "1.4.0"
88
private const val roomVersion = "2.4.1"
9-
private const val hiltVersion = "2.40.5"
9+
private const val hiltVersion = "2.41"
1010
private const val chuckerVersion = "3.5.2"
1111

1212
const val appCompatVersion = "1.4.1"
@@ -26,7 +26,7 @@ object Plugins {
2626
const val kotlinParcelize = "kotlin-parcelize"
2727
const val androidLibrary = "com.android.library"
2828
const val androidApplication = "com.android.application"
29-
const val hilt = "dagger.hilt.android.plugin"
29+
const val hilt = "com.google.dagger.hilt.android"
3030
const val ktlint = "org.jlleitschuh.gradle.ktlint"
3131
}
3232

@@ -57,6 +57,7 @@ object Libs {
5757
const val webKit = "androidx.webkit:webkit:1.4.0"
5858
const val chuckerDebug = "com.github.chuckerteam.chucker:library:$chuckerVersion"
5959
const val chuckerRelease = "com.github.chuckerteam.chucker:library-no-op:$chuckerVersion"
60+
const val hilt = "com.google.dagger:hilt-android:$hiltVersion"
6061

6162
const val hiltPlugin = "com.google.dagger:hilt-android-gradle-plugin:$hiltVersion"
6263
const val ktlintPlugin = "org.jlleitschuh.gradle:ktlint-gradle:10.2.1"
@@ -82,10 +83,6 @@ object Libs {
8283
"androidx.room:room-runtime:$roomVersion",
8384
"androidx.room:room-ktx:$roomVersion"
8485
)
85-
val hilt = arrayOf(
86-
"com.google.dagger:hilt-android:$hiltVersion",
87-
"androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03"
88-
)
8986
val smartRefreshLayout = arrayOf(
9087
"com.scwang.smart:refresh-layout-kernel:$srlVersion",
9188
"com.scwang.smart:refresh-header-classics:$srlVersion",

0 commit comments

Comments
 (0)