Migrate to hilt 2.31

Drjacky · Jan 16, 2021 · 792d2ba · 792d2ba
1 parent 30bba49
commit 792d2ba
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/app/src/main/kotlin/app/web/drjackycv/mvvmtemplate/di/module/ApiModule.kt b/app/src/main/kotlin/app/web/drjackycv/mvvmtemplate/di/module/ApiModule.kt
@@ -4,14 +4,16 @@ import app.web.drjackycv.data.products.remote.ProductsApi
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ApplicationComponent
+import dagger.hilt.components.SingletonComponent
 import retrofit2.Retrofit
+import javax.inject.Singleton
 
-@InstallIn(ApplicationComponent::class)
+@InstallIn(SingletonComponent::class)
 @Module
 class ApiModule {
 
     @Provides
+    @Singleton
     fun products(retrofit: Retrofit): ProductsApi =
         retrofit.create(ProductsApi::class.java)
 

diff --git a/app/src/main/kotlin/app/web/drjackycv/mvvmtemplate/di/module/RepositoryModule.kt b/app/src/main/kotlin/app/web/drjackycv/mvvmtemplate/di/module/RepositoryModule.kt
@@ -6,13 +6,15 @@ import app.web.drjackycv.domain.products.repository.ProductsListRepository
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ApplicationComponent
+import dagger.hilt.android.components.ViewModelComponent
+import dagger.hilt.android.scopes.ViewModelScoped
 
-@InstallIn(ApplicationComponent::class)
 @Module
+@InstallIn(ViewModelComponent::class)
 class RepositoryModule {
 
     @Provides
+    @ViewModelScoped
     fun productsList(pagingSource: ProductsPagingSource): ProductsListRepository =
         ProductsListRepositoryImpl(pagingSource)
 

diff --git a/buildSrc/src/main/kotlin/app/web/drjackycv/buildsrc/Depends.kt b/buildSrc/src/main/kotlin/app/web/drjackycv/buildsrc/Depends.kt
@@ -31,7 +31,7 @@ object Depends {
         const val multidexVersion = "2.0.1"
         const val fragmentExtVersion = "1.2.5"
         const val recyclerviewVersion = "1.2.0-alpha06"
-        const val hiltVersion = "2.30.1-alpha"
+        const val hiltVersion = "2.31-alpha"
         const val hiltExtVersion = "1.0.0-alpha02"
         const val javaxInjectVersion = "1"
         const val timberVersion = "4.7.1"

diff --git a/domain/src/main/kotlin/app/web/drjackycv/domain/products/usecase/GetBeersListUseCase.kt b/domain/src/main/kotlin/app/web/drjackycv/domain/products/usecase/GetBeersListUseCase.kt
@@ -6,9 +6,7 @@ import app.web.drjackycv.domain.base.usecase.GeneralUseCase
 import app.web.drjackycv.domain.products.repository.ProductsListRepository
 import io.reactivex.Flowable
 import javax.inject.Inject
-import javax.inject.Singleton
 
-@Singleton
 class GetBeersListUseCase @Inject constructor(
     private val productsListRepository: ProductsListRepository
 ) : GeneralUseCase<Flowable<PagingData<RecyclerItem>>, GetBeersListParams> {

diff --git a/presentation/src/main/kotlin/app/web/drjackycv/presentation/base/viewmodel/BaseViewModel.kt b/presentation/src/main/kotlin/app/web/drjackycv/presentation/base/viewmodel/BaseViewModel.kt
@@ -1,7 +1,6 @@
 package app.web.drjackycv.presentation.base.viewmodel
 
 import android.content.res.Resources
-import androidx.hilt.lifecycle.ViewModelInject
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -12,13 +11,15 @@ import com.uber.autodispose.FlowableSubscribeProxy
 import com.uber.autodispose.lifecycle.CorrespondingEventsFunction
 import com.uber.autodispose.lifecycle.LifecycleEndedException
 import com.uber.autodispose.lifecycle.LifecycleScopeProvider
+import dagger.hilt.android.lifecycle.HiltViewModel
 import io.reactivex.Flowable
 import io.reactivex.Observable
 import io.reactivex.annotations.CheckReturnValue
 import io.reactivex.subjects.BehaviorSubject
 import javax.inject.Inject
 
-open class BaseViewModel @ViewModelInject constructor() : ViewModel(),
+@HiltViewModel
+open class BaseViewModel @Inject constructor() : ViewModel(),
     LifecycleScopeProvider<BaseViewModel.ViewModelEvent> {
 
     private val lifecycleEventsDelegate =

diff --git a/.../main/kotlin/app/web/drjackycv/presentation/products/productlist/ProductsListViewModel.kt b/.../main/kotlin/app/web/drjackycv/presentation/products/productlist/ProductsListViewModel.kt
@@ -1,6 +1,5 @@
 package app.web.drjackycv.presentation.products.productlist
 
-import androidx.hilt.lifecycle.ViewModelInject
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
@@ -10,9 +9,12 @@ import app.web.drjackycv.domain.base.RecyclerItem
 import app.web.drjackycv.domain.products.usecase.GetBeersListParams
 import app.web.drjackycv.domain.products.usecase.GetBeersListUseCase
 import app.web.drjackycv.presentation.base.viewmodel.BaseViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
 import io.reactivex.android.schedulers.AndroidSchedulers
+import javax.inject.Inject
 
-class ProductsListViewModel @ViewModelInject constructor(
+@HiltViewModel
+class ProductsListViewModel @Inject constructor(
     private val getBeersUseCase: GetBeersListUseCase
 ) : BaseViewModel() {