dav4jvm 2.0 and okhttp 4.6.0

app/build.gradle.kts

@@ -125,15 +125,12 @@ configurations.all {
     exclude(group = "com.google.code.findbugs")
     exclude(group = "com.google.errorprone")
     exclude(group = "com.google.j2objc")
-    resolutionStrategy {
-        force("com.squareup.okhttp3:okhttp:" + Versions.okhttp)
-    }
 }
 
 val googleplayImplementation by configurations
 
 dependencies {
-    implementation("com.gitlab.bitfireAT:dav4jvm:1.0.1")
+    implementation("com.gitlab.bitfireAT:dav4jvm:2.0")
     implementation("com.gitlab.bitfireAT:ical4android:1.0") {
         exclude(group = "org.threeten", module = "threetenbp")
     }

app/src/main/java/org/tasks/caldav/PatchableDavResource.kt

@@ -3,10 +3,7 @@ package org.tasks.caldav
 import at.bitfire.dav4jvm.DavResource
 import at.bitfire.dav4jvm.DavResource.Companion.MAX_REDIRECTS
 import at.bitfire.dav4jvm.exception.*
-import okhttp3.HttpUrl
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.RequestBody
+import okhttp3.*
 import okhttp3.Response
 import java.io.IOException
 import java.net.HttpURLConnection
@@ -40,7 +37,7 @@ class PatchableDavResource(client: OkHttpClient, url: HttpUrl) : DavResource(cli
      * @throws HttpException in case of an HTTP error
      */
     private fun checkStatus(response: Response) =
-            checkStatus(response.code(), response.message(), response)
+            checkStatus(response.code, response.message, response)
 
     /**
      * Checks the status from an HTTP response and throws an exception in case of an error.

buildSrc/src/main/kotlin/Versions.kt

@@ -10,6 +10,6 @@ object Versions {
     const val crashlytics = "2.10.1"
     const val analytics = "17.4.0"
     const val remote_config = "19.1.4"
-    const val okhttp = "3.12.10" // 3.13 minSdk is 21
+    const val okhttp = "4.6.0"
     const val flipper = "0.40.0"
 }