Skip to content

Commit

Permalink
Fix ProGuard issue with javax.xml.namespace.QName; update AGP (bitfir…
Browse files Browse the repository at this point in the history
…eAT/davx5#512)

* Update to AGP 8.2.1
* Add keep rule for javax.xml.namespace.QName

See #511
Closes bitfireAT/davx5#499
  • Loading branch information
sunkup authored and rfc2822 committed Jan 8, 2024
1 parent cf0c304 commit 24401cc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions app/proguard-rules-release.pro
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
# DAVx⁵ + libs
-keep class at.bitfire.** { *; } # all DAVx⁵ code is required

# AGP 8.2 and 8.3 seem to remove this class, but ezvcard.io uses it. See https://github.com/bitfireAT/davx5/issues/499
-keep class javax.xml.namespace.QName { *; }

# we use enum classes (https://www.guardsquare.com/en/products/proguard/manual/examples#enumerations)
-keepclassmembers,allowoptimization enum * {
public static **[] values();
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.1.4' // 8.2.0 seems to be broken, see https://github.com/bitfireAT/davx5-ose/issues/511
classpath 'com.android.tools.build:gradle:8.2.1'
classpath "com.google.dagger:hilt-android-gradle-plugin:${versions.hilt}"
classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${versions.aboutLibraries}"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
Expand Down

0 comments on commit 24401cc

Please sign in to comment.