From 0309223a325b5fccaeb76ce9249c2e0905e591a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Thu, 28 Dec 2023 12:54:16 +0100
Subject: [PATCH] Only apply dependencyanalysis plugin to some modules

---
 build.gradle.kts                                             | 5 -----
 gradle.properties                                            | 3 +++
 gradle/libs.versions.toml                                    | 5 +++--
 plugins/build.gradle.kts                                     | 1 +
 .../kotlin/io.element.android-compose-application.gradle.kts | 1 +
 .../kotlin/io.element.android-compose-library.gradle.kts     | 1 +
 .../src/main/kotlin/io.element.android-library.gradle.kts    | 1 +
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6705c5a870..4356d1ac1e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -111,11 +111,6 @@ allprojects {
              */
         }
     }
-
-    // Detect unused dependencies
-    apply {
-        plugin("com.autonomousapps.dependency-analysis")
-    }
 }
 
 // See https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin/wiki/Customizing-plugin-behavior
diff --git a/gradle.properties b/gradle.properties
index 0ece8f4e8c..959d1bc05c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -56,3 +56,6 @@ android.experimental.enableTestFixtures=true
 
 # Create BuildConfig files as bytecode to avoid Java compilation phase
 android.enableBuildConfigAsBytecode=true
+
+# By default, the plugin applies itself to all subprojects, but we don't want that as it would cause issues with builds using local AARs
+dependency.analysis.autoapply=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9195a029c1..1f47d63f5a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -35,6 +35,7 @@ test_core = "1.5.0"
 #other
 coil = "2.5.0"
 datetime = "0.5.0"
+dependencyAnalysis = "1.28.0"
 serialization_json = "1.6.2"
 showkase = "1.0.2"
 appyx = "1.4.0"
@@ -63,6 +64,7 @@ gms_google_services = "com.google.gms:google-services:4.4.0"
 # https://firebase.google.com/docs/android/setup#available-libraries
 google_firebase_bom = "com.google.firebase:firebase-bom:32.7.0"
 firebase_appdistribution_gradle = { module = "com.google.firebase:firebase-appdistribution-gradle", version.ref = "firebaseAppDistribution" }
+autonomousapps_dependencyanalysis_plugin = { module = "com.autonomousapps:dependency-analysis-gradle-plugin", version.ref = "dependencyAnalysis" }
 
 # AndroidX
 androidx_core = { module = "androidx.core:core", version.ref = "core" }
@@ -213,8 +215,7 @@ detekt = "io.gitlab.arturbosch.detekt:1.23.4"
 ktlint = "org.jlleitschuh.gradle.ktlint:12.0.3"
 dependencygraph = "com.savvasdalkitsis.module-dependency-graph:0.12"
 dependencycheck = "org.owasp.dependencycheck:9.0.7"
-# DO NOT UPGRADE FOR NOW! This causes the build to fail with local AAR versions of the Rust SDK
-dependencyanalysis = "com.autonomousapps.dependency-analysis:1.27.0"
+dependencyanalysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" }
 paparazzi = "app.cash.paparazzi:1.3.1"
 kover = "org.jetbrains.kotlinx.kover:0.6.1"
 sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts
index c820902905..78500f5a15 100644
--- a/plugins/build.gradle.kts
+++ b/plugins/build.gradle.kts
@@ -29,4 +29,5 @@ dependencies {
     implementation(platform(libs.google.firebase.bom))
     implementation(libs.firebase.appdistribution.gradle)
     implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
+    implementation(libs.autonomousapps.dependencyanalysis.plugin)
 }
diff --git a/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts b/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts
index 80bc0f884e..2ac8fb8b72 100644
--- a/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts
+++ b/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts
@@ -27,6 +27,7 @@ val libs = the<LibrariesForLibs>()
 plugins {
     id("com.android.application")
     id("kotlin-android")
+    id("com.autonomousapps.dependency-analysis")
 }
 
 android {
diff --git a/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts b/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts
index 3194505e4e..3176856339 100644
--- a/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts
+++ b/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts
@@ -27,6 +27,7 @@ val libs = the<LibrariesForLibs>()
 plugins {
     id("com.android.library")
     id("kotlin-android")
+    id("com.autonomousapps.dependency-analysis")
 }
 
 android {
diff --git a/plugins/src/main/kotlin/io.element.android-library.gradle.kts b/plugins/src/main/kotlin/io.element.android-library.gradle.kts
index f3a84031e6..572168b0c4 100644
--- a/plugins/src/main/kotlin/io.element.android-library.gradle.kts
+++ b/plugins/src/main/kotlin/io.element.android-library.gradle.kts
@@ -25,6 +25,7 @@ val libs = the<LibrariesForLibs>()
 plugins {
     id("com.android.library")
     id("kotlin-android")
+    id("com.autonomousapps.dependency-analysis")
 }
 
 android {