From e370b337712eff46cf55475c2d2ea1bfd18731b7 Mon Sep 17 00:00:00 2001
From: Jorge Martin Espinosa <jorgem@element.io>
Date: Fri, 19 Jun 2026 13:12:54 +0200
Subject: [PATCH] Fix Sonar with AGP 9 (some workarounds) (#7055)

Since it'll try to resolve their output, first they need to complete.
---
 app/build.gradle.kts                              | 6 ++++++
 libraries/pushproviders/firebase/build.gradle.kts | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index bc2ce7add7..ecd5ed8e7b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -24,6 +24,7 @@ import extension.buildConfigFieldStr
 import extension.locales
 import extension.setupDependencyInjection
 import extension.testCommonDependencies
+import org.sonarqube.gradle.SonarResolverTask
 import java.util.Locale
 
 plugins {
@@ -245,6 +246,11 @@ androidComponents {
     configureLicensesTasks(reportingExtension)
 }
 
+// Configure the SonarQube plugin to wait for the resource generation tasks to complete before running the analysis.
+tasks.withType<SonarResolverTask>().configureEach {
+    dependsOn("generateGplayDebugResValues", "generateGplayDebugAndroidTestResValues")
+}
+
 setupDependencyInjection()
 
 dependencies {
diff --git a/libraries/pushproviders/firebase/build.gradle.kts b/libraries/pushproviders/firebase/build.gradle.kts
index e2ad017d14..1a8e73a4da 100644
--- a/libraries/pushproviders/firebase/build.gradle.kts
+++ b/libraries/pushproviders/firebase/build.gradle.kts
@@ -11,6 +11,8 @@
 import config.BuildTimeConfig
 import extension.setupDependencyInjection
 import extension.testCommonDependencies
+import org.gradle.kotlin.dsl.withType
+import org.sonarqube.gradle.SonarResolverTask
 
 plugins {
     id("io.element.android-library")
@@ -51,6 +53,11 @@ android {
     }
 }
 
+// Configure the SonarQube plugin to wait for the resource generation tasks to complete before running the analysis.
+tasks.withType<SonarResolverTask>().configureEach {
+    dependsOn("generateDebugResValues", "generateDebugAndroidTestResValues")
+}
+
 setupDependencyInjection()
 
 dependencies {