From 9b061ca7989469d7e4a87e7f89c977d2f1f15298 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 9 Aug 2024 15:04:10 +0200
Subject: [PATCH] Update android.gradle.plugin to v8.5.2 (#3004)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update android.gradle.plugin

* Fix release builds with AGP 8.5 by removing the minification config in each library module. I believe this is now centralised.

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jorge Martín <jorgem@element.io>
---
 app/proguard-rules.pro                            | 2 ++
 gradle.properties                                 | 3 ---
 gradle/libs.versions.toml                         | 2 +-
 libraries/designsystem/build.gradle.kts           | 1 -
 libraries/encrypted-db/build.gradle.kts           | 2 +-
 libraries/network/build.gradle.kts                | 1 -
 libraries/pushproviders/firebase/build.gradle.kts | 1 -
 7 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index c800b9d996..89dcab5fad 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -40,3 +40,5 @@
 -keepclassmembers class android.view.JavaViewSpy {
     static int windowAttachCount(android.view.View);
 }
+
+-keep class io.element.android.x.di.** { *; }
diff --git a/gradle.properties b/gradle.properties
index b1f6468108..2d4c31a3aa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -59,6 +59,3 @@ 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
-
-# Disable new R8 shrinking for local dependencies as it causes issues with release builds
-android.disableMinifyLocalDependenciesForLibraries=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 712fa4139f..ead60dcde4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
 
 [versions]
 # Project
-android_gradle_plugin = "8.4.1"
+android_gradle_plugin = "8.5.2"
 kotlin = "1.9.25"
 ksp = "1.9.25-1.0.20"
 firebaseAppDistribution = "5.0.0"
diff --git a/libraries/designsystem/build.gradle.kts b/libraries/designsystem/build.gradle.kts
index e737220961..81abc3127f 100644
--- a/libraries/designsystem/build.gradle.kts
+++ b/libraries/designsystem/build.gradle.kts
@@ -29,7 +29,6 @@ android {
 
     buildTypes {
         getByName("release") {
-            isMinifyEnabled = true
             consumerProguardFiles("consumer-rules.pro")
         }
     }
diff --git a/libraries/encrypted-db/build.gradle.kts b/libraries/encrypted-db/build.gradle.kts
index 40db7f7fde..f64e22875e 100644
--- a/libraries/encrypted-db/build.gradle.kts
+++ b/libraries/encrypted-db/build.gradle.kts
@@ -22,7 +22,7 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = true
+            isMinifyEnabled = false
             consumerProguardFiles("consumer-proguard-rules.pro")
         }
     }
diff --git a/libraries/network/build.gradle.kts b/libraries/network/build.gradle.kts
index 2b18f1e37a..36294f4c08 100644
--- a/libraries/network/build.gradle.kts
+++ b/libraries/network/build.gradle.kts
@@ -23,7 +23,6 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = true
             consumerProguardFiles("consumer-rules.pro")
         }
     }
diff --git a/libraries/pushproviders/firebase/build.gradle.kts b/libraries/pushproviders/firebase/build.gradle.kts
index 28b58b1faa..1446c17c6a 100644
--- a/libraries/pushproviders/firebase/build.gradle.kts
+++ b/libraries/pushproviders/firebase/build.gradle.kts
@@ -26,7 +26,6 @@ android {
 
     buildTypes {
         getByName("release") {
-            isMinifyEnabled = true
             consumerProguardFiles("consumer-proguard-rules.pro")
             resValue(
                 type = "string",