Skip to content

Commit 738295a

Browse files
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 <[email protected]>
1 parent 250f070 commit 738295a

File tree

7 files changed

+4
-8
lines changed

7 files changed

+4
-8
lines changed

app/proguard-rules.pro

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,5 @@
4040
-keepclassmembers class android.view.JavaViewSpy {
4141
static int windowAttachCount(android.view.View);
4242
}
43+
44+
-keep class io.element.android.x.di.** { *; }

gradle.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,3 @@ android.enableBuildConfigAsBytecode=true
5959

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

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
[versions]
55
# Project
6-
android_gradle_plugin = "8.4.1"
6+
android_gradle_plugin = "8.5.2"
77
kotlin = "1.9.25"
88
ksp = "1.9.25-1.0.20"
99
firebaseAppDistribution = "5.0.0"

libraries/designsystem/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ android {
2929

3030
buildTypes {
3131
getByName("release") {
32-
isMinifyEnabled = true
3332
consumerProguardFiles("consumer-rules.pro")
3433
}
3534
}

libraries/encrypted-db/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ android {
2222

2323
buildTypes {
2424
release {
25-
isMinifyEnabled = true
25+
isMinifyEnabled = false
2626
consumerProguardFiles("consumer-proguard-rules.pro")
2727
}
2828
}

libraries/network/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ android {
2323

2424
buildTypes {
2525
release {
26-
isMinifyEnabled = true
2726
consumerProguardFiles("consumer-rules.pro")
2827
}
2928
}

libraries/pushproviders/firebase/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ android {
2626

2727
buildTypes {
2828
getByName("release") {
29-
isMinifyEnabled = true
3029
consumerProguardFiles("consumer-proguard-rules.pro")
3130
resValue(
3231
type = "string",

0 commit comments

Comments
 (0)