Merge branch 'master' into dependabot/gradle/org.robolectric-robolectric-4.16

Author: DenBond7

FlowCrypt/build.gradle.kts

@@ -400,7 +400,7 @@ val devDebugImplementation: Configuration by configurations.creating
 val uiTestsImplementation by configurations.named("uiTestsImplementation")
 
 dependencies {
-  ksp("com.github.bumptech.glide:ksp:4.16.0")
+  ksp("com.github.bumptech.glide:ksp:5.0.4")
   ksp("androidx.annotation:annotation:1.9.1")
   ksp("androidx.room:room-compiler:2.7.2")
   //ACRA needs the following dependency to use a custom report sender
@@ -413,16 +413,16 @@ dependencies {
   devDebugImplementation("com.squareup.leakcanary:leakcanary-android:2.14")
   //uiTests is the build type for testing.
   //noinspection FragmentGradleConfiguration
-  uiTestsImplementation("androidx.fragment:fragment-testing:1.8.7")
-  uiTestsImplementation("androidx.test:core-ktx:1.6.1")
+  uiTestsImplementation("androidx.fragment:fragment-testing:1.8.9")
+  uiTestsImplementation("androidx.test:core-ktx:1.7.0")
 
   androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
   androidTestImplementation("androidx.test.espresso:espresso-contrib:3.7.0")
   androidTestImplementation("androidx.test.espresso:espresso-intents:3.7.0")
   androidTestImplementation("androidx.test.espresso:espresso-web:3.7.0")
   androidTestImplementation("androidx.test.ext:junit:1.3.0")
   androidTestImplementation("androidx.test:runner:1.7.0")
-  androidTestImplementation("androidx.test:rules:1.6.1")
+  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")
@@ -449,17 +449,17 @@ dependencies {
   implementation("androidx.appcompat:appcompat:1.7.1")
   implementation("androidx.legacy:legacy-preference-v14:1.0.0")
   implementation("androidx.cardview:cardview:1.0.0")
-  implementation("androidx.browser:browser:1.8.0")
+  implementation("androidx.browser:browser:1.9.0")
   implementation("androidx.recyclerview:recyclerview:1.4.0")
   implementation("androidx.recyclerview:recyclerview-selection:1.2.0")
   implementation("androidx.constraintlayout:constraintlayout:2.2.1")
   implementation("androidx.test.espresso:espresso-idling-resource:3.7.0")
   implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
-  implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2")
-  implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.9.2")
-  implementation("androidx.lifecycle:lifecycle-process:2.9.2")
-  implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.2")
-  implementation("androidx.lifecycle:lifecycle-service:2.9.2")
+  implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.3")
+  implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.9.3")
+  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")
   //we disabled warnings about paging-runtime-ktx because a newer version doesn't fit our needs
@@ -474,14 +474,14 @@ dependencies {
   implementation("androidx.navigation:navigation-fragment-ktx:2.9.3")
   implementation("androidx.navigation:navigation-ui-ktx:2.9.3")
   implementation("androidx.navigation:navigation-runtime-ktx:2.9.3")
-  implementation("androidx.webkit:webkit:1.13.0")
+  implementation("androidx.webkit:webkit:1.14.0")
 
-  implementation("com.google.android.gms:play-services-base:18.7.0")
+  implementation("com.google.android.gms:play-services-base:18.7.2")
   implementation("com.google.android.gms:play-services-auth:21.3.0")
   implementation("com.google.android.material:material:1.12.0")
   implementation("com.google.android.flexbox:flexbox:3.0.0")
   implementation("com.google.code.gson:gson:2.13.1")
-  implementation("com.google.api-client:google-api-client-android:2.8.0")
+  implementation("com.google.api-client:google-api-client-android:2.8.1")
   implementation("com.google.apis:google-api-services-gmail:v1-rev20250630-2.0.0")
   //ACRA needs the following dependency to use a custom report sender
   implementation("com.google.auto.service:auto-service-annotations:1.1.1")
@@ -492,18 +492,18 @@ dependencies {
   implementation("com.squareup.okio:okio:3.16.0")
   implementation("com.squareup.okhttp3:logging-interceptor:5.1.0")
 
-  implementation("com.github.bumptech.glide:glide:4.16.0")
+  implementation("com.github.bumptech.glide:glide:5.0.4")
   implementation("com.nulab-inc:zxcvbn:1.9.0")
   implementation("com.burhanrashid52:photoeditor:3.0.2")
   implementation("com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1")
   implementation("com.sandinh:zbase32-commons-codec_2.12:1.0.0")
   implementation("org.bitbucket.b_c:jose4j:0.9.6")
-  implementation("org.jsoup:jsoup:1.21.1")
+  implementation("org.jsoup:jsoup:1.21.2")
   implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
   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")
-  implementation("commons-io:commons-io:2.19.0")
+  implementation("commons-io:commons-io:2.20.0")
   implementation("net.openid:appauth:0.11.1")
   implementation("ch.acra:acra-http:5.12.0")
   implementation("io.github.everythingme:overscroll-decor-android:1.1.1")

FlowCrypt/src/androidTest/java/com/flowcrypt/email/WkdClientTest.kt

@@ -8,6 +8,7 @@ package com.flowcrypt.email
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
 import androidx.test.filters.SmallTest
 import com.flowcrypt.email.api.retrofit.ApiHelper
 import com.flowcrypt.email.api.retrofit.response.base.ApiError
@@ -24,6 +25,7 @@ import org.apache.commons.codec.binary.ZBase32
 import org.apache.commons.codec.digest.DigestUtils
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
@@ -79,6 +81,8 @@ class WkdClientTest {
     .around(mockWebServerRule)
 
   @Test
+  @FlakyTest
+  @Ignore("Temporary disabled as flaky")
   fun existingEmailFlowCryptDomainTest() = runBlocking {
     val keys = WkdClient.lookupEmail(context, EXISTING_EMAIL)
     assertTrue("There are no keys in the key collection", requireNotNull(keys).keyRings.hasNext())

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ComposeScreenReplyWithGmailApiSignatureFlowTest.kt

@@ -11,6 +11,7 @@ import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
 import androidx.test.filters.MediumTest
 import com.flowcrypt.email.R
 import com.flowcrypt.email.TestConstants
@@ -25,6 +26,7 @@ import com.flowcrypt.email.ui.base.BaseComposeGmailApiSignatureFlowTest
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.RecordedRequest
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
@@ -65,6 +67,8 @@ class ComposeScreenReplyWithGmailApiSignatureFlowTest :
       .around(ScreenshotTestRule())
 
   @Test
+  @FlakyTest
+  @Ignore("Temporary disabled as flaky")
   fun testAddingSignatureAfterStart() {
     //need to wait while the app loads the messages list
     waitForObjectWithText(SUBJECT_EXISTING_STANDARD, TimeUnit.SECONDS.toMillis(10))
@@ -88,4 +92,4 @@ class ComposeScreenReplyWithGmailApiSignatureFlowTest :
 
     doBaseChecking()
   }
-}
+}

build.gradle.kts

@@ -6,13 +6,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-  id("com.android.application") version "8.12.1" apply false
+  id("com.android.application") version "8.13.0" apply false
   id("org.jetbrains.kotlin.android") version "2.2.10" apply false
   id("androidx.navigation.safeargs.kotlin") version "2.9.3" apply false
   id("com.starter.easylauncher") version "6.4.1" apply false
   id("org.jetbrains.kotlin.plugin.parcelize") version "2.2.10" apply false
   id("com.google.devtools.ksp") version "2.2.10-2.0.2" apply false
-  id("org.ajoberstar.grgit") version "5.3.2" apply false
+  id("org.ajoberstar.grgit") version "5.3.3" apply false
 }
 
 subprojects {