Skip to content

Commit a4b95a1

Browse files
committed
build: revert some deps to fix jacoco
1 parent 1ebbb21 commit a4b95a1

4 files changed

Lines changed: 25 additions & 5 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 -x :maps-app:generateDebugScreenshotTestConfig -x :maps-app:generateReleaseScreenshotTestConfig --stacktrace
45+
run: ./gradlew build jacocoTestReport -x :maps-app:generateDebugScreenshotTestConfig -x :maps-app:testDebugScreenshotTest -x :maps-app:generateReleaseScreenshotTestConfig -x :maps-app:testReleaseScreenshotTest --stacktrace
4646

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

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,41 @@ 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
78
import org.gradle.api.tasks.testing.Test
9+
import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
810

911
class PublishingConventionPlugin : Plugin<Project> {
1012
override fun apply(project: Project) {
1113
project.run {
1214

1315
applyPlugins()
16+
configureJacoco()
1417
configureVanniktechPublishing()
1518
}
1619
}
1720

1821
private fun Project.applyPlugins() {
1922
apply(plugin = "com.android.library")
23+
apply(plugin = "com.mxalbert.gradle.jacoco-android")
2024
apply(plugin = "org.jetbrains.dokka")
2125
apply(plugin = "com.vanniktech.maven.publish")
2226
}
2327

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+
2442
private fun Project.configureVanniktechPublishing() {
2543
extensions.configure<MavenPublishBaseExtension> {
2644
configure(

gradle/libs.versions.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ androidCompileSdk = "36"
77
androidMinSdk = "23"
88
androidTargetSdk = "36"
99

10-
agp = "9.0.0"
10+
agp = "8.13.1"
1111
dokka = "2.1.0"
1212
gradleMavenPublishPlugin = "0.36.0"
13-
kotlin = "2.3.0"
13+
kotlin = "2.2.21"
1414
kotlinxCoroutines = "1.10.2"
1515

1616
# Android
@@ -39,8 +39,9 @@ leakcanaryAndroid = "2.14"
3939
mockk = "1.14.9"
4040
mockkAndroid = "1.14.9"
4141
org-jacoco-core = "0.8.14"
42+
jacoco-plugin = "0.2.1"
4243
robolectric = "4.16.1"
43-
screenshot = "0.0.1-alpha13"
44+
screenshot = "0.0.1-alpha12"
4445
truth = "1.4.5"
4546

4647
[libraries]
@@ -81,6 +82,7 @@ androidx-test-espresso = { module = "androidx.test.espresso:espresso-core", vers
8182
androidx-test-junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "junitktx" }
8283
androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidCore" }
8384
androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidxtest" }
85+
jacoco-android-plugin = { module = "com.mxalbert.gradle:jacoco-android", version.ref = "jacoco-plugin" }
8486
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }
8587
leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakcanaryAndroid" }
8688
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)