Merge release/10.5.24 to master (#329)

* Update to 10.5.24, update OkHttp version

* Update readme for the next release version

Author: rafalniski

README.md

@@ -76,14 +76,14 @@ Install the Contentful dependency:
 <dependency>
   <groupId>com.contentful.java</groupId>
   <artifactId>java-sdk</artifactId>
-  <version>10.5.23</version>
+  <version>10.5.25</version>
 </dependency>
 ```
 
 * _Gradle_
 
 ```groovy
-compile 'com.contentful.java:java-sdk:10.5.23'
+compile 'com.contentful.java:java-sdk:10.5.25'
 ```
 
 This library requires Java 8 (or higher version) or Android 21.
@@ -384,6 +384,37 @@ OkHttpClient httpClient = clientBuilder.defaultCallFactoryBuilder()
 CDAClient cdaClient = clientBuilder.setCallFactory(httpClient).build();
 ```
 
+Android and OkHttp 5
+--------------------
+
+OkHttp 5 splits platform artifacts. This SDK depends on `okhttp-jvm` so it works out of the box for JVM users. For Android apps, depend on `okhttp-android` and exclude `okhttp-jvm` from this SDK to avoid duplicate-class errors.
+
+Gradle (Kotlin DSL):
+
+```kotlin
+dependencies {
+  implementation(platform("com.squareup.okhttp3:okhttp-bom:5.1.0"))
+  implementation("com.squareup.okhttp3:okhttp-android")
+
+  implementation("com.contentful.java:java-sdk:10.5.24") {
+    exclude(group = "com.squareup.okhttp3", module = "okhttp-jvm")
+  }
+}
+```
+
+Gradle (Groovy):
+
+```groovy
+dependencies {
+  implementation platform('com.squareup.okhttp3:okhttp-bom:5.1.0')
+  implementation 'com.squareup.okhttp3:okhttp-android'
+
+  implementation('com.contentful.java:java-sdk:10.5.24') {
+    exclude group: 'com.squareup.okhttp3', module: 'okhttp-jvm'
+  }
+}
+```
+
 Proguard
 --------
 

pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>com.contentful.java</groupId>
   <artifactId>java-sdk</artifactId>
-  <version>10.5.23</version>
+  <version>10.5.25</version>
   <packaging>jar</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>
@@ -53,7 +53,7 @@
     <retrofit.version>2.11.0</retrofit.version>
     <rxjava.version>3.1.9</rxjava.version>
     <gson.version>2.11.0</gson.version>
-    <okhttp.version>4.12.0</okhttp.version>
+    <okhttp.version>5.1.0</okhttp.version>
 
     <!-- Test Dependencies -->
     <commonsio.version>2.7</commonsio.version>
@@ -104,6 +104,11 @@
       <artifactId>okhttp</artifactId>
       <version>${okhttp.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>okhttp-jvm</artifactId>
+      <version>${okhttp.version}</version>
+    </dependency>
 
     <dependency>
       <groupId>commons-io</groupId>