Merge branch 'kts' of https://github.com/nightscout/AndroidAPS into kts

core/nssdk/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     id("kotlinx-serialization")
     id("android-module-dependencies")
     id("test-module-dependencies")
+    id("jacoco-module-dependencies")
 }
 
 android {

database/entities/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     id("kotlin-kapt")
     id("android-module-dependencies")
     id("test-module-dependencies")
+    id("jacoco-module-dependencies")
 }
 
 android {

jacoco_aggregation.gradle.kts

@@ -76,6 +76,12 @@ project.afterEvaluate {
                         it.add(path)
                         println("Collecting execution data from: $path")
                     }
+                    val androidPath = "${proj.buildDir}/outputs/code_coverage/${variant}AndroidTest/connected/"
+                    val androidFiles = fileTree(androidPath)
+                    androidFiles.forEach { file ->
+                        it.add(file.path)
+                        println("Collecting android execution data from: ${file.path}")
+                    }
                 }
             }
         }

plugins/constraints/build.gradle.kts

@@ -3,8 +3,8 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-module-dependencies")
     id("all-open-dependencies")
+    id("test-module-dependencies")
     id("jacoco-module-dependencies")
 }
 

plugins/smoothing/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
+    id("test-module-dependencies")
     id("jacoco-module-dependencies")
 }
 

pump/combov2/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
+    id("test-module-dependencies")
     id("jacoco-module-dependencies")
 }
 

pump/combov2/comboctl/build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     id("com.android.library")
     id("kotlin-android")
     id("android-module-dependencies")
+    id("test-module-dependencies")
     id("jacoco-module-dependencies")
 }
 

pump/danar/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
+    id("test-module-dependencies")
     id("jacoco-module-dependencies")
 }
 

pump/diaconn/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
+    id("test-module-dependencies")
     id("jacoco-module-dependencies")
 }
 

pump/eopatch/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
+    id("test-module-dependencies")
     id("jacoco-module-dependencies")
 }
 

pump/omnipod-common/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
+    id("test-module-dependencies")
     id("jacoco-module-dependencies")
 }
 

shared/tests/build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     id("com.android.library")
     id("kotlin-android")
     id("android-module-dependencies")
+    id("test-module-dependencies")
     id("jacoco-module-dependencies")
 }
 

workflow/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
+    id("test-module-dependencies")
     id("jacoco-module-dependencies")
 }