From b5f7914ff7c49b179d4399e92cb4fdcbefdc3684 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 08:56:50 +0000 Subject: [PATCH 1/2] Bump the androidx_room group with 4 updates Bumps the androidx_room group with 4 updates: androidx.room:room-compiler, androidx.room:room-testing, androidx.room:room-runtime and androidx.room:room-ktx. Updates `androidx.room:room-compiler` from 2.7.2 to 2.8.0 Updates `androidx.room:room-testing` from 2.7.2 to 2.8.0 Updates `androidx.room:room-runtime` from 2.7.2 to 2.8.0 Updates `androidx.room:room-ktx` from 2.7.2 to 2.8.0 --- updated-dependencies: - dependency-name: androidx.room:room-compiler dependency-version: 2.8.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: androidx_room - dependency-name: androidx.room:room-testing dependency-version: 2.8.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: androidx_room - dependency-name: androidx.room:room-runtime dependency-version: 2.8.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: androidx_room - dependency-name: androidx.room:room-ktx dependency-version: 2.8.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: androidx_room ... Signed-off-by: dependabot[bot] --- FlowCrypt/build.gradle.kts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/FlowCrypt/build.gradle.kts b/FlowCrypt/build.gradle.kts index 0878cf92d..cb3f7d1fa 100644 --- a/FlowCrypt/build.gradle.kts +++ b/FlowCrypt/build.gradle.kts @@ -411,7 +411,7 @@ val uiTestsImplementation by configurations.named("uiTestsImplementation") dependencies { ksp("com.github.bumptech.glide:ksp:5.0.5") ksp("androidx.annotation:annotation:1.9.1") - ksp("androidx.room:room-compiler:2.7.2") + ksp("androidx.room:room-compiler:2.8.0") //ACRA needs the following dependency to use a custom report sender ksp("dev.zacsweers.autoservice:auto-service-ksp:1.2.0") @@ -434,7 +434,7 @@ dependencies { androidTestImplementation("androidx.test:rules:1.7.0") androidTestImplementation("androidx.test.ext:junit-ktx:1.3.0") androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0") - androidTestImplementation("androidx.room:room-testing:2.7.2") + androidTestImplementation("androidx.room:room-testing:2.8.0") androidTestImplementation("androidx.arch.core:core-testing:2.2.0") androidTestImplementation("androidx.work:work-testing:2.10.4") androidTestImplementation("com.squareup.okhttp3:mockwebserver:5.1.0") @@ -449,7 +449,7 @@ dependencies { //we need it to test Parcelable implementation testImplementation("org.jetbrains.kotlin:kotlin-reflect:2.2.20") testImplementation("junit:junit:4.13.2") - testImplementation("androidx.room:room-testing:2.7.2") + testImplementation("androidx.room:room-testing:2.8.0") testImplementation("io.github.classgraph:classgraph:4.8.181") implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))) @@ -469,8 +469,8 @@ dependencies { implementation("androidx.lifecycle:lifecycle-process:2.9.3") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.3") implementation("androidx.lifecycle:lifecycle-service:2.9.3") - implementation("androidx.room:room-runtime:2.7.2") - implementation("androidx.room:room-ktx:2.7.2") + implementation("androidx.room:room-runtime:2.8.0") + implementation("androidx.room:room-ktx:2.8.0") //we disabled warnings about paging-runtime-ktx because a newer version doesn't fit our needs //noinspection GradleDependency implementation("androidx.paging:paging-runtime-ktx:2.1.2") From 91820964efdda08fa03d98f67ad67f6b938fe7f1 Mon Sep 17 00:00:00 2001 From: denbond7 Date: Fri, 19 Sep 2025 20:38:49 +0300 Subject: [PATCH 2/2] wip --- FlowCrypt/build.gradle.kts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/FlowCrypt/build.gradle.kts b/FlowCrypt/build.gradle.kts index 15d5ba855..537b2357d 100644 --- a/FlowCrypt/build.gradle.kts +++ b/FlowCrypt/build.gradle.kts @@ -509,6 +509,9 @@ dependencies { implementation("org.bitbucket.b_c:jose4j:0.9.6") implementation("org.jsoup:jsoup:1.21.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2") + //kotlinx-serialization-core added to fix runtime issue with dependencies conflict. + //Maybe it will be removed in future. + implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.9.0") implementation("org.pgpainless:pgpainless-core:1.7.6") implementation("org.eclipse.angus:angus-mail:2.0.4") implementation("org.eclipse.angus:gimap:2.0.4")