File tree Expand file tree Collapse file tree 3 files changed +5
-3
lines changed
src/main/java/org/wordpress/android/ui/comments/unified Expand file tree Collapse file tree 3 files changed +5
-3
lines changed Original file line number Diff line number Diff 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 {
Original file line number Diff line number Diff line change 11package org.wordpress.android.ui.comments.unified
22
3- import okhttp3.internal.toImmutableList
43import org.wordpress.android.R
54import org.wordpress.android.fluxc.model.CommentStatus
65import 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 {
Original file line number Diff line number Diff line change @@ -95,7 +95,7 @@ robolectric = '4.16'
9595sentry = ' 5.12.1'
9696squareup-java-poet = ' 1.13.0'
9797squareup-kotlin-poet = ' 1.18.1'
98- squareup-okhttp3 = ' 4.12 .0'
98+ squareup-okhttp3 = ' 5.2 .0'
9999squareup-retrofit = ' 3.0.0'
100100wellsql = ' 2.0.0'
101101wiremock = ' 2.26.3'
You can’t perform that action at this time.
0 commit comments