Skip to content

Commit e35ae49

Browse files
authored
Configure coverage through common convention plugins (#1575)
* Configure coverage through convention plugins * Attempt to address flaky tests
1 parent f20c2ca commit e35ae49

File tree

5 files changed

+20
-183
lines changed

5 files changed

+20
-183
lines changed

build.gradle.kts

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ buildscript {
2222
}
2323
}
2424

25-
@Suppress("DSL_SCOPE_VIOLATION")
2625
plugins {
2726
alias(libs.plugins.stream.project)
2827
alias(libs.plugins.stream.android.application) apply false
@@ -44,14 +43,29 @@ plugins {
4443
alias(libs.plugins.hilt) apply false
4544
alias(libs.plugins.play.publisher) apply false
4645
alias(libs.plugins.baseline.profile) apply false
47-
alias(libs.plugins.sonarqube) apply false
48-
alias(libs.plugins.kover) apply false
4946
}
5047

5148
streamProject {
5249
spotless {
5350
excludePatterns = setOf("**/generated/**")
5451
}
52+
53+
coverage {
54+
includedModules = setOf(
55+
"stream-video-android-core",
56+
"stream-video-android-ui-compose",
57+
)
58+
sonarCoverageExclusions = listOf(
59+
"**/*.mp3",
60+
"**/*.webp",
61+
"**/generated/**",
62+
"**/io/getstream/video/android/core/model/**"
63+
)
64+
koverClassExclusions = listOf(
65+
"io.getstream.android.video.generated.*",
66+
"io.getstream.video.android.core.model.*"
67+
)
68+
}
5569
}
5670

5771
subprojects {
@@ -171,9 +185,6 @@ tasks.register("printAllArtifacts") {
171185
// return File(teamPropsDir, propsFile)
172186
//}
173187

174-
apply(from = "${rootDir}/scripts/sonar.gradle")
175-
apply(from = "${rootDir}/scripts/coverage.gradle")
176-
177188
afterEvaluate {
178189
println("Running Add Pre Commit Git Hook Script on Build")
179190
exec {

gradle/libs.versions.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ minSdk = "24"
77
allureKotlin = "2.4.0"
88
androidGradlePlugin = "8.5.2"
99
cameraCamera2 = "1.3.4"
10-
kover = "0.8.3"
11-
sonarqube = "6.0.1.5171"
1210
spotless = "6.21.0"
13-
streamConventions = "0.3.0"
11+
streamConventions = "0.4.0"
1412
mavenPublish = "0.34.0"
1513
kotlin = "1.9.25"
1614
ksp = "1.9.25-1.0.20"
@@ -244,8 +242,6 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
244242
kotlin-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binaryCompatabilityValidator" }
245243
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
246244
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
247-
kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover"}
248-
sonarqube = { id = "org.sonarqube", version.ref = "sonarqube"}
249245
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
250246
stream-project = { id = "io.getstream.project", version.ref = "streamConventions" }
251247
stream-android-application = { id = "io.getstream.android.application", version.ref = "streamConventions" }

scripts/coverage.gradle

Lines changed: 0 additions & 137 deletions
This file was deleted.

scripts/sonar.gradle

Lines changed: 0 additions & 28 deletions
This file was deleted.

stream-video-android-previewdata/src/main/kotlin/io/getstream/video/android/mock/StreamPreviewDataUtils.kt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,16 +143,11 @@ public val previewMemberListState: List<MemberState>
143143
val participants = arrayListOf<MemberState>()
144144
previewCall.state.clearParticipants()
145145
previewUsers.forEach { user ->
146-
val sessionId = if (user == previewUsers.first()) {
147-
previewCall.sessionId
148-
} else {
149-
UUID.randomUUID().toString()
150-
}
151146
participants.add(
152147
MemberState(
153148
user = user,
154-
createdAt = OffsetDateTime.now(),
155-
updatedAt = OffsetDateTime.now(),
149+
createdAt = OffsetDateTime.MIN,
150+
updatedAt = OffsetDateTime.MIN,
156151
custom = emptyMap(),
157152
role = "admin",
158153
),

0 commit comments

Comments
 (0)