Skip to content

Commit 992a26d

Browse files
committed
fix testReportJob
1 parent 0153410 commit 992a26d

10 files changed

Lines changed: 62 additions & 30 deletions

File tree

.github/workflows/testReportJob.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ jobs:
5656

5757
- name: Check report files
5858
run: |
59-
ls /build/reports/kover/html/
59+
ls app/build/reports/kover/html
6060
6161
- name: Archive code coverage results
6262
uses: actions/upload-artifact@v4
6363
with:
6464
name: code-coverage-report
65-
path: /build/reports/kover/html/
65+
path: app/build/reports/kover/html
6666

6767
saveReport:
6868
name: SaveReport

app/build.gradle.kts

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,19 @@ plugins {
44
}
55

66
dependencies {
7-
implementation(project(":core:core"))
8-
implementation(project(":core:ui"))
9-
implementation(project(":core:database"))
10-
implementation(project(":core:notes"))
11-
implementation(project(":core:navigation"))
12-
implementation(project(":feature:home"))
13-
implementation(project(":feature:edit"))
14-
implementation(project(":feature:edit-label"))
7+
implementWithCover(":core:core")
8+
implementWithCover(":core:database")
9+
implementWithCover(":core:label")
10+
implementWithCover(":core:navigation")
11+
implementWithCover(":core:notes")
12+
implementWithCover(":core:ui")
13+
implementWithCover(":feature:edit")
14+
implementWithCover(":feature:edit-label")
15+
implementWithCover(":feature:home")
16+
}
17+
18+
fun DependencyHandler.implementWithCover(name: String) {
19+
val project = project(name)
20+
implementation(project)
21+
kover(project)
1522
}

build-logic/dependencies/src/main/kotlin/AndroidApplicationComposePlugin.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@ import org.gradle.api.Project
77
import org.gradle.kotlin.dsl.getByType
88

99
class AndroidApplicationComposePlugin : Plugin<Project> {
10+
1011
override fun apply(target: Project) {
1112
with(target) {
12-
pluginManager.apply("com.android.application")
13-
pluginManager.apply(libs.findPluginId("kotlin"))
14-
pluginManager.apply(libs.findPluginId("composeCompiler"))
13+
pluginManager.apply {
14+
apply(libs.findPluginId("application"))
15+
apply(libs.findPluginId("kotlin"))
16+
apply(libs.findPluginId("composeCompiler"))
17+
}
1518
val extension = extensions.getByType<BaseAppModuleExtension>()
1619
configureAndroidCompose(extension)
1720
}

build-logic/dependencies/src/main/kotlin/AndroidApplicationPlugin.kt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import AppExt.APP_PREFIX
2+
import AppExt.findPluginId
23
import AppExt.findVersionInt
34
import AppExt.findVersionString
45
import AppExt.libs
56
import com.android.build.api.dsl.ApplicationExtension
67
import com.stslex93.notes.configureKotlinAndroid
8+
import com.stslex93.notes.configureKover
79
import org.gradle.api.Plugin
810
import org.gradle.api.Project
911
import org.gradle.kotlin.dsl.configure
@@ -13,17 +15,19 @@ import java.io.InputStreamReader
1315
import java.util.Properties
1416

1517
class AndroidApplicationPlugin : Plugin<Project> {
18+
1619
override fun apply(target: Project) {
1720
with(target) {
18-
with(pluginManager) {
19-
apply("com.android.application")
20-
apply("org.jetbrains.kotlin.android")
21-
apply("com.google.devtools.ksp")
21+
pluginManager.apply {
22+
apply(libs.findPluginId("application"))
23+
apply(libs.findPluginId("kotlin"))
24+
apply(libs.findPluginId("ksp"))
25+
apply(libs.findPluginId("kover"))
2226
}
2327

2428
extensions.configure<ApplicationExtension> {
2529
configureKotlinAndroid(this)
26-
30+
configureKover()
2731
namespace = APP_PREFIX
2832

2933
defaultConfig.apply {

build-logic/dependencies/src/main/kotlin/AndroidLibraryComposePlugin.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@ import org.gradle.api.Project
77
import org.gradle.kotlin.dsl.getByType
88

99
class AndroidLibraryComposePlugin : Plugin<Project> {
10+
1011
override fun apply(target: Project) {
1112
with(target) {
12-
pluginManager.apply("com.android.library")
13-
pluginManager.apply(libs.findPluginId("kotlin"))
14-
pluginManager.apply(libs.findPluginId("composeCompiler"))
13+
pluginManager.apply {
14+
apply(libs.findPluginId("library"))
15+
apply(libs.findPluginId("kotlin"))
16+
apply(libs.findPluginId("composeCompiler"))
17+
}
1518
val extension = extensions.getByType<LibraryExtension>()
1619
configureAndroidCompose(extension)
1720
}

build-logic/dependencies/src/main/kotlin/AndroidLibraryPlugin.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
1+
import AppExt.findPluginId
2+
import AppExt.libs
13
import com.android.build.gradle.LibraryExtension
24
import com.stslex93.notes.configureKotlinAndroid
5+
import com.stslex93.notes.configureKover
36
import org.gradle.api.Plugin
47
import org.gradle.api.Project
58
import org.gradle.kotlin.dsl.configure
69

710
class AndroidLibraryPlugin : Plugin<Project> {
11+
812
override fun apply(target: Project) {
913
with(target) {
10-
with(pluginManager) {
11-
apply("com.android.library")
12-
apply("org.jetbrains.kotlin.android")
13-
apply("com.google.devtools.ksp")
14+
pluginManager.apply {
15+
apply(libs.findPluginId("library"))
16+
apply(libs.findPluginId("kotlin"))
17+
apply(libs.findPluginId("ksp"))
1418
}
1519

1620
extensions.configure<LibraryExtension> {
1721
configureKotlinAndroid(this)
22+
configureKover()
1823
defaultConfig.apply {
1924
targetSdk = 34
2025
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

build-logic/dependencies/src/main/kotlin/com.stslex93.notes/KotlinAndroid.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.stslex93.notes
22

33
import AppExt.APP_PREFIX
4+
import AppExt.findPluginId
45
import AppExt.findVersionInt
56
import AppExt.libs
67
import com.android.build.api.dsl.CommonExtension
@@ -91,4 +92,4 @@ private fun Project.configureKotlin() {
9192
freeCompilerArgs.addAll("-opt-in=kotlin.RequiresOptIn", "-Xcontext-parameters")
9293
}
9394
}
94-
}
95+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package com.stslex93.notes
2+
3+
import AppExt.findPluginId
4+
import AppExt.libs
5+
import org.gradle.api.Project
6+
7+
internal fun Project.configureKover() {
8+
pluginManager.apply(libs.findPluginId("kover"))
9+
}

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
plugins {
2-
id("org.jetbrains.kotlinx.kover") version "0.7.6"
32
alias(libs.plugins.application) apply false
43
alias(libs.plugins.kotlin) apply false
54
alias(libs.plugins.library) apply false
65
alias(libs.plugins.serialization)
76
alias(libs.plugins.ksp) apply false
87
alias(libs.plugins.composeCompiler) apply false
8+
alias(libs.plugins.kover)
99
}
1010

1111
buildscript {
@@ -16,7 +16,7 @@ buildscript {
1616
}
1717

1818
dependencies {
19-
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3")
19+
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.9.3")
2020
}
2121
}
2222

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ androidxJunit = "1.3.0"
3434
espresso = "3.7.0"
3535
robolectric = "4.16"
3636
androidxTest = "1.7.0"
37-
37+
kover = "0.9.1"
3838
[libraries]
3939
android-desugarJdkLibs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }
4040
android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
@@ -100,7 +100,7 @@ application = { id = "com.android.application", version.ref = "androidGradlePlug
100100
library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
101101
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
102102
composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
103-
103+
kover = {id = "org.jetbrains.kotlinx.kover", version.ref = "kover"}
104104
[bundles]
105105
lifecycle = [
106106
"lifecycle-compose",

0 commit comments

Comments
 (0)