Update android.gradle.plugin to v8.5.2 (#3004)

* 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>
This commit is contained in:
renovate[bot]
2024-08-09 15:04:10 +02:00
committed by GitHub
parent 5c24587c53
commit 9b061ca798
7 changed files with 4 additions and 8 deletions

View File

@@ -40,3 +40,5 @@
-keepclassmembers class android.view.JavaViewSpy { -keepclassmembers class android.view.JavaViewSpy {
static int windowAttachCount(android.view.View); static int windowAttachCount(android.view.View);
} }
-keep class io.element.android.x.di.** { *; }

View File

@@ -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 # 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 dependency.analysis.autoapply=false
# Disable new R8 shrinking for local dependencies as it causes issues with release builds
android.disableMinifyLocalDependenciesForLibraries=false

View File

@@ -3,7 +3,7 @@
[versions] [versions]
# Project # Project
android_gradle_plugin = "8.4.1" android_gradle_plugin = "8.5.2"
kotlin = "1.9.25" kotlin = "1.9.25"
ksp = "1.9.25-1.0.20" ksp = "1.9.25-1.0.20"
firebaseAppDistribution = "5.0.0" firebaseAppDistribution = "5.0.0"

View File

@@ -29,7 +29,6 @@ android {
buildTypes { buildTypes {
getByName("release") { getByName("release") {
isMinifyEnabled = true
consumerProguardFiles("consumer-rules.pro") consumerProguardFiles("consumer-rules.pro")
} }
} }

View File

@@ -22,7 +22,7 @@ android {
buildTypes { buildTypes {
release { release {
isMinifyEnabled = true isMinifyEnabled = false
consumerProguardFiles("consumer-proguard-rules.pro") consumerProguardFiles("consumer-proguard-rules.pro")
} }
} }

View File

@@ -23,7 +23,6 @@ android {
buildTypes { buildTypes {
release { release {
isMinifyEnabled = true
consumerProguardFiles("consumer-rules.pro") consumerProguardFiles("consumer-rules.pro")
} }
} }

View File

@@ -26,7 +26,6 @@ android {
buildTypes { buildTypes {
getByName("release") { getByName("release") {
isMinifyEnabled = true
consumerProguardFiles("consumer-proguard-rules.pro") consumerProguardFiles("consumer-proguard-rules.pro")
resValue( resValue(
type = "string", type = "string",