Merge pull request #19 from gradle/tt/use-blocks-instead-of-flags

Support blocks instead of flags for jacoco and kotlin serialization in Android, consolidate testing functionality

core/data/build.gradle.dcl

@@ -1,9 +1,6 @@
 androidLibrary {
     namespace = "com.google.samples.apps.nowinandroid.core.data"
 
-    includeKotlinSerialization = true
-    configureJacoco = true
-
     dependencies {
         api(project(":core:common"))
         api(project(":core:database"))
@@ -19,9 +16,9 @@ androidLibrary {
         testImplementation(project(":core:network"))
     }
 
-    testOptions {
+    kotlinSerialization {
-        includeAndroidResources = true
+        version = "1.6.3"
-        returnDefaultValues = true
+        json()
     }
 
     buildTypes {
@@ -29,4 +26,15 @@ androidLibrary {
         debug {}
         release {}
     }
+
+    testing {
+        jacoco {
+            version = "0.8.7"
+        }
+
+        testOptions {
+            includeAndroidResources = true
+            returnDefaultValues = true
+        }
+    }
 }

core/domain/build.gradle.dcl

@@ -1,8 +1,6 @@
 androidLibrary {
     namespace = "com.google.samples.apps.nowinandroid.core.domain"
 
-    configureJacoco = true
-
     dependencies {
         implementation("javax.inject:javax.inject:1")
 
@@ -17,4 +15,10 @@ androidLibrary {
         debug {}
         release {}
     }
+
+    testing {
+        jacoco {
+            version = "0.8.7"
+        }
+    }
 }

gradle/libs.versions.toml

@@ -162,7 +162,7 @@ firebase-perf = { id = "com.google.firebase.firebase-perf", version.ref = "fireb
 gms = { id = "com.google.gms.google-services", version.ref = "gmsPlugin" }
 hilt = { id = "com.google.dagger.hilt.android" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm" }
-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization" }
 ksp = { id = "com.google.devtools.ksp" }
 module-graph = { id = "com.jraska.module.graph.assertion", version.ref = "moduleGraph" }
 protobuf = { id = "com.google.protobuf", version.ref = "protobufPlugin" }