diff --git a/app/src/googleplay/java/org/tasks/injection/LocationModule.kt b/app/src/googleplay/java/org/tasks/injection/LocationModule.kt
index 559306123..f164f6119 100644
--- a/app/src/googleplay/java/org/tasks/injection/LocationModule.kt
+++ b/app/src/googleplay/java/org/tasks/injection/LocationModule.kt
@@ -5,18 +5,20 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityComponent
+import dagger.hilt.android.components.ViewModelComponent
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.android.scopes.ActivityScoped
+import dagger.hilt.android.scopes.ViewModelScoped
 import org.tasks.billing.Inventory
 import org.tasks.gtasks.PlayServices
 import org.tasks.location.*
 import org.tasks.preferences.Preferences
 
 @Module
-@InstallIn(ActivityComponent::class)
+@InstallIn(ActivityComponent::class, ViewModelComponent::class)
 internal class LocationModule {
     @Provides
-    @ActivityScoped
+    @ViewModelScoped
     fun getPlaceSearchProvider(
             @ApplicationContext context: Context,
             preferences: Preferences,
diff --git a/app/src/main/java/org/tasks/activities/CreateListViewModel.kt b/app/src/main/java/org/tasks/activities/CreateListViewModel.kt
index bd9985536..3addd3cc7 100644
--- a/app/src/main/java/org/tasks/activities/CreateListViewModel.kt
+++ b/app/src/main/java/org/tasks/activities/CreateListViewModel.kt
@@ -1,11 +1,13 @@
 package org.tasks.activities
 
-import androidx.hilt.lifecycle.ViewModelInject
 import com.google.api.services.tasks.model.TaskList
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.googleapis.InvokerFactory
 import org.tasks.ui.CompletableViewModel
+import javax.inject.Inject
 
-class CreateListViewModel @ViewModelInject constructor(
+@HiltViewModel
+class CreateListViewModel @Inject constructor(
         private val invoker: InvokerFactory
 ) : CompletableViewModel<TaskList>() {
     suspend fun createList(account: String, name: String) {
diff --git a/app/src/main/java/org/tasks/activities/DeleteListViewModel.kt b/app/src/main/java/org/tasks/activities/DeleteListViewModel.kt
index 9d68bf8ae..ef48ca1a0 100644
--- a/app/src/main/java/org/tasks/activities/DeleteListViewModel.kt
+++ b/app/src/main/java/org/tasks/activities/DeleteListViewModel.kt
@@ -1,11 +1,13 @@
 package org.tasks.activities
 
-import androidx.hilt.lifecycle.ViewModelInject
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.data.GoogleTaskList
 import org.tasks.googleapis.InvokerFactory
 import org.tasks.ui.ActionViewModel
+import javax.inject.Inject
 
-class DeleteListViewModel @ViewModelInject constructor(
+@HiltViewModel
+class DeleteListViewModel @Inject constructor(
         private val invoker: InvokerFactory) : ActionViewModel() {
     suspend fun deleteList(list: GoogleTaskList) {
         run { invoker.getGtasksInvoker(list.account!!).deleteGtaskList(list.remoteId) }
diff --git a/app/src/main/java/org/tasks/activities/RenameListViewModel.kt b/app/src/main/java/org/tasks/activities/RenameListViewModel.kt
index 3199bd08b..89f813405 100644
--- a/app/src/main/java/org/tasks/activities/RenameListViewModel.kt
+++ b/app/src/main/java/org/tasks/activities/RenameListViewModel.kt
@@ -1,12 +1,14 @@
 package org.tasks.activities
 
-import androidx.hilt.lifecycle.ViewModelInject
 import com.google.api.services.tasks.model.TaskList
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.data.GoogleTaskList
 import org.tasks.googleapis.InvokerFactory
 import org.tasks.ui.CompletableViewModel
+import javax.inject.Inject
 
-class RenameListViewModel @ViewModelInject constructor(
+@HiltViewModel
+class RenameListViewModel @Inject constructor(
         private val invoker: InvokerFactory) : CompletableViewModel<TaskList>() {
     suspend fun renameList(list: GoogleTaskList, name: String) {
         run { invoker.getGtasksInvoker(list.account!!).renameGtaskList(list.remoteId, name)!! }
diff --git a/app/src/main/java/org/tasks/auth/SignInViewModel.kt b/app/src/main/java/org/tasks/auth/SignInViewModel.kt
index bcaa969d0..59dc3a44e 100644
--- a/app/src/main/java/org/tasks/auth/SignInViewModel.kt
+++ b/app/src/main/java/org/tasks/auth/SignInViewModel.kt
@@ -2,10 +2,10 @@ package org.tasks.auth
 
 import android.content.Context
 import android.content.Intent
-import androidx.hilt.lifecycle.ViewModelInject
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.todoroo.astrid.helper.UUIDHelper
+import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import net.openid.appauth.AuthorizationException
 import net.openid.appauth.AuthorizationResponse
@@ -18,8 +18,10 @@ import org.tasks.data.CaldavAccount
 import org.tasks.data.CaldavDao
 import org.tasks.security.KeyStoreEncryption
 import timber.log.Timber
+import javax.inject.Inject
 
-class SignInViewModel @ViewModelInject constructor(
+@HiltViewModel
+class SignInViewModel @Inject constructor(
         @ApplicationContext private val context: Context,
         private val provider: CaldavClientProvider,
         private val caldavDao: CaldavDao,
diff --git a/app/src/main/java/org/tasks/caldav/AddCaldavAccountViewModel.kt b/app/src/main/java/org/tasks/caldav/AddCaldavAccountViewModel.kt
index fba0caf56..ce29efa0e 100644
--- a/app/src/main/java/org/tasks/caldav/AddCaldavAccountViewModel.kt
+++ b/app/src/main/java/org/tasks/caldav/AddCaldavAccountViewModel.kt
@@ -1,9 +1,11 @@
 package org.tasks.caldav
 
-import androidx.hilt.lifecycle.ViewModelInject
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.ui.CompletableViewModel
+import javax.inject.Inject
 
-class AddCaldavAccountViewModel @ViewModelInject constructor(
+@HiltViewModel
+class AddCaldavAccountViewModel @Inject constructor(
         private val provider: CaldavClientProvider
 ) : CompletableViewModel<String>() {
     suspend fun addAccount(url: String, username: String, password: String) {
diff --git a/app/src/main/java/org/tasks/caldav/CreateCalendarViewModel.kt b/app/src/main/java/org/tasks/caldav/CreateCalendarViewModel.kt
index 51f50d28f..725f3a49f 100644
--- a/app/src/main/java/org/tasks/caldav/CreateCalendarViewModel.kt
+++ b/app/src/main/java/org/tasks/caldav/CreateCalendarViewModel.kt
@@ -1,10 +1,12 @@
 package org.tasks.caldav
 
-import androidx.hilt.lifecycle.ViewModelInject
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.data.CaldavAccount
 import org.tasks.ui.CompletableViewModel
+import javax.inject.Inject
 
-class CreateCalendarViewModel @ViewModelInject constructor(
+@HiltViewModel
+class CreateCalendarViewModel @Inject constructor(
         private val provider: CaldavClientProvider
 ): CompletableViewModel<String?>() {
     suspend fun createCalendar(account: CaldavAccount, name: String, color: Int) {
diff --git a/app/src/main/java/org/tasks/caldav/DeleteCalendarViewModel.kt b/app/src/main/java/org/tasks/caldav/DeleteCalendarViewModel.kt
index 346e5074d..dbb95a55a 100644
--- a/app/src/main/java/org/tasks/caldav/DeleteCalendarViewModel.kt
+++ b/app/src/main/java/org/tasks/caldav/DeleteCalendarViewModel.kt
@@ -1,11 +1,13 @@
 package org.tasks.caldav
 
-import androidx.hilt.lifecycle.ViewModelInject
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.data.CaldavAccount
 import org.tasks.data.CaldavCalendar
 import org.tasks.ui.ActionViewModel
+import javax.inject.Inject
 
-class DeleteCalendarViewModel @ViewModelInject constructor(
+@HiltViewModel
+class DeleteCalendarViewModel @Inject constructor(
         private val provider: CaldavClientProvider
 ) : ActionViewModel() {
     suspend fun deleteCalendar(account: CaldavAccount, calendar: CaldavCalendar) {
diff --git a/app/src/main/java/org/tasks/caldav/UpdateCaldavAccountViewModel.kt b/app/src/main/java/org/tasks/caldav/UpdateCaldavAccountViewModel.kt
index 347ec6e48..2fa11473a 100644
--- a/app/src/main/java/org/tasks/caldav/UpdateCaldavAccountViewModel.kt
+++ b/app/src/main/java/org/tasks/caldav/UpdateCaldavAccountViewModel.kt
@@ -1,9 +1,11 @@
 package org.tasks.caldav
 
-import androidx.hilt.lifecycle.ViewModelInject
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.ui.CompletableViewModel
+import javax.inject.Inject
 
-class UpdateCaldavAccountViewModel @ViewModelInject constructor(
+@HiltViewModel
+class UpdateCaldavAccountViewModel @Inject constructor(
         private val provider: CaldavClientProvider
 ) : CompletableViewModel<String>() {
     suspend fun updateCaldavAccount(url: String, username: String, password: String) {
diff --git a/app/src/main/java/org/tasks/caldav/UpdateCalendarViewModel.kt b/app/src/main/java/org/tasks/caldav/UpdateCalendarViewModel.kt
index 6d81c9b7f..1f82ad156 100644
--- a/app/src/main/java/org/tasks/caldav/UpdateCalendarViewModel.kt
+++ b/app/src/main/java/org/tasks/caldav/UpdateCalendarViewModel.kt
@@ -1,11 +1,13 @@
 package org.tasks.caldav
 
-import androidx.hilt.lifecycle.ViewModelInject
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.data.CaldavAccount
 import org.tasks.data.CaldavCalendar
 import org.tasks.ui.CompletableViewModel
+import javax.inject.Inject
 
-class UpdateCalendarViewModel @ViewModelInject constructor(
+@HiltViewModel
+class UpdateCalendarViewModel @Inject constructor(
         private val provider: CaldavClientProvider
 ) : CompletableViewModel<String?>() {
     suspend fun updateCalendar(account: CaldavAccount, calendar: CaldavCalendar, name: String, color: Int) {
diff --git a/app/src/main/java/org/tasks/etebase/AddEtebaseAccountViewModel.kt b/app/src/main/java/org/tasks/etebase/AddEtebaseAccountViewModel.kt
index 3b773523b..077e4bb21 100644
--- a/app/src/main/java/org/tasks/etebase/AddEtebaseAccountViewModel.kt
+++ b/app/src/main/java/org/tasks/etebase/AddEtebaseAccountViewModel.kt
@@ -1,9 +1,11 @@
 package org.tasks.etebase
 
-import androidx.hilt.lifecycle.ViewModelInject
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.ui.CompletableViewModel
+import javax.inject.Inject
 
-class AddEtebaseAccountViewModel @ViewModelInject constructor(
+@HiltViewModel
+class AddEtebaseAccountViewModel @Inject constructor(
         private val clientProvider: EtebaseClientProvider): CompletableViewModel<String>() {
     suspend fun addAccount(url: String, username: String, password: String) {
         run {
diff --git a/app/src/main/java/org/tasks/etebase/CreateCalendarViewModel.kt b/app/src/main/java/org/tasks/etebase/CreateCalendarViewModel.kt
index 3d164efd6..90630f06d 100644
--- a/app/src/main/java/org/tasks/etebase/CreateCalendarViewModel.kt
+++ b/app/src/main/java/org/tasks/etebase/CreateCalendarViewModel.kt
@@ -1,10 +1,12 @@
 package org.tasks.etebase
 
-import androidx.hilt.lifecycle.ViewModelInject
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.data.CaldavAccount
 import org.tasks.ui.CompletableViewModel
+import javax.inject.Inject
 
-class CreateCalendarViewModel @ViewModelInject constructor(
+@HiltViewModel
+class CreateCalendarViewModel @Inject constructor(
         private val clientProvider: EtebaseClientProvider) : CompletableViewModel<String?>() {
     suspend fun createCalendar(account: CaldavAccount, name: String, color: Int) {
         run { clientProvider.forAccount(account).makeCollection(name, color) }
diff --git a/app/src/main/java/org/tasks/etebase/DeleteCalendarViewModel.kt b/app/src/main/java/org/tasks/etebase/DeleteCalendarViewModel.kt
index c24b7b951..aea2670cb 100644
--- a/app/src/main/java/org/tasks/etebase/DeleteCalendarViewModel.kt
+++ b/app/src/main/java/org/tasks/etebase/DeleteCalendarViewModel.kt
@@ -1,11 +1,13 @@
 package org.tasks.etebase
 
-import androidx.hilt.lifecycle.ViewModelInject
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.data.CaldavAccount
 import org.tasks.data.CaldavCalendar
 import org.tasks.ui.ActionViewModel
+import javax.inject.Inject
 
-class DeleteCalendarViewModel @ViewModelInject constructor(
+@HiltViewModel
+class DeleteCalendarViewModel @Inject constructor(
         private val clientProvider: EtebaseClientProvider) : ActionViewModel() {
     suspend fun deleteCalendar(account: CaldavAccount, calendar: CaldavCalendar) {
         run { clientProvider.forAccount(account).deleteCollection(calendar) }
diff --git a/app/src/main/java/org/tasks/etebase/UpdateCalendarViewModel.kt b/app/src/main/java/org/tasks/etebase/UpdateCalendarViewModel.kt
index ba7668b3e..9ddbdc9ab 100644
--- a/app/src/main/java/org/tasks/etebase/UpdateCalendarViewModel.kt
+++ b/app/src/main/java/org/tasks/etebase/UpdateCalendarViewModel.kt
@@ -1,11 +1,13 @@
 package org.tasks.etebase
 
-import androidx.hilt.lifecycle.ViewModelInject
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.data.CaldavAccount
 import org.tasks.data.CaldavCalendar
 import org.tasks.ui.CompletableViewModel
+import javax.inject.Inject
 
-class UpdateCalendarViewModel @ViewModelInject constructor(
+@HiltViewModel
+class UpdateCalendarViewModel @Inject constructor(
         private val clientProvider: EtebaseClientProvider): CompletableViewModel<String?>() {
     suspend fun updateCalendar(account: CaldavAccount, calendar: CaldavCalendar, name: String, color: Int) {
         run { clientProvider.forAccount(account).updateCollection(calendar, name, color) }
diff --git a/app/src/main/java/org/tasks/etebase/UpdateEtebaseAccountViewModel.kt b/app/src/main/java/org/tasks/etebase/UpdateEtebaseAccountViewModel.kt
index bf8d32c15..20d95d508 100644
--- a/app/src/main/java/org/tasks/etebase/UpdateEtebaseAccountViewModel.kt
+++ b/app/src/main/java/org/tasks/etebase/UpdateEtebaseAccountViewModel.kt
@@ -1,10 +1,12 @@
 package org.tasks.etebase
 
-import androidx.hilt.lifecycle.ViewModelInject
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.Strings.isNullOrEmpty
 import org.tasks.ui.CompletableViewModel
+import javax.inject.Inject
 
-class UpdateEtebaseAccountViewModel @ViewModelInject constructor(
+@HiltViewModel
+class UpdateEtebaseAccountViewModel @Inject constructor(
         private val clientProvider: EtebaseClientProvider) : CompletableViewModel<String>() {
     suspend fun updateAccount(url: String, user: String, pass: String?, session: String) {
         run {
diff --git a/app/src/main/java/org/tasks/etesync/AddEteSyncAccountViewModel.kt b/app/src/main/java/org/tasks/etesync/AddEteSyncAccountViewModel.kt
index 9056aaabd..ba8519f4c 100644
--- a/app/src/main/java/org/tasks/etesync/AddEteSyncAccountViewModel.kt
+++ b/app/src/main/java/org/tasks/etesync/AddEteSyncAccountViewModel.kt
@@ -1,12 +1,14 @@
 package org.tasks.etesync
 
 import androidx.core.util.Pair
-import androidx.hilt.lifecycle.ViewModelInject
 import com.etesync.journalmanager.UserInfoManager.UserInfo
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.ui.CompletableViewModel
+import javax.inject.Inject
 
 @Deprecated("use etebase")
-class AddEteSyncAccountViewModel @ViewModelInject constructor(
+@HiltViewModel
+class AddEteSyncAccountViewModel @Inject constructor(
         private val client: EteSyncClient): CompletableViewModel<Pair<UserInfo, String>>() {
     suspend fun addAccount(url: String, username: String, password: String) {
         run {
diff --git a/app/src/main/java/org/tasks/etesync/CreateCalendarViewModel.kt b/app/src/main/java/org/tasks/etesync/CreateCalendarViewModel.kt
index a70ea6fc2..e74888bb0 100644
--- a/app/src/main/java/org/tasks/etesync/CreateCalendarViewModel.kt
+++ b/app/src/main/java/org/tasks/etesync/CreateCalendarViewModel.kt
@@ -1,11 +1,13 @@
 package org.tasks.etesync
 
-import androidx.hilt.lifecycle.ViewModelInject
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.data.CaldavAccount
 import org.tasks.ui.CompletableViewModel
+import javax.inject.Inject
 
 @Deprecated("use etebase")
-class CreateCalendarViewModel @ViewModelInject constructor(
+@HiltViewModel
+class CreateCalendarViewModel @Inject constructor(
         private val client: EteSyncClient) : CompletableViewModel<String?>() {
     suspend fun createCalendar(account: CaldavAccount, name: String, color: Int) {
         run { client.forAccount(account).makeCollection(name, color) }
diff --git a/app/src/main/java/org/tasks/etesync/CreateUserInfoViewModel.kt b/app/src/main/java/org/tasks/etesync/CreateUserInfoViewModel.kt
index 22bfc1bf3..fc8b73b10 100644
--- a/app/src/main/java/org/tasks/etesync/CreateUserInfoViewModel.kt
+++ b/app/src/main/java/org/tasks/etesync/CreateUserInfoViewModel.kt
@@ -1,11 +1,13 @@
 package org.tasks.etesync
 
-import androidx.hilt.lifecycle.ViewModelInject
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.data.CaldavAccount
 import org.tasks.ui.CompletableViewModel
+import javax.inject.Inject
 
 @Deprecated("use etebase")
-class CreateUserInfoViewModel @ViewModelInject constructor(
+@HiltViewModel
+class CreateUserInfoViewModel @Inject constructor(
         private val client: EteSyncClient): CompletableViewModel<String>() {
     suspend fun createUserInfo(caldavAccount: CaldavAccount, derivedKey: String) {
         run {
diff --git a/app/src/main/java/org/tasks/etesync/DeleteCalendarViewModel.kt b/app/src/main/java/org/tasks/etesync/DeleteCalendarViewModel.kt
index 4af0817f2..b3b6aa947 100644
--- a/app/src/main/java/org/tasks/etesync/DeleteCalendarViewModel.kt
+++ b/app/src/main/java/org/tasks/etesync/DeleteCalendarViewModel.kt
@@ -1,12 +1,14 @@
 package org.tasks.etesync
 
-import androidx.hilt.lifecycle.ViewModelInject
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.data.CaldavAccount
 import org.tasks.data.CaldavCalendar
 import org.tasks.ui.ActionViewModel
+import javax.inject.Inject
 
 @Deprecated("use etebase")
-class DeleteCalendarViewModel @ViewModelInject constructor(
+@HiltViewModel
+class DeleteCalendarViewModel @Inject constructor(
         private val client: EteSyncClient) : ActionViewModel() {
     suspend fun deleteCalendar(account: CaldavAccount, calendar: CaldavCalendar) {
         run { client.forAccount(account).deleteCollection(calendar) }
diff --git a/app/src/main/java/org/tasks/etesync/UpdateCalendarViewModel.kt b/app/src/main/java/org/tasks/etesync/UpdateCalendarViewModel.kt
index df85d4fd9..3c8555b18 100644
--- a/app/src/main/java/org/tasks/etesync/UpdateCalendarViewModel.kt
+++ b/app/src/main/java/org/tasks/etesync/UpdateCalendarViewModel.kt
@@ -1,12 +1,14 @@
 package org.tasks.etesync
 
-import androidx.hilt.lifecycle.ViewModelInject
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.data.CaldavAccount
 import org.tasks.data.CaldavCalendar
 import org.tasks.ui.CompletableViewModel
+import javax.inject.Inject
 
 @Deprecated("use etebase")
-class UpdateCalendarViewModel @ViewModelInject constructor(
+@HiltViewModel
+class UpdateCalendarViewModel @Inject constructor(
         private val client: EteSyncClient): CompletableViewModel<String?>() {
     suspend fun updateCalendar(account: CaldavAccount, calendar: CaldavCalendar, name: String, color: Int) {
         run { client.forAccount(account).updateCollection(calendar, name, color) }
diff --git a/app/src/main/java/org/tasks/etesync/UpdateEteSyncAccountViewModel.kt b/app/src/main/java/org/tasks/etesync/UpdateEteSyncAccountViewModel.kt
index 9f4282c1f..137b71fd4 100644
--- a/app/src/main/java/org/tasks/etesync/UpdateEteSyncAccountViewModel.kt
+++ b/app/src/main/java/org/tasks/etesync/UpdateEteSyncAccountViewModel.kt
@@ -1,13 +1,15 @@
 package org.tasks.etesync
 
 import androidx.core.util.Pair
-import androidx.hilt.lifecycle.ViewModelInject
 import com.etesync.journalmanager.UserInfoManager.UserInfo
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.Strings.isNullOrEmpty
 import org.tasks.ui.CompletableViewModel
+import javax.inject.Inject
 
 @Deprecated("use etebase")
-class UpdateEteSyncAccountViewModel @ViewModelInject constructor(
+@HiltViewModel
+class UpdateEteSyncAccountViewModel @Inject constructor(
         private val client: EteSyncClient) : CompletableViewModel<Pair<UserInfo, String>>() {
     suspend fun updateAccount(url: String, user: String, pass: String?, token: String) {
         run {
diff --git a/app/src/main/java/org/tasks/jobs/AfterSaveWork.kt b/app/src/main/java/org/tasks/jobs/AfterSaveWork.kt
index 1a52978e5..70545d1d0 100644
--- a/app/src/main/java/org/tasks/jobs/AfterSaveWork.kt
+++ b/app/src/main/java/org/tasks/jobs/AfterSaveWork.kt
@@ -1,17 +1,19 @@
 package org.tasks.jobs
 
 import android.content.Context
-import androidx.hilt.Assisted
-import androidx.hilt.work.WorkerInject
+import androidx.hilt.work.HiltWorker
 import androidx.work.WorkerParameters
 import com.todoroo.astrid.gcal.GCalHelper
 import com.todoroo.astrid.repeats.RepeatTaskHelper
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
 import org.tasks.analytics.Firebase
 import org.tasks.data.CaldavDao
 import org.tasks.data.TaskDao
 import org.tasks.injection.BaseWorker
 
-class AfterSaveWork @WorkerInject constructor(
+@HiltWorker
+class AfterSaveWork @AssistedInject constructor(
         @Assisted context: Context,
         @Assisted workerParams: WorkerParameters,
         firebase: Firebase,
diff --git a/app/src/main/java/org/tasks/jobs/BackupWork.kt b/app/src/main/java/org/tasks/jobs/BackupWork.kt
index b8f01dcb4..df2b80d7b 100644
--- a/app/src/main/java/org/tasks/jobs/BackupWork.kt
+++ b/app/src/main/java/org/tasks/jobs/BackupWork.kt
@@ -3,10 +3,11 @@ package org.tasks.jobs
 import android.content.ContentResolver
 import android.content.Context
 import androidx.documentfile.provider.DocumentFile
-import androidx.hilt.Assisted
-import androidx.hilt.work.WorkerInject
+import androidx.hilt.work.HiltWorker
 import androidx.work.WorkerParameters
 import com.todoroo.andlib.utility.DateUtilities
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
 import org.tasks.R
 import org.tasks.analytics.Firebase
 import org.tasks.backup.BackupConstants
@@ -17,7 +18,8 @@ import java.io.File
 import java.io.FileFilter
 import java.util.*
 
-class BackupWork @WorkerInject constructor(
+@HiltWorker
+class BackupWork @AssistedInject constructor(
         @Assisted context: Context,
         @Assisted workerParams: WorkerParameters,
         firebase: Firebase,
diff --git a/app/src/main/java/org/tasks/jobs/CleanupWork.kt b/app/src/main/java/org/tasks/jobs/CleanupWork.kt
index 38264a7d3..c69e2f925 100644
--- a/app/src/main/java/org/tasks/jobs/CleanupWork.kt
+++ b/app/src/main/java/org/tasks/jobs/CleanupWork.kt
@@ -1,22 +1,27 @@
 package org.tasks.jobs
 
 import android.content.Context
-import androidx.hilt.Assisted
-import androidx.hilt.work.WorkerInject
+import androidx.hilt.work.HiltWorker
 import androidx.work.WorkerParameters
 import com.todoroo.astrid.alarms.AlarmService
 import com.todoroo.astrid.reminders.ReminderService
 import com.todoroo.astrid.timers.TimerPlugin
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
 import kotlinx.coroutines.runBlocking
 import org.tasks.analytics.Firebase
-import org.tasks.data.*
+import org.tasks.data.DeletionDao
+import org.tasks.data.LocationDao
+import org.tasks.data.TaskAttachmentDao
+import org.tasks.data.UserActivityDao
 import org.tasks.files.FileHelper
 import org.tasks.injection.BaseWorker
 import org.tasks.location.GeofenceApi
 import org.tasks.notifications.NotificationManager
 import timber.log.Timber
 
-class CleanupWork @WorkerInject constructor(
+@HiltWorker
+class CleanupWork @AssistedInject constructor(
         @Assisted context: Context,
         @Assisted workerParams: WorkerParameters,
         firebase: Firebase,
diff --git a/app/src/main/java/org/tasks/jobs/DriveUploader.kt b/app/src/main/java/org/tasks/jobs/DriveUploader.kt
index 7496953bb..51b5f4c9a 100644
--- a/app/src/main/java/org/tasks/jobs/DriveUploader.kt
+++ b/app/src/main/java/org/tasks/jobs/DriveUploader.kt
@@ -2,12 +2,13 @@ package org.tasks.jobs
 
 import android.content.Context
 import android.net.Uri
-import androidx.hilt.Assisted
-import androidx.hilt.work.WorkerInject
+import androidx.hilt.work.HiltWorker
 import androidx.work.Data
 import androidx.work.WorkerParameters
 import com.google.api.client.googleapis.json.GoogleJsonResponseException
 import com.google.api.services.drive.model.File
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
 import org.tasks.LocalBroadcastManager
 import org.tasks.R
 import org.tasks.Strings.isNullOrEmpty
@@ -25,7 +26,8 @@ import java.net.SocketTimeoutException
 import java.net.UnknownHostException
 import javax.net.ssl.SSLException
 
-class DriveUploader @WorkerInject constructor(
+@HiltWorker
+class DriveUploader @AssistedInject constructor(
         @Assisted context: Context,
         @Assisted workerParams: WorkerParameters,
         firebase: Firebase,
diff --git a/app/src/main/java/org/tasks/jobs/MidnightRefreshWork.kt b/app/src/main/java/org/tasks/jobs/MidnightRefreshWork.kt
index 326744c7a..f479505cd 100644
--- a/app/src/main/java/org/tasks/jobs/MidnightRefreshWork.kt
+++ b/app/src/main/java/org/tasks/jobs/MidnightRefreshWork.kt
@@ -1,13 +1,15 @@
 package org.tasks.jobs
 
 import android.content.Context
-import androidx.hilt.Assisted
-import androidx.hilt.work.WorkerInject
+import androidx.hilt.work.HiltWorker
 import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
 import org.tasks.LocalBroadcastManager
 import org.tasks.analytics.Firebase
 
-class MidnightRefreshWork @WorkerInject constructor(
+@HiltWorker
+class MidnightRefreshWork @AssistedInject constructor(
         @Assisted context: Context,
         @Assisted workerParams: WorkerParameters,
         firebase: Firebase,
diff --git a/app/src/main/java/org/tasks/jobs/MigrateLocalWork.kt b/app/src/main/java/org/tasks/jobs/MigrateLocalWork.kt
index 7fd54fa72..2df4931e8 100644
--- a/app/src/main/java/org/tasks/jobs/MigrateLocalWork.kt
+++ b/app/src/main/java/org/tasks/jobs/MigrateLocalWork.kt
@@ -1,9 +1,10 @@
 package org.tasks.jobs
 
 import android.content.Context
-import androidx.hilt.Assisted
-import androidx.hilt.work.WorkerInject
+import androidx.hilt.work.HiltWorker
 import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
 import org.tasks.R
 import org.tasks.analytics.Firebase
 import org.tasks.caldav.CaldavClientProvider
@@ -12,7 +13,8 @@ import org.tasks.injection.BaseWorker
 import org.tasks.preferences.Preferences
 import org.tasks.sync.SyncAdapters
 
-class MigrateLocalWork @WorkerInject constructor(
+@HiltWorker
+class MigrateLocalWork @AssistedInject constructor(
         @Assisted context: Context,
         @Assisted workerParams: WorkerParameters,
         firebase: Firebase,
diff --git a/app/src/main/java/org/tasks/jobs/RefreshWork.kt b/app/src/main/java/org/tasks/jobs/RefreshWork.kt
index 69dacf9a2..4c31a45b0 100644
--- a/app/src/main/java/org/tasks/jobs/RefreshWork.kt
+++ b/app/src/main/java/org/tasks/jobs/RefreshWork.kt
@@ -1,14 +1,16 @@
 package org.tasks.jobs
 
 import android.content.Context
-import androidx.hilt.Assisted
-import androidx.hilt.work.WorkerInject
+import androidx.hilt.work.HiltWorker
 import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
 import org.tasks.LocalBroadcastManager
 import org.tasks.analytics.Firebase
 import org.tasks.scheduling.RefreshScheduler
 
-class RefreshWork @WorkerInject constructor(
+@HiltWorker
+class RefreshWork @AssistedInject constructor(
         @Assisted context: Context,
         @Assisted workerParams: WorkerParameters,
         firebase: Firebase,
diff --git a/app/src/main/java/org/tasks/jobs/RemoteConfigWork.kt b/app/src/main/java/org/tasks/jobs/RemoteConfigWork.kt
index ff56c06da..02827e905 100644
--- a/app/src/main/java/org/tasks/jobs/RemoteConfigWork.kt
+++ b/app/src/main/java/org/tasks/jobs/RemoteConfigWork.kt
@@ -1,13 +1,15 @@
 package org.tasks.jobs
 
 import android.content.Context
-import androidx.hilt.Assisted
-import androidx.hilt.work.WorkerInject
+import androidx.hilt.work.HiltWorker
 import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
 import org.tasks.analytics.Firebase
 import org.tasks.injection.BaseWorker
 
-class RemoteConfigWork @WorkerInject constructor(
+@HiltWorker
+class RemoteConfigWork @AssistedInject constructor(
         @Assisted context: Context,
         @Assisted workerParams: WorkerParameters,
         firebase: Firebase) : BaseWorker(context, workerParams, firebase) {
diff --git a/app/src/main/java/org/tasks/jobs/ReverseGeocodeWork.kt b/app/src/main/java/org/tasks/jobs/ReverseGeocodeWork.kt
index c83dd068d..3ef9ff40f 100644
--- a/app/src/main/java/org/tasks/jobs/ReverseGeocodeWork.kt
+++ b/app/src/main/java/org/tasks/jobs/ReverseGeocodeWork.kt
@@ -1,9 +1,10 @@
 package org.tasks.jobs
 
 import android.content.Context
-import androidx.hilt.Assisted
-import androidx.hilt.work.WorkerInject
+import androidx.hilt.work.HiltWorker
 import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
 import org.tasks.LocalBroadcastManager
 import org.tasks.analytics.Firebase
 import org.tasks.data.LocationDao
@@ -12,7 +13,8 @@ import org.tasks.location.Geocoder
 import timber.log.Timber
 import java.io.IOException
 
-class ReverseGeocodeWork @WorkerInject constructor(
+@HiltWorker
+class ReverseGeocodeWork @AssistedInject constructor(
         @Assisted context: Context,
         @Assisted workerParams: WorkerParameters,
         firebase: Firebase,
diff --git a/app/src/main/java/org/tasks/jobs/SyncCaldavWork.kt b/app/src/main/java/org/tasks/jobs/SyncCaldavWork.kt
index f82fbc602..3311f852f 100644
--- a/app/src/main/java/org/tasks/jobs/SyncCaldavWork.kt
+++ b/app/src/main/java/org/tasks/jobs/SyncCaldavWork.kt
@@ -1,9 +1,10 @@
 package org.tasks.jobs
 
 import android.content.Context
-import androidx.hilt.Assisted
-import androidx.hilt.work.WorkerInject
+import androidx.hilt.work.HiltWorker
 import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
 import kotlinx.coroutines.*
 import org.tasks.LocalBroadcastManager
 import org.tasks.R
@@ -15,7 +16,8 @@ import org.tasks.data.CaldavAccount.Companion.TYPE_TASKS
 import org.tasks.data.CaldavDao
 import org.tasks.preferences.Preferences
 
-class SyncCaldavWork @WorkerInject constructor(
+@HiltWorker
+class SyncCaldavWork @AssistedInject constructor(
         @Assisted context: Context,
         @Assisted workerParams: WorkerParameters,
         firebase: Firebase,
diff --git a/app/src/main/java/org/tasks/jobs/SyncEteSyncWork.kt b/app/src/main/java/org/tasks/jobs/SyncEteSyncWork.kt
index 07cece27e..632e50dbe 100644
--- a/app/src/main/java/org/tasks/jobs/SyncEteSyncWork.kt
+++ b/app/src/main/java/org/tasks/jobs/SyncEteSyncWork.kt
@@ -1,9 +1,10 @@
 package org.tasks.jobs
 
 import android.content.Context
-import androidx.hilt.Assisted
-import androidx.hilt.work.WorkerInject
+import androidx.hilt.work.HiltWorker
 import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
 import kotlinx.coroutines.*
 import org.tasks.LocalBroadcastManager
 import org.tasks.R
@@ -14,7 +15,8 @@ import org.tasks.etesync.EteSynchronizer
 import org.tasks.preferences.Preferences
 
 @Deprecated("use etebase")
-class SyncEteSyncWork @WorkerInject constructor(
+@HiltWorker
+class SyncEteSyncWork @AssistedInject constructor(
         @Assisted context: Context,
         @Assisted workerParams: WorkerParameters,
         firebase: Firebase,
diff --git a/app/src/main/java/org/tasks/jobs/SyncEtebaseWork.kt b/app/src/main/java/org/tasks/jobs/SyncEtebaseWork.kt
index 945d7c899..8161c80d5 100644
--- a/app/src/main/java/org/tasks/jobs/SyncEtebaseWork.kt
+++ b/app/src/main/java/org/tasks/jobs/SyncEtebaseWork.kt
@@ -1,9 +1,10 @@
 package org.tasks.jobs
 
 import android.content.Context
-import androidx.hilt.Assisted
-import androidx.hilt.work.WorkerInject
+import androidx.hilt.work.HiltWorker
 import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
 import kotlinx.coroutines.*
 import org.tasks.LocalBroadcastManager
 import org.tasks.R
@@ -13,7 +14,8 @@ import org.tasks.data.CaldavDao
 import org.tasks.etebase.EtebaseSynchronizer
 import org.tasks.preferences.Preferences
 
-class SyncEtebaseWork @WorkerInject constructor(
+@HiltWorker
+class SyncEtebaseWork @AssistedInject constructor(
         @Assisted context: Context,
         @Assisted workerParams: WorkerParameters,
         firebase: Firebase,
diff --git a/app/src/main/java/org/tasks/jobs/SyncGoogleTasksWork.kt b/app/src/main/java/org/tasks/jobs/SyncGoogleTasksWork.kt
index 0329ece10..be4176745 100644
--- a/app/src/main/java/org/tasks/jobs/SyncGoogleTasksWork.kt
+++ b/app/src/main/java/org/tasks/jobs/SyncGoogleTasksWork.kt
@@ -1,9 +1,10 @@
 package org.tasks.jobs
 
 import android.content.Context
-import androidx.hilt.Assisted
-import androidx.hilt.work.WorkerInject
+import androidx.hilt.work.HiltWorker
 import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
 import kotlinx.coroutines.*
 import org.tasks.LocalBroadcastManager
 import org.tasks.R
@@ -12,7 +13,8 @@ import org.tasks.data.GoogleTaskListDao
 import org.tasks.gtasks.GoogleTaskSynchronizer
 import org.tasks.preferences.Preferences
 
-class SyncGoogleTasksWork @WorkerInject constructor(
+@HiltWorker
+class SyncGoogleTasksWork @AssistedInject constructor(
         @Assisted context: Context,
         @Assisted workerParams: WorkerParameters,
         firebase: Firebase,
diff --git a/app/src/main/java/org/tasks/jobs/SyncOpenTasksWork.kt b/app/src/main/java/org/tasks/jobs/SyncOpenTasksWork.kt
index 486771d31..92885e75c 100644
--- a/app/src/main/java/org/tasks/jobs/SyncOpenTasksWork.kt
+++ b/app/src/main/java/org/tasks/jobs/SyncOpenTasksWork.kt
@@ -4,9 +4,10 @@ import android.accounts.AccountManager
 import android.content.ContentResolver
 import android.content.Context
 import android.os.Bundle
-import androidx.hilt.Assisted
-import androidx.hilt.work.WorkerInject
+import androidx.hilt.work.HiltWorker
 import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
 import org.tasks.LocalBroadcastManager
 import org.tasks.R
 import org.tasks.analytics.Firebase
@@ -17,7 +18,8 @@ import org.tasks.data.OpenTaskDao.Companion.SUPPORTED_TYPES
 import org.tasks.opentasks.OpenTasksSynchronizer
 import org.tasks.preferences.Preferences
 
-class SyncOpenTasksWork @WorkerInject constructor(
+@HiltWorker
+class SyncOpenTasksWork @AssistedInject constructor(
         @Assisted context: Context,
         @Assisted workerParams: WorkerParameters,
         firebase: Firebase,
diff --git a/app/src/main/java/org/tasks/jobs/UpdateCalendarWork.kt b/app/src/main/java/org/tasks/jobs/UpdateCalendarWork.kt
index 9ee2071d9..c5d8dcf42 100644
--- a/app/src/main/java/org/tasks/jobs/UpdateCalendarWork.kt
+++ b/app/src/main/java/org/tasks/jobs/UpdateCalendarWork.kt
@@ -1,17 +1,19 @@
 package org.tasks.jobs
 
 import android.content.Context
-import androidx.hilt.Assisted
-import androidx.hilt.work.WorkerInject
+import androidx.hilt.work.HiltWorker
 import androidx.work.WorkerParameters
 import com.todoroo.astrid.gcal.GCalHelper
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
 import org.tasks.analytics.Firebase
 import org.tasks.calendars.CalendarEventProvider
 import org.tasks.data.TaskDao
 import org.tasks.injection.BaseWorker
 import org.tasks.preferences.PermissionChecker
 
-class UpdateCalendarWork @WorkerInject constructor(
+@HiltWorker
+class UpdateCalendarWork @AssistedInject constructor(
         @Assisted context: Context,
         @Assisted workerParams: WorkerParameters,
         firebase: Firebase,
diff --git a/app/src/main/java/org/tasks/location/LocationPickerActivity.kt b/app/src/main/java/org/tasks/location/LocationPickerActivity.kt
index fedb856b2..a8fce2b98 100644
--- a/app/src/main/java/org/tasks/location/LocationPickerActivity.kt
+++ b/app/src/main/java/org/tasks/location/LocationPickerActivity.kt
@@ -90,7 +90,6 @@ class LocationPickerActivity : InjectingAppCompatActivity(), Toolbar.OnMenuItemC
     @Inject lateinit var theme: Theme
     @Inject lateinit var toaster: Toaster
     @Inject lateinit var locationDao: LocationDao
-    @Inject lateinit var searchProvider: PlaceSearchProvider
     @Inject lateinit var permissionChecker: PermissionChecker
     @Inject lateinit var permissionRequestor: ActivityPermissionRequestor
     @Inject lateinit var dialogBuilder: DialogBuilder
@@ -174,7 +173,7 @@ class LocationPickerActivity : InjectingAppCompatActivity(), Toolbar.OnMenuItemC
             appBarLayout.post { expandToolbar(false) }
         }
         findViewById<View>(map.markerId).visibility = View.VISIBLE
-        searchAdapter = LocationSearchAdapter(searchProvider.getAttributionRes(dark), this)
+        searchAdapter = LocationSearchAdapter(viewModel.getAttributionRes(dark), this)
         recentsAdapter = LocationPickerAdapter(this, inventory, colorProvider, this)
         recentsAdapter!!.setHasStableIds(true)
         recyclerView.layoutManager = LinearLayoutManager(this)
diff --git a/app/src/main/java/org/tasks/location/PlaceSearchViewModel.kt b/app/src/main/java/org/tasks/location/PlaceSearchViewModel.kt
index 82b546a99..ba99a6465 100644
--- a/app/src/main/java/org/tasks/location/PlaceSearchViewModel.kt
+++ b/app/src/main/java/org/tasks/location/PlaceSearchViewModel.kt
@@ -1,17 +1,19 @@
 package org.tasks.location
 
 import android.os.Bundle
-import androidx.hilt.lifecycle.ViewModelInject
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModel
 import com.todoroo.andlib.utility.AndroidUtilities
+import dagger.hilt.android.lifecycle.HiltViewModel
 import org.tasks.Event
 import org.tasks.Strings.isNullOrEmpty
 import org.tasks.data.Place
+import javax.inject.Inject
 
-class PlaceSearchViewModel @ViewModelInject constructor(
+@HiltViewModel
+class PlaceSearchViewModel @Inject constructor(
         private val searchProvider: PlaceSearchProvider
 ): ViewModel() {
     private val searchResults = MutableLiveData<List<PlaceSearchResult>>()
@@ -52,4 +54,6 @@ class PlaceSearchViewModel @ViewModelInject constructor(
     private fun setError(message: String) {
         error.value = Event(message)
     }
+
+    fun getAttributionRes(dark: Boolean) = searchProvider.getAttributionRes(dark)
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/tasks/preferences/PreferencesViewModel.kt b/app/src/main/java/org/tasks/preferences/PreferencesViewModel.kt
index 6f0ad01af..3b3b1024f 100644
--- a/app/src/main/java/org/tasks/preferences/PreferencesViewModel.kt
+++ b/app/src/main/java/org/tasks/preferences/PreferencesViewModel.kt
@@ -3,11 +3,11 @@ package org.tasks.preferences
 import android.content.ContentResolver
 import android.content.Context
 import androidx.documentfile.provider.DocumentFile
-import androidx.hilt.lifecycle.ViewModelInject
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.google.api.services.drive.DriveScopes
+import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -20,8 +20,10 @@ import org.tasks.googleapis.InvokerFactory
 import org.tasks.gtasks.GoogleAccountManager
 import timber.log.Timber
 import java.io.File
+import javax.inject.Inject
 
-class PreferencesViewModel @ViewModelInject constructor(
+@HiltViewModel
+class PreferencesViewModel @Inject constructor(
         @ApplicationContext private val context: Context,
         private val preferences: Preferences,
         invokers: InvokerFactory,
diff --git a/app/src/main/java/org/tasks/preferences/fragments/TasksAccountViewModel.kt b/app/src/main/java/org/tasks/preferences/fragments/TasksAccountViewModel.kt
index 47e90b90d..fecaa2779 100644
--- a/app/src/main/java/org/tasks/preferences/fragments/TasksAccountViewModel.kt
+++ b/app/src/main/java/org/tasks/preferences/fragments/TasksAccountViewModel.kt
@@ -1,16 +1,18 @@
 package org.tasks.preferences.fragments
 
-import androidx.hilt.lifecycle.ViewModelInject
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import org.json.JSONObject
 import org.tasks.caldav.CaldavClientProvider
 import org.tasks.data.CaldavAccount
 import timber.log.Timber
+import javax.inject.Inject
 
-class TasksAccountViewModel @ViewModelInject constructor(
+@HiltViewModel
+class TasksAccountViewModel @Inject constructor(
         private val provider: CaldavClientProvider
 ) : ViewModel() {
     val newPassword = MutableLiveData<AppPassword?>()
diff --git a/app/src/main/java/org/tasks/tags/TagPickerViewModel.kt b/app/src/main/java/org/tasks/tags/TagPickerViewModel.kt
index 04841675c..fbcd3fba2 100644
--- a/app/src/main/java/org/tasks/tags/TagPickerViewModel.kt
+++ b/app/src/main/java/org/tasks/tags/TagPickerViewModel.kt
@@ -1,15 +1,17 @@
 package org.tasks.tags
 
-import androidx.hilt.lifecycle.ViewModelInject
 import androidx.lifecycle.*
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import org.tasks.Strings.isNullOrEmpty
 import org.tasks.data.TagData
 import org.tasks.data.TagDataDao
 import org.tasks.tags.CheckBoxTriStates.State
 import java.util.*
+import javax.inject.Inject
 
-class TagPickerViewModel @ViewModelInject constructor(
+@HiltViewModel
+class TagPickerViewModel @Inject constructor(
         private val tagDataDao: TagDataDao
 ) : ViewModel() {
 
diff --git a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
index 3a80767f6..679631224 100644
--- a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
+++ b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
@@ -2,7 +2,6 @@ package org.tasks.ui
 
 import android.content.Context
 import androidx.annotation.MainThread
-import androidx.hilt.lifecycle.ViewModelInject
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.google.ical.values.RRule
@@ -23,6 +22,7 @@ import com.todoroo.astrid.service.TaskCompleter
 import com.todoroo.astrid.service.TaskDeleter
 import com.todoroo.astrid.service.TaskMover
 import com.todoroo.astrid.timers.TimerPlugin
+import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableSet
@@ -44,8 +44,10 @@ import org.tasks.time.DateTimeUtils.currentTimeMillis
 import org.tasks.time.DateTimeUtils.startOfDay
 import timber.log.Timber
 import java.text.ParseException
+import javax.inject.Inject
 
-class TaskEditViewModel @ViewModelInject constructor(
+@HiltViewModel
+class TaskEditViewModel @Inject constructor(
         @ApplicationContext private val context: Context,
         private val taskDao: TaskDao,
         private val taskDeleter: TaskDeleter,
diff --git a/app/src/main/java/org/tasks/ui/TaskListViewModel.kt b/app/src/main/java/org/tasks/ui/TaskListViewModel.kt
index 55905c4a1..3dd3be636 100644
--- a/app/src/main/java/org/tasks/ui/TaskListViewModel.kt
+++ b/app/src/main/java/org/tasks/ui/TaskListViewModel.kt
@@ -1,6 +1,5 @@
 package org.tasks.ui
 
-import androidx.hilt.lifecycle.ViewModelInject
 import androidx.lifecycle.*
 import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
@@ -8,6 +7,7 @@ import androidx.sqlite.db.SimpleSQLiteQuery
 import com.todoroo.andlib.utility.AndroidUtilities
 import com.todoroo.andlib.utility.DateUtilities
 import com.todoroo.astrid.api.Filter
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.tasks.BuildConfig
@@ -17,8 +17,10 @@ import org.tasks.data.TaskDao
 import org.tasks.data.TaskListQuery.getQuery
 import org.tasks.preferences.Preferences
 import timber.log.Timber
+import javax.inject.Inject
 
-class TaskListViewModel @ViewModelInject constructor(
+@HiltViewModel
+class TaskListViewModel @Inject constructor(
         private val preferences: Preferences,
         private val taskDao: TaskDao) : ViewModel(), Observer<PagedList<TaskContainer>> {
 
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 8c4400c4f..7a3ae1386 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -14,8 +14,8 @@ object Versions {
     const val mockito = "3.3.3"
     const val androidx_test = "1.3.0"
     const val make_it_easy = "4.0.1"
-    const val hilt = "2.29.1-alpha"
-    const val hilt_androidx = "1.0.0-alpha02"
+    const val hilt = "2.31.2-alpha"
+    const val hilt_androidx = "1.0.0-alpha03"
     const val lifecycle = "2.2.0"
     const val markwon = "4.6.0"
 }
\ No newline at end of file
diff --git a/deps_fdroid.txt b/deps_fdroid.txt
index 218c6468a..63a46e267 100644
--- a/deps_fdroid.txt
+++ b/deps_fdroid.txt
@@ -208,24 +208,24 @@
 +|    +--- org.dmfs:lib-recur:0.11.4
 +|    |    \--- org.dmfs:rfc5545-datetime:0.2.4
 +|    \--- org.dmfs:jems:1.33
-++--- com.google.dagger:hilt-android:2.29.1-alpha
-+|    +--- com.google.dagger:dagger:2.29.1
+++--- com.google.dagger:hilt-android:2.31.2-alpha
++|    +--- com.google.dagger:dagger:2.31.2
 +|    |    \--- javax.inject:javax.inject:1
-+|    +--- com.google.dagger:dagger-lint-aar:2.29.1
-+|    +--- com.google.dagger:hilt-core:2.29.1-alpha
-+|    |    +--- com.google.dagger:dagger:2.29.1 (*)
-+|    |    +--- javax.annotation:jsr250-api:1.0
++|    +--- com.google.dagger:dagger-lint-aar:2.31.2
++|    +--- com.google.dagger:hilt-core:2.31.2-alpha
++|    |    +--- com.google.dagger:dagger:2.31.2 (*)
 +|    |    \--- javax.inject:javax.inject:1
 +|    +--- androidx.activity:activity:1.1.0 (*)
 +|    +--- androidx.annotation:annotation:1.1.0
-+|    +--- androidx.fragment:fragment:1.2.0 -> 1.2.5 (*)
++|    +--- androidx.fragment:fragment:1.2.5 (*)
 +|    +--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*)
-+|    +--- javax.annotation:jsr250-api:1.0
++|    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 (*)
++|    +--- androidx.savedstate:savedstate:1.0.0 (*)
 +|    \--- javax.inject:javax.inject:1
-++--- androidx.hilt:hilt-work:1.0.0-alpha02
+++--- androidx.hilt:hilt-work:1.0.0-alpha03
 +|    +--- androidx.annotation:annotation:1.1.0
-+|    +--- androidx.hilt:hilt-common:1.0.0-alpha02
-+|    |    \--- com.google.dagger:hilt-android:2.28-alpha -> 2.29.1-alpha (*)
++|    +--- androidx.hilt:hilt-common:1.0.0-alpha03
++|    |    \--- com.google.dagger:hilt-core:2.31-alpha -> 2.31.2-alpha (*)
 +|    +--- androidx.work:work-runtime:2.3.4 -> 2.5.0
 +|    |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.2.0 (*)
@@ -242,13 +242,13 @@
 +|    |    +--- androidx.sqlite:sqlite-framework:2.1.0 (*)
 +|    |    +--- androidx.core:core:1.1.0 -> 1.3.2 (*)
 +|    |    \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*)
-+|    \--- com.google.dagger:hilt-android:2.28-alpha -> 2.29.1-alpha (*)
-++--- androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha02
++|    \--- com.google.dagger:hilt-android:2.31-alpha -> 2.31.2-alpha (*)
+++--- androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03
 +|    +--- androidx.activity:activity:1.1.0 (*)
 +|    +--- androidx.annotation:annotation:1.1.0
-+|    +--- androidx.hilt:hilt-common:1.0.0-alpha02 (*)
++|    +--- androidx.hilt:hilt-common:1.0.0-alpha03 (*)
 +|    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 (*)
-+|    \--- com.google.dagger:hilt-android:2.28-alpha -> 2.29.1-alpha (*)
++|    \--- com.google.dagger:hilt-android:2.31-alpha -> 2.31.2-alpha (*)
 ++--- androidx.fragment:fragment-ktx:1.2.5
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*)
 +|    +--- androidx.fragment:fragment:1.2.5 (*)
diff --git a/deps_googleplay.txt b/deps_googleplay.txt
index 6872c4ea2..e5befc67e 100644
--- a/deps_googleplay.txt
+++ b/deps_googleplay.txt
@@ -24,7 +24,7 @@
 +|    |    +--- com.google.android.datatransport:transport-runtime:2.2.4
 +|    |    |    +--- androidx.annotation:annotation:1.1.0
 +|    |    |    +--- com.google.android.datatransport:transport-api:2.2.1 (*)
-+|    |    |    \--- com.google.dagger:dagger:2.27 -> 2.29.1
++|    |    |    \--- com.google.dagger:dagger:2.27 -> 2.31.2
 +|    |    |         \--- javax.inject:javax.inject:1
 +|    |    \--- com.google.firebase:firebase-encoders-json:16.1.0 -> 17.0.0
 +|    |         +--- androidx.annotation:annotation:1.1.0
@@ -320,23 +320,23 @@
 +|    +--- org.dmfs:lib-recur:0.11.4
 +|    |    \--- org.dmfs:rfc5545-datetime:0.2.4
 +|    \--- org.dmfs:jems:1.33
-++--- com.google.dagger:hilt-android:2.29.1-alpha
-+|    +--- com.google.dagger:dagger:2.29.1 (*)
-+|    +--- com.google.dagger:dagger-lint-aar:2.29.1
-+|    +--- com.google.dagger:hilt-core:2.29.1-alpha
-+|    |    +--- com.google.dagger:dagger:2.29.1 (*)
-+|    |    +--- javax.annotation:jsr250-api:1.0
+++--- com.google.dagger:hilt-android:2.31.2-alpha
++|    +--- com.google.dagger:dagger:2.31.2 (*)
++|    +--- com.google.dagger:dagger-lint-aar:2.31.2
++|    +--- com.google.dagger:hilt-core:2.31.2-alpha
++|    |    +--- com.google.dagger:dagger:2.31.2 (*)
 +|    |    \--- javax.inject:javax.inject:1
 +|    +--- androidx.activity:activity:1.1.0 (*)
 +|    +--- androidx.annotation:annotation:1.1.0
-+|    +--- androidx.fragment:fragment:1.2.0 -> 1.2.5 (*)
++|    +--- androidx.fragment:fragment:1.2.5 (*)
 +|    +--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*)
-+|    +--- javax.annotation:jsr250-api:1.0
++|    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 (*)
++|    +--- androidx.savedstate:savedstate:1.0.0 (*)
 +|    \--- javax.inject:javax.inject:1
-++--- androidx.hilt:hilt-work:1.0.0-alpha02
+++--- androidx.hilt:hilt-work:1.0.0-alpha03
 +|    +--- androidx.annotation:annotation:1.1.0
-+|    +--- androidx.hilt:hilt-common:1.0.0-alpha02
-+|    |    \--- com.google.dagger:hilt-android:2.28-alpha -> 2.29.1-alpha (*)
++|    +--- androidx.hilt:hilt-common:1.0.0-alpha03
++|    |    \--- com.google.dagger:hilt-core:2.31-alpha -> 2.31.2-alpha (*)
 +|    +--- androidx.work:work-runtime:2.3.4 -> 2.5.0
 +|    |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.2.0 (*)
@@ -353,13 +353,13 @@
 +|    |    +--- androidx.sqlite:sqlite-framework:2.1.0 (*)
 +|    |    +--- androidx.core:core:1.1.0 -> 1.3.2 (*)
 +|    |    \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*)
-+|    \--- com.google.dagger:hilt-android:2.28-alpha -> 2.29.1-alpha (*)
-++--- androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha02
++|    \--- com.google.dagger:hilt-android:2.31-alpha -> 2.31.2-alpha (*)
+++--- androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03
 +|    +--- androidx.activity:activity:1.1.0 (*)
 +|    +--- androidx.annotation:annotation:1.1.0
-+|    +--- androidx.hilt:hilt-common:1.0.0-alpha02 (*)
++|    +--- androidx.hilt:hilt-common:1.0.0-alpha03 (*)
 +|    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 (*)
-+|    \--- com.google.dagger:hilt-android:2.28-alpha -> 2.29.1-alpha (*)
++|    \--- com.google.dagger:hilt-android:2.31-alpha -> 2.31.2-alpha (*)
 ++--- androidx.fragment:fragment-ktx:1.2.5
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*)
 +|    +--- androidx.fragment:fragment:1.2.5 (*)