meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

build: apply instrumented test dependencies conditionally (#4698)

Browse source
This commit is contained in:
James Rich 2026-03-03 10:29:26 -06:00 • committed by GitHub
parent 8f055fda93
commit 17dcbed6b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt
View file

@ -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)
}
}
}
}

9
build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/AndroidCompose.kt
View file

@ -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"))
@ -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
feature/firmware/build.gradle.kts
View file

@ -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)