Skip to content

Commit bfed66a

Browse files
build(deps): Bump squareup-okhttp3 from 4.12.0 to 5.2.0 (#22265)
* build(deps): Bump squareup-okhttp3 from 4.12.0 to 5.2.0 Bumps `squareup-okhttp3` from 4.12.0 to 5.2.0. Updates `com.squareup.okhttp3:okhttp` from 4.12.0 to 5.2.0 - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](square/okhttp@parent-4.12.0...parent-5.2.0) Updates `com.squareup.okhttp3:okhttp-urlconnection` from 4.12.0 to 5.2.0 - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](square/okhttp@parent-4.12.0...parent-5.2.0) --- updated-dependencies: - dependency-name: com.squareup.okhttp3:okhttp dependency-version: 5.2.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: com.squareup.okhttp3:okhttp-urlconnection dependency-version: 5.2.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Fixing update issues --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Adalberto Plaza <[email protected]>
1 parent 5f8b754 commit bfed66a

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

WordPress/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,9 @@ android {
329329

330330
pickFirst 'META-INF/-no-jdk.kotlin_module'
331331

332+
// OkHttp 5.x: Pick first OSGI manifest from multi-release JARs
333+
pickFirst 'META-INF/versions/9/OSGI-INF/MANIFEST.MF'
334+
332335
}
333336

334337
bundle {

WordPress/src/main/java/org/wordpress/android/ui/comments/unified/CommentListUiModelHelper.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.wordpress.android.ui.comments.unified
22

3-
import okhttp3.internal.toImmutableList
43
import org.wordpress.android.R
54
import org.wordpress.android.fluxc.model.CommentStatus
65
import org.wordpress.android.fluxc.model.CommentStatus.DELETED
@@ -272,7 +271,7 @@ class CommentListUiModelHelper @Inject constructor(
272271
onLoadNextPage.invoke(comments.size)
273272
})
274273
}
275-
return CommentList(list.toImmutableList(), hasMore)
274+
return CommentList(list.toList(), hasMore)
276275
}
277276

278277
private fun shouldAddSeparator(before: CommentEntity, after: CommentEntity): Boolean {

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ robolectric = '4.16'
9595
sentry = '5.12.1'
9696
squareup-java-poet = '1.13.0'
9797
squareup-kotlin-poet = '1.18.1'
98-
squareup-okhttp3 = '4.12.0'
98+
squareup-okhttp3 = '5.2.0'
9999
squareup-retrofit = '3.0.0'
100100
wellsql = '2.0.0'
101101
wiremock = '2.26.3'

0 commit comments

Comments
 (0)