diff --git a/buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Versions.kt b/buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Versions.kt
index fdab4cbe..f1a7bc28 100644
--- a/buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Versions.kt
+++ b/buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Versions.kt
@@ -2,10 +2,10 @@ package com.example.util.simpletimetracker
 
 object Versions {
     const val gradle = "4.2.0"
-    const val kotlin = "1.5.10"
+    const val kotlin = "1.7.21"
     const val ktlint = "10.1.0"
 
-    const val coroutines = "1.5.0"
+    const val coroutines = "1.6.4"
     const val timber = "4.7.1"
     const val javax = "1"
 
@@ -14,7 +14,7 @@ object Versions {
     const val recyclerView = "1.1.0"
     const val lifecycleExtensions = "2.2.0"
     const val room = "2.2.5"
-    const val dagger = "2.36"
+    const val dagger = "2.42"
     const val viewpager2 = "1.0.0"
     const val flexBox = "2.0.1"
     const val cardView = "1.0.0"
diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/dialog/ArchiveDialogListener.kt b/core/src/main/java/com/example/util/simpletimetracker/core/dialog/ArchiveDialogListener.kt
index 053ad78b..6594b807 100644
--- a/core/src/main/java/com/example/util/simpletimetracker/core/dialog/ArchiveDialogListener.kt
+++ b/core/src/main/java/com/example/util/simpletimetracker/core/dialog/ArchiveDialogListener.kt
@@ -4,6 +4,6 @@ import com.example.util.simpletimetracker.navigation.params.screen.ArchiveDialog
 
 interface ArchiveDialogListener {
 
-    fun onDeleteClick(params: ArchiveDialogParams?)
-    fun onRestoreClick(params: ArchiveDialogParams?)
+    fun onDeleteClick(params: ArchiveDialogParams)
+    fun onRestoreClick(params: ArchiveDialogParams)
 }
\ No newline at end of file
diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/TimeMapper.kt b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/TimeMapper.kt
index e34aa5ff..73b83050 100644
--- a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/TimeMapper.kt
+++ b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/TimeMapper.kt
@@ -320,6 +320,9 @@ class TimeMapper @Inject constructor(
                 is RangeLength.Week -> setWeekToFirstDay()
                 is RangeLength.Month -> set(Calendar.DAY_OF_MONTH, 1)
                 is RangeLength.Year -> set(Calendar.DAY_OF_YEAR, 1)
+                else -> {
+                    // Do nothing
+                }
             }
             set(Calendar.HOUR_OF_DAY, 0)
             set(Calendar.MINUTE, 0)
diff --git a/features/feature_archive/src/main/java/com/example/util/simpletimetracker/feature_archive/view/ArchiveFragment.kt b/features/feature_archive/src/main/java/com/example/util/simpletimetracker/feature_archive/view/ArchiveFragment.kt
index 146d9724..ba4b91e8 100644
--- a/features/feature_archive/src/main/java/com/example/util/simpletimetracker/feature_archive/view/ArchiveFragment.kt
+++ b/features/feature_archive/src/main/java/com/example/util/simpletimetracker/feature_archive/view/ArchiveFragment.kt
@@ -68,10 +68,10 @@ class ArchiveFragment :
         }
     }
 
-    override fun onDeleteClick(params: ArchiveDialogParams?) =
+    override fun onDeleteClick(params: ArchiveDialogParams) =
         viewModel.onDeleteClick(params)
 
-    override fun onRestoreClick(params: ArchiveDialogParams?) =
+    override fun onRestoreClick(params: ArchiveDialogParams) =
         viewModel.onRestoreClick(params)
 
     override fun onPositiveClick(tag: String?, data: Any?) =
diff --git a/features/feature_archive/src/main/java/com/example/util/simpletimetracker/feature_archive/viewModel/ArchiveViewModel.kt b/features/feature_archive/src/main/java/com/example/util/simpletimetracker/feature_archive/viewModel/ArchiveViewModel.kt
index 6de33397..7bf02165 100644
--- a/features/feature_archive/src/main/java/com/example/util/simpletimetracker/feature_archive/viewModel/ArchiveViewModel.kt
+++ b/features/feature_archive/src/main/java/com/example/util/simpletimetracker/feature_archive/viewModel/ArchiveViewModel.kt
@@ -70,18 +70,16 @@ class ArchiveViewModel @Inject constructor(
         }
     }
 
-    fun onRestoreClick(params: ArchiveDialogParams?) {
+    fun onRestoreClick(params: ArchiveDialogParams) {
         viewModelScope.launch {
-            var message = ""
-
-            when (params) {
+            val message: String = when (params) {
                 is ArchiveDialogParams.Activity -> {
                     recordTypeInteractor.restore(params.id)
-                    message = resourceRepo.getString(R.string.archive_activity_restored)
+                    resourceRepo.getString(R.string.archive_activity_restored)
                 }
                 is ArchiveDialogParams.RecordTag -> {
                     recordTagInteractor.restore(params.id)
-                    message = resourceRepo.getString(R.string.archive_tag_restored)
+                    resourceRepo.getString(R.string.archive_tag_restored)
                 }
             }
 
@@ -96,18 +94,16 @@ class ArchiveViewModel @Inject constructor(
         }
     }
 
-    private fun onDelete(params: ArchiveDialogParams?) {
+    private fun onDelete(params: ArchiveDialogParams) {
         viewModelScope.launch {
-            var message = ""
-
-            when (params) {
+            val message = when (params) {
                 is ArchiveDialogParams.Activity -> {
                     recordTypeInteractor.remove(params.id)
-                    message = resourceRepo.getString(R.string.archive_activity_deleted)
+                    resourceRepo.getString(R.string.archive_activity_deleted)
                 }
                 is ArchiveDialogParams.RecordTag -> {
                     recordTagInteractor.remove(params.id)
-                    message = resourceRepo.getString(R.string.archive_tag_deleted)
+                    resourceRepo.getString(R.string.archive_tag_deleted)
                 }
             }