Merge 45ae844 into 549cbb4

getsentry · Aug 8, 2023 · b58b3b4 · b58b3b4
2 parents 549cbb4 + 45ae844
commit b58b3b4
Show file tree

Hide file tree

Showing 11 changed files with 77 additions and 50 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
-.PHONY: all clean compile javadocs dryRelease update stop checkFormat format api assembleBenchmarkTestRelease assembleUiTestRelease
+.PHONY: all clean compile javadocs dryRelease update stop checkFormat format api assembleBenchmarkTestRelease assembleUiTestRelease androidCoverageReport
 
-all: stop clean javadocs compile
+all: stop clean javadocs compile jacocoTestReport
 assembleBenchmarks: stop clean assembleBenchmarkTestRelease
 assembleUiTests: stop clean assembleUiTestRelease
 
@@ -50,3 +50,7 @@ assembleBenchmarkTestRelease:
 assembleUiTestRelease:
 	./gradlew :sentry-android-integration-tests:sentry-uitest-android:assembleRelease
 	./gradlew :sentry-android-integration-tests:sentry-uitest-android:assembleAndroidTest -DtestBuildType=release
+
+# Create coverage reports
+jacocoTestReport:
+	./gradlew jacocoTestReport
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,6 +14,7 @@ plugins {
     id(Config.QualityPlugins.detekt) version Config.QualityPlugins.detektVersion
     `maven-publish`
     id(Config.QualityPlugins.binaryCompatibilityValidator) version Config.QualityPlugins.binaryCompatibilityValidatorVersion
+    id(Config.QualityPlugins.jacocoAndroid) version Config.QualityPlugins.jacocoAndroidVersion apply false
 }
 
 buildscript {
@@ -97,6 +98,66 @@ allprojects {
 }
 
 subprojects {
+    val jacocoAndroidModules = listOf(
+        "sentry-android-core",
+        "sentry-android-fragment",
+        "sentry-android-navigation",
+        "sentry-android-ndk",
+        "sentry-android-okhttp",
+        "sentry-android-sqlite",
+        "sentry-android-timber",
+        "sentry-compose"
+    )
+    if (jacocoAndroidModules.contains(name)) {
+        afterEvaluate {
+            jacoco {
+                toolVersion = "0.8.10"
+            }
+
+            tasks.withType<Test> {
+                configure<JacocoTaskExtension> {
+                    isIncludeNoLocationClasses = true
+                    excludes = listOf("jdk.internal.*")
+                }
+            }
+
+            tasks.getByName("jacocoTestReport") {
+                if (this@afterEvaluate.name == "sentry-compose") {
+                    dependsOn("jacocoCompose")
+                }
+            }
+        }
+    }
+
+    // Handle Jacoco for KMP modules manually
+    if (name == "sentry-compose") {
+        tasks.create("jacocoCompose", JacocoReport::class) {
+            dependsOn("testReleaseUnitTest")
+
+            reports {
+                html.required.set(false)
+                xml.required.set(true)
+            }
+
+            val classesDir = "$buildDir/tmp/kotlin-classes/release"
+            val sourcesDir = "$projectDir/src/androidMain/kotlin"
+
+            val classesTree = fileTree(classesDir).setExcludes(
+                listOf(
+                    "**/R.class",
+                    "**/R$*.class",
+                    "**/BuildConfig.*",
+                    "**/Manifest*.*",
+                    "**/*Test*.*",
+                    "android/**/*.*"
+                )
+            )
+            executionData.setFrom("$buildDir/jacoco/testReleaseUnitTest.exec")
+            classDirectories.setFrom(classesTree)
+            sourceDirectories.setFrom(sourcesDir)
+        }
+    }
+
     plugins.withId(Config.QualityPlugins.detektPlugin) {
         configure<DetektExtension> {
             buildUponDefaultConfig = true

diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
@@ -205,6 +205,8 @@ object Config {
         val binaryCompatibilityValidatorVersion = "0.13.0"
         val binaryCompatibilityValidatorPlugin = "org.jetbrains.kotlinx:binary-compatibility-validator:$binaryCompatibilityValidatorVersion"
         val binaryCompatibilityValidator = "org.jetbrains.kotlinx.binary-compatibility-validator"
+        val jacocoAndroid = "com.mxalbert.gradle.jacoco-android"
+        val jacocoAndroidVersion = "0.2.0"
     }
 
     object Sentry {

diff --git a/sentry-android-core/build.gradle.kts b/sentry-android-core/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
     id("com.android.library")
     kotlin("android")
     jacoco
+    id(Config.QualityPlugins.jacocoAndroid)
     id(Config.QualityPlugins.errorProne)
     id(Config.QualityPlugins.gradleVersions)
 }
@@ -64,12 +65,6 @@ android {
     }
 }
 
-tasks.withType<Test> {
-    configure<JacocoTaskExtension> {
-        isIncludeNoLocationClasses = false
-    }
-}
-
 tasks.withType<JavaCompile>().configureEach {
     options.errorprone {
         check("NullAway", net.ltgt.gradle.errorprone.CheckSeverity.ERROR)

diff --git a/sentry-android-fragment/build.gradle.kts b/sentry-android-fragment/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id("com.android.library")
     kotlin("android")
     jacoco
+    id(Config.QualityPlugins.jacocoAndroid)
     id(Config.QualityPlugins.gradleVersions)
     id(Config.QualityPlugins.detektPlugin)
 }
@@ -54,12 +55,6 @@ android {
     }
 }
 
-tasks.withType<Test> {
-    configure<JacocoTaskExtension> {
-        isIncludeNoLocationClasses = false
-    }
-}
-
 kotlin {
     explicitApi()
 }

diff --git a/sentry-android-navigation/build.gradle.kts b/sentry-android-navigation/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id("com.android.library")
     kotlin("android")
     jacoco
+    id(Config.QualityPlugins.jacocoAndroid)
     id(Config.QualityPlugins.gradleVersions)
     id(Config.QualityPlugins.detektPlugin)
 }
@@ -55,12 +56,6 @@ android {
     }
 }
 
-tasks.withType<Test> {
-    configure<JacocoTaskExtension> {
-        isIncludeNoLocationClasses = false
-    }
-}
-
 kotlin {
     explicitApi()
 }

diff --git a/sentry-android-ndk/build.gradle.kts b/sentry-android-ndk/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id("com.android.library")
     kotlin("android")
     jacoco
+    id(Config.QualityPlugins.jacocoAndroid)
     id(Config.NativePlugins.nativeBundleExport)
     id(Config.QualityPlugins.gradleVersions)
 }
@@ -96,12 +97,6 @@ android {
     }
 }
 
-tasks.withType<Test> {
-    configure<JacocoTaskExtension> {
-        isIncludeNoLocationClasses = false
-    }
-}
-
 dependencies {
     api(projects.sentry)
     api(projects.sentryAndroidCore)

diff --git a/sentry-android-okhttp/build.gradle.kts b/sentry-android-okhttp/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
     id("com.android.library")
     kotlin("android")
     jacoco
+    id(Config.QualityPlugins.jacocoAndroid)
     id(Config.QualityPlugins.gradleVersions)
     id(Config.QualityPlugins.detektPlugin)
 }
@@ -56,12 +57,6 @@ android {
     }
 }
 
-tasks.withType<Test> {
-    configure<JacocoTaskExtension> {
-        isIncludeNoLocationClasses = false
-    }
-}
-
 kotlin {
     explicitApi()
 }

diff --git a/sentry-android-sqlite/build.gradle.kts b/sentry-android-sqlite/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
     id("com.android.library")
     kotlin("android")
     jacoco
+    id(Config.QualityPlugins.jacocoAndroid)
     id(Config.QualityPlugins.gradleVersions)
     id(Config.QualityPlugins.detektPlugin)
 }
@@ -56,12 +57,6 @@ android {
     }
 }
 
-tasks.withType<Test> {
-    configure<JacocoTaskExtension> {
-        isIncludeNoLocationClasses = false
-    }
-}
-
 kotlin {
     explicitApi()
 }

diff --git a/sentry-android-timber/build.gradle.kts b/sentry-android-timber/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
     id("com.android.library")
     kotlin("android")
     jacoco
+    id(Config.QualityPlugins.jacocoAndroid)
     id(Config.QualityPlugins.gradleVersions)
     id(Config.QualityPlugins.detektPlugin)
 }
@@ -59,12 +60,6 @@ android {
     }
 }
 
-tasks.withType<Test> {
-    configure<JacocoTaskExtension> {
-        isIncludeNoLocationClasses = false
-    }
-}
-
 kotlin {
     explicitApi()
 }

diff --git a/sentry-compose/build.gradle.kts b/sentry-compose/build.gradle.kts
@@ -9,6 +9,7 @@ plugins {
     id("com.android.library")
     id("org.jetbrains.compose")
     jacoco
+    id(Config.QualityPlugins.jacocoAndroid)
     id(Config.QualityPlugins.gradleVersions)
     id(Config.QualityPlugins.detektPlugin)
     id(Config.BuildPlugins.dokkaPluginAlias)
@@ -113,12 +114,6 @@ android {
     }
 }
 
-tasks.withType<Test> {
-    configure<JacocoTaskExtension> {
-        isIncludeNoLocationClasses = false
-    }
-}
-
 tasks.withType<Detekt> {
     // Target version of the generated JVM bytecode. It is used for type resolution.
     jvmTarget = JavaVersion.VERSION_1_8.toString()