Skip to content

build: apply instrumented test dependencies conditionally #4698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamesarich merged 1 commit into from
Mar 3, 2026
+11 −6
Merged

build: apply instrumented test dependencies conditionally #4698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,13 @@ class AndroidRoomConventionPlugin : Plugin<Project> {
}

pluginManager.withPlugin("org.jetbrains.kotlin.android") {
val hasAndroidTest = projectDir.resolve("src/androidTest").exists()
dependencies {
"implementation"(roomRuntime)
"ksp"(roomCompiler)
"androidTestImplementation"(roomTesting)
if (hasAndroidTest) {
"androidTestImplementation"(roomTesting)
}
}
}
}
Expand Down
9 changes: 7 additions & 2 deletions build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/AndroidCompose.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,13 @@ internal fun Project.configureAndroidCompose(
buildFeatures.compose = true
}

val hasAndroidTest = project.projectDir.resolve("src/androidTest").exists()
dependencies {
val bom = libs.library("androidx-compose-bom")
"implementation"(platform(bom))
"androidTestImplementation"(platform(bom))
if (hasAndroidTest) {
"androidTestImplementation"(platform(bom))
}
"implementation"(libs.library("androidx-compose-ui-tooling"))
"implementation"(libs.library("androidx-compose-runtime"))
"runtimeOnly"(libs.library("androidx-compose-runtime-tracing"))
Expand All @@ -44,7 +47,9 @@ internal fun Project.configureAndroidCompose(
"implementation"(libs.library("compose-multiplatform-resources"))

// Add Espresso explicitly to avoid version mismatch issues on newer Android versions
"androidTestImplementation"(libs.library("androidx-test-espresso-core"))
if (hasAndroidTest) {
"androidTestImplementation"(libs.library("androidx-test-espresso-core"))
}
}
configureComposeCompiler()
}
3 changes: 0 additions & 3 deletions feature/firmware/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ dependencies {
implementation(libs.markdown.renderer)
implementation(libs.markdown.renderer.m3)

androidTestImplementation(libs.androidx.compose.ui.test.junit4)
androidTestImplementation(libs.androidx.test.ext.junit)

testImplementation(libs.junit)
testImplementation(libs.kotlinx.coroutines.test)
testImplementation(libs.nordic.client.android.mock)
Expand Down
Loading