Merge pull request #19946 from wordpress-mobile/hamorillo/remove-unne…

…cessary-okio Gravatar Library - Remove Okio dependency from WPAndroid
wordpress-mobile · Jan 15, 2024 · e90c41f · e90c41f
2 parents c185318 + f59b4de
commit e90c41f
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 136 deletions.
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -434,7 +434,6 @@ dependencies {
     implementation "com.github.chrisbanes:PhotoView:$chrisbanesPhotoviewVersion"
     implementation "org.greenrobot:eventbus:$eventBusVersion"
     implementation "org.greenrobot:eventbus-java:$eventBusVersion"
-    implementation "com.squareup.okio:okio:$squareupOkioVersion"
     implementation "com.squareup.retrofit2:retrofit:$squareupRetrofitVersion"
     implementation "org.apache.commons:commons-text:$apacheCommonsTextVersion"
     implementation "com.airbnb.android:lottie:$lottieVersion"

diff --git a/WordPress/src/androidTest/java/org/wordpress/android/networking/GravatarApiTest.java b/WordPress/src/androidTest/java/org/wordpress/android/networking/GravatarApiTest.java
diff --git a/WordPress/src/jetpack/assets/licenses.html b/WordPress/src/jetpack/assets/licenses.html
@@ -31,7 +31,6 @@ <h2>Additional Libraries</h2>
       <li><a href="https://github.com/jukka/tagsoup">TagSoup</a>: Copyright 2002-2008, John Cowan</li>
       <li><a href="https://github.com/Yalantis/uCrop">uCrop</a>: Copyright 2017, Yalantis</li>
       <li><a href="https://github.com/xizzhu/simple-tool-tip">Simple Tool Tip</a>: Copyright 2016, Xizhi Zhu</li>
-      <li><a href="https://github.com/square/okio">okio/okhttp</a>: Copyright 2013 Square, Inc.</li>
       <li><a href="https://github.com/greenrobot/EventBus">EventBus</a>: Copyright 2012-2016 Markus Junginger, greenrobot</li>
       <li><a href="https://github.com/INDExOS/media-for-mobile">Mobile 4 Media</a>: Copyright 2016, INDExOS</li>
       <li><a href="https://github.com/Tenor-Inc/tenor-android-core">Tenor Android Core</a>: Copyright 2017, Tenor Inc</li>

diff --git a/WordPress/src/main/assets/licenses.html b/WordPress/src/main/assets/licenses.html
@@ -31,7 +31,6 @@ <h2>Additional Libraries</h2>
       <li><a href="https://github.com/jukka/tagsoup">TagSoup</a>: Copyright 2002-2008, John Cowan</li>
       <li><a href="https://github.com/Yalantis/uCrop">uCrop</a>: Copyright 2017, Yalantis</li>
       <li><a href="https://github.com/xizzhu/simple-tool-tip">Simple Tool Tip</a>: Copyright 2016, Xizhi Zhu</li>
-      <li><a href="https://github.com/square/okio">okio/okhttp</a>: Copyright 2013 Square, Inc.</li>
       <li><a href="https://github.com/greenrobot/EventBus">EventBus</a>: Copyright 2012-2016 Markus Junginger, greenrobot</li>
       <li><a href="https://github.com/INDExOS/media-for-mobile">Mobile 4 Media</a>: Copyright 2016, INDExOS</li>
       <li><a href="https://github.com/Tenor-Inc/tenor-android-core">Tenor Android Core</a>: Copyright 2017, Tenor Inc</li>

diff --git a/WordPress/src/main/java/org/wordpress/android/networking/StreamingRequest.java b/WordPress/src/main/java/org/wordpress/android/networking/StreamingRequest.java
diff --git a/build.gradle b/build.gradle
@@ -82,7 +82,6 @@ ext {
     lottieVersion = '6.1.0'
     philjayMpAndroidChartVersion = 'v3.1.0'
     squareupKotlinPoetVersion = '1.6.0'
-    squareupOkioVersion = '3.6.0'
     squareupRetrofitVersion = '2.9.0'
     uCropVersion = '2.2.8'
     zendeskVersion = '5.1.2'

diff --git a/docs/test_instructions_per_dependency_update.md b/docs/test_instructions_per_dependency_update.md
@@ -55,19 +55,17 @@ rather than strict requirements.
     4. [PlayServicesAuth](#playservicesauth)
     5. [PlayServicesCoreScanner](#playservicescodescanner)
     6. [PlayReview](#playreview)
-5. Network
-    1. [Okio](#okio)
-6. Tool
+5. Tool
     1. [Zendesk](#zendesk)
     2. [JSoup](#jsoup)
-7. Other Core
+6. Other Core
     1. [AutoService](#autoservice)
     2. [KotlinPoet](#kotlinpoet)
-8. Other UI
+7. Other UI
     1. [Lottie](#lottie)
     2. [UCrop](#ucrop)
-9. [Smoke Test](#smoke-test)
-10. [Special](#special)
+8. [Smoke Test](#smoke-test)
+9. [Special](#special)
 
 ℹ️ Every test instruction should be prefixed with one of the following:
 - [JP/WP] This test applies to both, the `Jetpack` and `WordPress` apps.
@@ -435,21 +433,6 @@ Step.3:
 
 -----
 
-### Okio [[squareupOkioVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] <a name="okio"></a>
-
-<details>
-    <summary>1. [JP/WP] Me Screen [GravatarApi.java + StreamingRequest.java]</summary>
-
-- Go to `Me` tab.
-- From the `Me` screen you are in, click on your profile's icon (`CHANGE PHOTO`).
-- Choose an image and wait for the `Edit Photo` screen to appear.
-- Crop the image and click the `done` menu option (top right).
-- Verify the image is updated accordingly.
-
-</details>
-
------
-
 ### Zendesk [[zendeskVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] <a name="zendesk"></a>
 
 <details>