From bd099fd4ee592e0aec3eced7d7809e22d07c22d6 Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Tue, 28 May 2024 16:44:47 -0500
Subject: [PATCH] Update Kover to 0.8.0. (#1396)

---
 app/build.gradle.kts                          | 83 +++++++++++--------
 .../disk/legacy/LegacySecureStorageImpl.kt    |  1 +
 .../manager/clipboard/ClearClipboardWorker.kt |  8 +-
 .../composition/LocalManagerProvider.kt       |  3 +
 .../qrcodescan/util/QrCodeAnalyzerImpl.kt     |  1 +
 gradle/libs.versions.toml                     |  2 +-
 6 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index fb440e766f..d4074f462a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -190,39 +190,56 @@ detekt {
 }
 
 kover {
-    excludeJavaCode()
-}
-
-koverReport {
-    filters {
-        excludes {
-            annotatedBy(
-                // Compose previews
-                "androidx.compose.ui.tooling.preview.Preview",
-                // Manually excluded classes/files/etc.
-                "com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage"
-            )
-            classes(
-                // Navigation helpers
-                "*.*NavigationKt*",
-                // Composable singletons
-                "*.*ComposableSingletons*",
-                // Generated classes related to interfaces with default values
-                "*.*DefaultImpls*",
-                // Databases
-                "*.database.*Database*",
-                "*.dao.*Dao*",
-            )
-            packages(
-                // Dependency injection
-                "*.di",
-                // Models
-                "*.model",
-                // Custom UI components
-                "com.x8bit.bitwarden.ui.platform.components",
-                // Theme-related code
-                "com.x8bit.bitwarden.ui.platform.theme",
-            )
+    currentProject {
+        sources {
+            excludeJava = true
+        }
+    }
+    reports {
+        filters {
+            excludes {
+                androidGeneratedClasses()
+                annotatedBy(
+                    // Compose previews
+                    "androidx.compose.ui.tooling.preview.Preview",
+                    // Manually excluded classes/files/etc.
+                    "com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage",
+                )
+                classes(
+                    // Navigation helpers
+                    "*.*NavigationKt*",
+                    // Composable singletons
+                    "*.*ComposableSingletons*",
+                    // Generated classes related to interfaces with default values
+                    "*.*DefaultImpls*",
+                    // Databases
+                    "*.database.*Database*",
+                    "*.dao.*Dao*",
+                    // Dagger Hilt
+                    "dagger.hilt.*",
+                    "hilt_aggregated_deps.*",
+                    "*_Factory",
+                    "*_Factory\$*",
+                    "*_*Factory",
+                    "*_*Factory\$*",
+                    "*.Hilt_*",
+                    "*_HiltModules",
+                    "*_HiltModules\$*",
+                    "*_Impl",
+                    "*_Impl\$*",
+                    "*_MembersInjector",
+                )
+                packages(
+                    // Dependency injection
+                    "*.di",
+                    // Models
+                    "*.model",
+                    // Custom UI components
+                    "com.x8bit.bitwarden.ui.platform.components",
+                    // Theme-related code
+                    "com.x8bit.bitwarden.ui.platform.theme",
+                )
+            }
         }
     }
 }
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/legacy/LegacySecureStorageImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/legacy/LegacySecureStorageImpl.kt
index 9df4de0b24..971295a447 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/legacy/LegacySecureStorageImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/legacy/LegacySecureStorageImpl.kt
@@ -158,6 +158,7 @@ class LegacySecureStorageImpl(
 }
 
 @Suppress("MagicNumber")
+@OmitFromCoverage
 private class AndroidKeyStore(
     private val legacySecureStorage: LegacySecureStorage,
     private val sharedPreferences: SharedPreferences,
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/ClearClipboardWorker.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/ClearClipboardWorker.kt
index 6803f4016a..cf12b975fa 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/ClearClipboardWorker.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/ClearClipboardWorker.kt
@@ -5,12 +5,16 @@ import android.content.Context
 import android.content.Context.CLIPBOARD_SERVICE
 import androidx.work.Worker
 import androidx.work.WorkerParameters
+import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage
 
 /**
  * A worker to clear the clipboard manager.
  */
-class ClearClipboardWorker(appContext: Context, workerParams: WorkerParameters) :
-    Worker(appContext, workerParams) {
+@OmitFromCoverage
+class ClearClipboardWorker(
+    appContext: Context,
+    workerParams: WorkerParameters,
+) : Worker(appContext, workerParams) {
 
     private val clipboardManager =
         appContext.getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/composition/LocalManagerProvider.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/composition/LocalManagerProvider.kt
index 343553d188..08f9ec5f7f 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/composition/LocalManagerProvider.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/composition/LocalManagerProvider.kt
@@ -1,3 +1,5 @@
+@file:OmitFromCoverage
+
 package com.x8bit.bitwarden.ui.platform.composition
 
 import android.app.Activity
@@ -7,6 +9,7 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.ui.platform.LocalContext
+import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage
 import com.x8bit.bitwarden.ui.platform.manager.biometrics.BiometricsManager
 import com.x8bit.bitwarden.ui.platform.manager.biometrics.BiometricsManagerImpl
 import com.x8bit.bitwarden.ui.platform.manager.exit.ExitManager
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/util/QrCodeAnalyzerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/util/QrCodeAnalyzerImpl.kt
index a8c2eb8278..2b57a79c2e 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/util/QrCodeAnalyzerImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/util/QrCodeAnalyzerImpl.kt
@@ -68,5 +68,6 @@ class QrCodeAnalyzerImpl : QrCodeAnalyzer {
 /**
  * This function helps us prepare the byte buffer to be read.
  */
+@OmitFromCoverage
 private fun ByteBuffer.toByteArray(): ByteArray =
     ByteArray(rewind().remaining()).also { get(it) }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a3235593c4..d8fdc3f69d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -41,7 +41,7 @@ kotlinCompilerExtensionVersion = "1.5.14"
 kotlinxCollectionsImmutable = "0.3.7"
 kotlinxCoroutines = "1.8.1"
 kotlinxSerialization = "1.6.3"
-kotlinxKover = "0.7.6"
+kotlinxKover = "0.8.0"
 ksp = "1.9.24-1.0.20"
 mockk = "1.13.11"
 okhttp = "4.12.0"