From 51b7155d3769f0acafd8547485a3cf30facd81a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Oct 2025 08:06:10 +0000 Subject: [PATCH 1/2] 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](https://github.com/square/okhttp/compare/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](https://github.com/square/okhttp/compare/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] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7f075f94c6ec..7208c1a08a5c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -95,7 +95,7 @@ robolectric = '4.16' sentry = '5.12.1' squareup-java-poet = '1.13.0' squareup-kotlin-poet = '1.18.1' -squareup-okhttp3 = '4.12.0' +squareup-okhttp3 = '5.2.0' squareup-retrofit = '3.0.0' wellsql = '2.0.0' wiremock = '2.26.3' From 4826022dfeb8b60480c180cbaee6379db086b499 Mon Sep 17 00:00:00 2001 From: adalpari Date: Fri, 10 Oct 2025 12:45:05 +0200 Subject: [PATCH 2/2] Fixing update issues --- WordPress/build.gradle | 3 +++ .../android/ui/comments/unified/CommentListUiModelHelper.kt | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index a0722f4507c0..2a0fc5eb09bd 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -329,6 +329,9 @@ android { pickFirst 'META-INF/-no-jdk.kotlin_module' + // OkHttp 5.x: Pick first OSGI manifest from multi-release JARs + pickFirst 'META-INF/versions/9/OSGI-INF/MANIFEST.MF' + } bundle { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/unified/CommentListUiModelHelper.kt b/WordPress/src/main/java/org/wordpress/android/ui/comments/unified/CommentListUiModelHelper.kt index 42616960d940..89eb3baa5580 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/unified/CommentListUiModelHelper.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/unified/CommentListUiModelHelper.kt @@ -1,6 +1,5 @@ package org.wordpress.android.ui.comments.unified -import okhttp3.internal.toImmutableList import org.wordpress.android.R import org.wordpress.android.fluxc.model.CommentStatus import org.wordpress.android.fluxc.model.CommentStatus.DELETED @@ -272,7 +271,7 @@ class CommentListUiModelHelper @Inject constructor( onLoadNextPage.invoke(comments.size) }) } - return CommentList(list.toImmutableList(), hasMore) + return CommentList(list.toList(), hasMore) } private fun shouldAddSeparator(before: CommentEntity, after: CommentEntity): Boolean {