Fix R8 errors

app/build.gradle.kts

@@ -165,6 +165,7 @@ dependencies {
     coreLibraryDesugaring(libs.desugar.jdk.libs)
     implementation(libs.bitfire.dav4jvm) {
         exclude(group = "junit")
+        exclude(group = "org.ogce", module = "xpp3")
     }
     implementation(libs.bitfire.ical4android) {
         exclude(group = "commons-logging")

app/proguard.pro

@@ -16,9 +16,7 @@
 -dontwarn javax.inject.**
 -dontwarn com.google.j2objc.annotations.**
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
--dontwarn com.google.errorprone.annotations.CanIgnoreReturnValue
--dontwarn com.google.errorprone.annotations.concurrent.LazyInit
--dontwarn com.google.errorprone.annotations.ForOverride
+-dontwarn com.google.errorprone.annotations.**
 
 # https://github.com/square/okhttp/blob/0b74bba08805c28f6aede626cf06f213ef6480f2/README.md
 -dontwarn okhttp3.**
@@ -49,4 +47,10 @@
 -dontnote java.nio.file.Files, java.nio.file.Path
 -dontnote **.ILicensingService
 -dontnote sun.misc.Unsafe
--dontwarn sun.misc.Unsafe
+-dontwarn sun.misc.Unsafe
+
+# errors from upgrading to AGP 8
+-dontwarn java.beans.Transient
+-dontwarn org.joda.convert.FromString
+-dontwarn org.joda.convert.ToString
+-dontwarn org.json.JSONString

deps_fdroid.txt

@@ -188,15 +188,13 @@
 ++--- com.github.bitfireAT:dav4jvm:2.2.1
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20 -> 1.8.20 (*)
 +|    +--- org.apache.commons:commons-lang3:3.8.1 -> 3.12.0
-+|    +--- com.squareup.okhttp3:okhttp:4.10.0 -> 4.11.0
-+|    |    +--- com.squareup.okio:okio:3.2.0 -> 3.3.0
-+|    |    |    \--- com.squareup.okio:okio-jvm:3.3.0
-+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 1.8.20 (*)
-+|    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0 -> 1.8.20
-+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.20 -> 1.8.20 (*)
-+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.8.20 (*)
-+|    \--- org.ogce:xpp3:1.1.6
-+|         \--- jakarta-regexp:jakarta-regexp:1.4
++|    \--- com.squareup.okhttp3:okhttp:4.10.0 -> 4.11.0
++|         +--- com.squareup.okio:okio:3.2.0 -> 3.3.0
++|         |    \--- com.squareup.okio:okio-jvm:3.3.0
++|         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 1.8.20 (*)
++|         |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0 -> 1.8.20
++|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.20 -> 1.8.20 (*)
++|         \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.8.20 (*)
 ++--- com.github.tasks:ical4android:12fe73a
 +|    +--- org.mnode.ical4j:ical4j:3.2.7
 +|    |    +--- javax.cache:cache-api:1.1.1

deps_googleplay.txt

@@ -470,15 +470,13 @@
 ++--- com.github.bitfireAT:dav4jvm:2.2.1
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20 -> 1.8.20 (*)
 +|    +--- org.apache.commons:commons-lang3:3.8.1 -> 3.12.0
-+|    +--- com.squareup.okhttp3:okhttp:4.10.0 -> 4.11.0
-+|    |    +--- com.squareup.okio:okio:3.2.0 -> 3.3.0
-+|    |    |    \--- com.squareup.okio:okio-jvm:3.3.0
-+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 1.8.20 (*)
-+|    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0 -> 1.8.20
-+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.20 -> 1.8.20 (*)
-+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.8.20 (*)
-+|    \--- org.ogce:xpp3:1.1.6
-+|         \--- jakarta-regexp:jakarta-regexp:1.4
++|    \--- com.squareup.okhttp3:okhttp:4.10.0 -> 4.11.0
++|         +--- com.squareup.okio:okio:3.2.0 -> 3.3.0
++|         |    \--- com.squareup.okio:okio-jvm:3.3.0
++|         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 1.8.20 (*)
++|         |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0 -> 1.8.20
++|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.20 -> 1.8.20 (*)
++|         \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.8.20 (*)
 ++--- com.github.tasks:ical4android:12fe73a
 +|    +--- org.mnode.ical4j:ical4j:3.2.7
 +|    |    +--- javax.cache:cache-api:1.1.1

gradle.properties

@@ -21,3 +21,4 @@ android.databinding.incremental=true
 kapt.incremental.apt=true
 kotlin.incremental=true
 android.nonTransitiveRClass=true
+android.enableR8.fullMode=false