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

Refactor: Improve analytics plugin application and task configuration (#4120)

Browse source
This commit is contained in:
James Rich 2026-01-02 14:45:48 -06:00 • committed by GitHub
parent 3e57102526
commit b5d30a8bb7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 44 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

64
build-logic/convention/src/main/kotlin/AnalyticsConventionPlugin.kt
View file

@ -24,29 +24,61 @@ import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.findByType
import org.meshtastic.buildlogic.libs
import org.meshtastic.buildlogic.plugin
/**
* Convention plugin for analytics (Google Services, Crashlytics, Datadog).
* Segregates these plugins to only affect the "google" flavor and disables their tasks for "fdroid".
*/
class AnalyticsConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
// Apply plugins only when the "google" flavor is present.
extensions.configure<ApplicationExtension> {
defaultConfig {
productFlavors {
all {
if (name == "google") {
apply(plugin = libs.plugin("google-services").get().pluginId)
apply(plugin = libs.plugin("firebase-crashlytics").get().pluginId)
apply(plugin = libs.plugin("datadog").get().pluginId)
}
}
productFlavors.all {
if (name == "google") {
apply(plugin = libs.plugin("google-services").get().pluginId)
apply(plugin = libs.plugin("firebase-crashlytics").get().pluginId)
apply(plugin = libs.plugin("datadog").get().pluginId)
}
}
}
// More efficient task segregation: Only register task-disabling listeners if the plugins are applied.
// This avoids iterating all tasks with a generic filter and improves configuration performance.
plugins.withId("com.google.gms.google-services") {
tasks.configureEach {
if (name.contains("fdroid", ignoreCase = true) && name.contains("GoogleServices")) {
enabled = false
}
}
}
plugins.withId("com.google.firebase.crashlytics") {
tasks.configureEach {
if (name.contains("fdroid", ignoreCase = true) &&
(name.contains("Crashlytics", ignoreCase = true) || name.contains("buildId", ignoreCase = true))
) {
enabled = false
}
}
}
plugins.withId("com.datadoghq.dd-sdk-android-gradle-plugin") {
tasks.configureEach {
if (name.contains("fdroid", ignoreCase = true) && name.contains("Datadog", ignoreCase = true)) {
enabled = false
}
}
}
// Configure variant-specific extensions.
extensions.configure<ApplicationAndroidComponentsExtension> {
onVariants { variant ->
if (variant.flavorName == "google") {
extensions.configure<DdExtension> {
extensions.findByType<DdExtension>()?.apply {
variants {
register(variant.name) {
site = "US5"
@ -58,18 +90,6 @@ class AnalyticsConventionPlugin : Plugin<Project> {
}
}
}
// Disable Analytics tasks for non-google flavors
val analyticsKeywords = listOf("crashlytics", "google", "datadog", "buildId")
tasks.configureEach {
val taskName = name.lowercase()
val isAnalyticsTask = analyticsKeywords.any { taskName.contains(it, ignoreCase = true) }
if (isAnalyticsTask && taskName.contains("fdroid", ignoreCase = true)) {
logger.lifecycle("AnalyticsConventionPlugin: Disabling task $name")
enabled = false
}
}
}
}
}

6
build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/MeshtasticFlavor.kt
View file

@ -48,10 +48,8 @@ fun configureFlavors(
register(meshtasticFlavor.name) {
dimension = meshtasticFlavor.dimension.name
flavorConfigurationBlock(this, meshtasticFlavor)
if (this@apply is ApplicationExtension && this is ApplicationProductFlavor) {
if (meshtasticFlavor.default) {
isDefault = true
}
if (meshtasticFlavor.default) {
isDefault = true
}
}
}