Fix kover code coverage breaking changes

sebaslogen · May 28, 2024 · b5af9b4 · b5af9b4
1 parent 3e35c13
commit b5af9b4
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 49 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,6 +40,7 @@ captures/
 # IntelliJ
 *.iml
 .idea/*
+.kotlin/
 
 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.

diff --git a/resaca/api/resaca.api b/resaca/api/resaca.api
@@ -85,6 +85,5 @@ public final class com/sebaslogen/resaca/ScopedViewModelOwner {
 
 public final class com/sebaslogen/resaca/ViewModelCreationExtrasKt {
 	public static final fun addDefaultArguments (Landroidx/lifecycle/viewmodel/CreationExtras;Landroid/os/Bundle;)Landroidx/lifecycle/viewmodel/CreationExtras;
-	public static final fun toCreateCreationExtras (Landroid/os/Bundle;)Landroidx/lifecycle/viewmodel/CreationExtras;
 }
 
diff --git a/resaca/src/main/java/com/sebaslogen/resaca/ViewModelCreationExtras.kt b/resaca/src/main/java/com/sebaslogen/resaca/ViewModelCreationExtras.kt
@@ -18,9 +18,4 @@ public fun CreationExtras.addDefaultArguments(defaultArguments: Bundle): Creatio
             val combinedBundle = (get(DEFAULT_ARGS_KEY) ?: Bundle()).apply { putAll(defaultArguments) }
             set(DEFAULT_ARGS_KEY, combinedBundle)
         }
-    }
-
-/**
- * Convert the receiver [Bundle] to a [CreationExtras] object containing the same key-value pairs.
- */
-public fun Bundle.toCreateCreationExtras(): CreationExtras = MutableCreationExtras().apply { putAll(this@toCreateCreationExtras) }
+    }
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -35,7 +35,7 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-     kotlinOptions {
+    kotlinOptions {
         jvmTarget = JavaVersion.VERSION_17.toString()
     }
     packaging {
@@ -147,44 +147,51 @@ dependencies {
     kover(project(":resacakoin"))
 }
 
-//kover {
-//    reports {
-//        androidReports("debug") {
-//            filters {
-//                excludes {
-//                    classes(
-//                        "*Fragment",
-//                        "*Fragment\$*",
-//                        "*Activity",
-//                        "*Activity\$*",
-//                        "*.databinding.*",
-//                        "*.BuildConfig",
-//                        "*ComposableSingletons\$*",
-//                        "*ColorKt*",
-//                        "*ThemeKt*",
-//                        "*TypeKt*",
-//                        "hilt_aggregated_deps.*",
-//                        "*dagger.hilt.internal.aggregatedroot.codegen*",
-//                        "*com.sebaslogen.resacaapp.sample*", // Ignore sample code
-//                        "*com.sebaslogen.resaca.ViewModelNewInstanceFactory*", // Skip class that is not used in code but used as backup for ViewModelFactory
-//                    )
-//                }
-//                html {
-//                    onCheck = true
-//                }
-//                xml {
-//                    onCheck = true
-//                }
-//                verify {
-//                    onCheck = true
-//                }
-//            }
-//
-//            verify {
-//                rule {
-//                    minBound(90)
-//                }
-//            }
-//        }
-//    }
-//}
+kover {
+    currentProject {
+        createVariant("custom") {
+            /**
+             * Tests, sources, classes, and compilation tasks of the 'debug' build variant will be included in the report variant `custom`.
+             * Thus, information from the 'debug' variant will be included in the `custom` report for this project and any project that specifies this project as a dependency.
+             */
+            addWithDependencies("debug")
+        }
+    }
+    reports {
+        // filters for all report types of all build variants
+        filters {
+            excludes {
+                androidGeneratedClasses()
+            }
+        }
+        variant("custom") {
+            filters {
+                excludes {
+                    androidGeneratedClasses()
+                    classes(
+                        "*Fragment",
+                        "*Fragment\$*",
+                        "*Activity",
+                        "*Activity\$*",
+                        "*.databinding.*",
+                        "*.BuildConfig",
+                        "*ComposableSingletons\$*",
+                        "*ColorKt*",
+                        "*ThemeKt*",
+                        "*TypeKt*",
+                        "hilt_aggregated_deps.*",
+                        "*dagger.hilt.internal.aggregatedroot.codegen*",
+                        "*com.sebaslogen.resacaapp.sample*", // Ignore sample code
+                        "*com.sebaslogen.resaca.ViewModelNewInstanceFactory*", // Skip class that is not used in code but used as backup for ViewModelFactory
+                    )
+                }
+            }
+
+            verify {
+                rule {
+                    minBound(90)
+                }
+            }
+        }
+    }
+}