Skip to content

Commit 1ebbb21

Browse files
committed
build: remove broken jacoco-android plugin
Removes com.mxalbert.gradle.jacoco-android plugin which is incompatible with AGP 9.0. Removed related configuration from convention plugin and test workflow.
1 parent cadfb32 commit 1ebbb21

3 files changed

Lines changed: 1 addition & 21 deletions

File tree

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
distribution: 'temurin'
4343

4444
- name: Build modules
45-
run: ./gradlew build jacocoTestReport -x :maps-app:generateDebugScreenshotTestConfig -x :maps-app:generateReleaseScreenshotTestConfig --stacktrace
45+
run: ./gradlew build -x :maps-app:generateDebugScreenshotTestConfig -x :maps-app:generateReleaseScreenshotTestConfig --stacktrace
4646

4747
- name: Run Screenshot Tests
4848
run: ./gradlew :maps-app:validateDebugScreenshotTest

build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,23 @@ import com.vanniktech.maven.publish.MavenPublishBaseExtension
44
import org.gradle.api.Plugin
55
import org.gradle.api.Project
66
import org.gradle.kotlin.dsl.*
7-
import org.gradle.testing.jacoco.plugins.JacocoPluginExtension
87
import org.gradle.api.tasks.testing.Test
9-
import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
108

119
class PublishingConventionPlugin : Plugin<Project> {
1210
override fun apply(project: Project) {
1311
project.run {
1412

1513
applyPlugins()
16-
configureJacoco()
1714
configureVanniktechPublishing()
1815
}
1916
}
2017

2118
private fun Project.applyPlugins() {
2219
apply(plugin = "com.android.library")
23-
apply(plugin = "com.mxalbert.gradle.jacoco-android")
2420
apply(plugin = "org.jetbrains.dokka")
2521
apply(plugin = "com.vanniktech.maven.publish")
2622
}
2723

28-
private fun Project.configureJacoco() {
29-
configure<JacocoPluginExtension> {
30-
toolVersion = "0.8.7"
31-
32-
}
33-
34-
tasks.withType<Test>().configureEach {
35-
extensions.configure(JacocoTaskExtension::class.java) {
36-
isIncludeNoLocationClasses = true
37-
excludes = listOf("jdk.internal.*")
38-
}
39-
}
40-
}
41-
4224
private fun Project.configureVanniktechPublishing() {
4325
extensions.configure<MavenPublishBaseExtension> {
4426
configure(

gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ androidTargetSdk = "36"
1010
agp = "9.0.0"
1111
dokka = "2.1.0"
1212
gradleMavenPublishPlugin = "0.36.0"
13-
jacoco-plugin = "0.2.1"
1413
kotlin = "2.3.0"
1514
kotlinxCoroutines = "1.10.2"
1615

@@ -49,7 +48,6 @@ truth = "1.4.5"
4948
android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }
5049
dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
5150
gradle-maven-publish-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradleMavenPublishPlugin" }
52-
jacoco-android-plugin = { module = "com.mxalbert.gradle:jacoco-android", version.ref = "jacoco-plugin", version.require = "0.2.1" }
5351
kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" }
5452
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
5553
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }

0 commit comments

Comments
 (0)