Merge pull request #1733 from nextcloud/renovate/okhttp-monorepo

fix(deps): update dependency com.squareup.okhttp3:okhttp to v5.1.0

Author: tobiasKaminsky

gradle/verification-metadata.xml

@@ -12,6 +12,7 @@
       </trusted-artifacts>
       <ignored-keys>
          <ignored-key id="2C7F998F4272C851" reason="Key couldn't be downloaded from any key server"/>
+         <ignored-key id="793FD5751A0F0780" reason="Key couldn't be downloaded from any key server"/>
       </ignored-keys>
       <trusted-keys>
          <trusted-key id="015479E1055341431B4545AB72475FD306B9CAB7" group="com.googlecode.javaewah" name="JavaEWAH" version="1.2.3"/>
@@ -179,6 +180,7 @@
          <trusted-key id="A5F483CD733A4EBAEA378B2AE88979FB9B30ACF2">
             <trusting group="androidx.annotation"/>
             <trusting group="androidx.databinding"/>
+            <trusting group="androidx.startup" name="startup-runtime" version="1.2.0"/>
             <trusting group="^androidx[.]test($|([.].*))" regex="true"/>
             <trusting group="^com[.]android($|([.].*))" regex="true"/>
          </trusted-key>
@@ -8676,6 +8678,30 @@
             <sha256 value="8ccd00dfba35a87ce43dccd2d612d163d89a9df568b655bca492ab20897be642" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.squareup.okhttp3" name="okhttp" version="5.1.0">
+         <artifact name="okhttp-5.1.0.module">
+            <sha256 value="f4b83e13b46bf10f5c71c0cbf36339e17e2db576700da34495fba55f4eb7836e" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="okhttp-metadata-5.1.0.jar">
+            <sha256 value="e720a383fdc3eb1df4aac77a085e61b7730837364151de867093fdbcafcb44aa" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
+      <component group="com.squareup.okhttp3" name="okhttp-android" version="5.1.0">
+         <artifact name="okhttp-android-5.1.0.module">
+            <sha256 value="efd455ff92cc8880daa2adabc4a48db05a6aae40e84266c2185a4dcedfdb53e3" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="okhttp-release.aar">
+            <sha256 value="acb328a30b8609b34d9bcaf9a147d72e2279b55f6b22540aa45e0f1441e1fff3" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
+      <component group="com.squareup.okio" name="okio" version="3.15.0">
+         <artifact name="okio-3.15.0.module">
+            <sha256 value="116826066ceb4d3336a74e7172a33751617ec344bc50a34f99b0d24959a4a39d" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="okio-metadata-3.15.0.jar">
+            <sha256 value="0ed4125e048c86af7ece446d654f2ba8bcc5e74d0ae1f4de3c5dc0ad9a975e2d" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
       <component group="com.squareup.okio" name="okio" version="3.6.0">
          <artifact name="okio-3.6.0.module">
             <sha256 value="6a47ac50364e6598459401fb86f9b6cfcdf637b9b3a3045b1cc33cbf4c408218" origin="Generated by Gradle"/>
@@ -8689,6 +8715,14 @@
             <sha256 value="e518a59856273a1fce18ac7d13ddfc690defa6122d7e5cd00cae19b62d0347d9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.squareup.okio" name="okio-jvm" version="3.15.0">
+         <artifact name="okio-jvm-3.15.0.jar">
+            <sha256 value="483dc383b1049d220892322a0d6a4308425f09bb05b48c43d4eaa9ff82b1cd16" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="okio-jvm-3.15.0.module">
+            <sha256 value="989454a94aefbc297032888f135acda14a9ffb46960e7d84603925d269241ee7" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
       <component group="com.squareup.okio" name="okio-jvm" version="3.6.0">
          <artifact name="okio-jvm-3.6.0.jar">
             <sha256 value="67543f0736fc422ae927ed0e504b98bc5e269fda0d3500579337cb713da28412" origin="Generated by Gradle"/>

library/build.gradle

@@ -60,7 +60,7 @@ configurations {
 
 dependencies {
     implementation 'org.apache.jackrabbit:jackrabbit-webdav:2.13.5'
-    api 'com.squareup.okhttp3:okhttp:5.0.0-alpha.14'
+    api 'com.squareup.okhttp3:okhttp:5.1.0'
     implementation 'com.github.bitfireAT:dav4jvm:2.2.1'
     // in transition phase, we use old and new libs
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.13.1'

library/src/main/java/com/owncloud/android/lib/resources/tags/PutTagRemoteOperation.kt

@@ -12,16 +12,14 @@ import com.nextcloud.operations.PutMethod
 import com.owncloud.android.lib.common.operations.RemoteOperation
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import okhttp3.RequestBody
-import okhttp3.RequestBody.Companion.toRequestBody
-import okhttp3.internal.EMPTY_BYTE_ARRAY
 import org.apache.commons.httpclient.HttpStatus
 
 class PutTagRemoteOperation(
     val id: String,
     val fileId: Long
 ) : RemoteOperation<Void>() {
     override fun run(client: NextcloudClient): RemoteOperationResult<Void> {
-        val empty: RequestBody = EMPTY_BYTE_ARRAY.toRequestBody()
+        val empty: RequestBody = RequestBody.EMPTY
         val putMethod =
             PutMethod(
                 client.baseUri.toString() + TAG_URL + fileId + "/" + id,