Skip to content

Commit 4eeaf70

Browse files
authored
Merge branch 'master' into dependabot/gradle/androidx_room-3451bbdba3
2 parents e86a35b + c97555e commit 4eeaf70

3 files changed

Lines changed: 11 additions & 9 deletions

File tree

FlowCrypt/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ dependencies {
427427
androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0")
428428
androidTestImplementation("androidx.room:room-testing:2.7.2")
429429
androidTestImplementation("androidx.arch.core:core-testing:2.2.0")
430-
androidTestImplementation("androidx.work:work-testing:2.10.1")
430+
androidTestImplementation("androidx.work:work-testing:2.10.2")
431431
androidTestImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
432432
androidTestImplementation("com.squareup.okhttp3:okhttp-tls:4.12.0")
433433
androidTestImplementation("com.athaydes.rawhttp:rawhttp-core:2.6.0")
@@ -438,15 +438,15 @@ dependencies {
438438
testImplementation("com.shazam:shazamcrest:0.11")
439439
testImplementation("org.robolectric:robolectric:4.14.1")
440440
//we need it to test Parcelable implementation
441-
testImplementation("org.jetbrains.kotlin:kotlin-reflect:2.1.21")
441+
testImplementation("org.jetbrains.kotlin:kotlin-reflect:2.2.0")
442442
testImplementation("junit:junit:4.13.2")
443443
testImplementation("androidx.room:room-testing:2.7.2")
444444
testImplementation("io.github.classgraph:classgraph:4.8.179")
445445

446446
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
447447

448448
implementation("androidx.legacy:legacy-support-v4:1.0.0")
449-
implementation("androidx.appcompat:appcompat:1.7.0")
449+
implementation("androidx.appcompat:appcompat:1.7.1")
450450
implementation("androidx.legacy:legacy-preference-v14:1.0.0")
451451
implementation("androidx.cardview:cardview:1.0.0")
452452
implementation("androidx.browser:browser:1.8.0")
@@ -470,7 +470,7 @@ dependencies {
470470
implementation("androidx.core:core-splashscreen:1.0.1")
471471
implementation("androidx.activity:activity-ktx:1.10.1")
472472
implementation("androidx.fragment:fragment-ktx:1.8.8")
473-
implementation("androidx.work:work-runtime-ktx:2.10.1")
473+
implementation("androidx.work:work-runtime-ktx:2.10.2")
474474
implementation("androidx.navigation:navigation-fragment-ktx:2.9.0")
475475
implementation("androidx.navigation:navigation-ui-ktx:2.9.0")
476476
implementation("androidx.navigation:navigation-runtime-ktx:2.9.0")

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/UserRecoverableAuthExceptionFragment.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
/*
22
* © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
3-
* Contributors: DenBond7
3+
* Contributors: denbond7
44
*/
55

66
package com.flowcrypt.email.ui.activity.fragment
77

88
import android.accounts.Account
99
import android.accounts.AccountManager
10+
import android.annotation.SuppressLint
1011
import android.app.Activity
1112
import android.os.Bundle
1213
import android.view.LayoutInflater
@@ -142,6 +143,7 @@ class UserRecoverableAuthExceptionFragment :
142143
GeneralUtil.openCustomTab(requireContext(), Constants.FLOWCRYPT_TERMS_URL)
143144
}
144145
binding?.buttonSecurity?.setOnClickListener {
146+
@SuppressLint("CheckResult")
145147
NavGraphDirections.actionGlobalHtmlViewFromAssetsRawFragment(
146148
title = getString(R.string.security),
147149
resourceIdAsString = "html/security.htm"

build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
plugins {
99
id("com.android.application") version "8.9.2" apply false
10-
id("org.jetbrains.kotlin.android") version "2.1.21" apply false
11-
id("androidx.navigation.safeargs.kotlin") version "2.8.9" apply false
10+
id("org.jetbrains.kotlin.android") version "2.2.0" apply false
11+
id("androidx.navigation.safeargs.kotlin") version "2.9.3" apply false
1212
id("com.starter.easylauncher") version "6.4.0" apply false
13-
id("org.jetbrains.kotlin.plugin.parcelize") version "2.1.21" apply false
14-
id("com.google.devtools.ksp") version "2.1.21-2.0.2" apply false
13+
id("org.jetbrains.kotlin.plugin.parcelize") version "2.2.0" apply false
14+
id("com.google.devtools.ksp") version "2.2.0-2.0.2" apply false
1515
id("org.ajoberstar.grgit") version "5.3.0" apply false
1616
}
1717

0 commit comments

Comments
 (0)