Skip to content

Commit 3435d0d

Browse files
committed
Merge branch 'master' into dependabot/gradle/com.starter.easylauncher-6.4.1
# Conflicts: # build.gradle.kts
2 parents 51fc0c0 + c97555e commit 3435d0d

3 files changed

Lines changed: 20 additions & 18 deletions

File tree

FlowCrypt/build.gradle.kts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ dependencies {
413413
devDebugImplementation("com.squareup.leakcanary:leakcanary-android:2.14")
414414
//uiTests is the build type for testing.
415415
//noinspection FragmentGradleConfiguration
416-
uiTestsImplementation("androidx.fragment:fragment-testing:1.8.6")
416+
uiTestsImplementation("androidx.fragment:fragment-testing:1.8.7")
417417
uiTestsImplementation("androidx.test:core-ktx:1.6.1")
418418

419419
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
@@ -427,7 +427,7 @@ dependencies {
427427
androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0")
428428
androidTestImplementation("androidx.room:room-testing:2.7.1")
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.20")
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.1")
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")
@@ -469,11 +469,11 @@ dependencies {
469469
implementation("androidx.core:core-ktx:1.16.0")
470470
implementation("androidx.core:core-splashscreen:1.0.1")
471471
implementation("androidx.activity:activity-ktx:1.10.1")
472-
implementation("androidx.fragment:fragment-ktx:1.8.6")
473-
implementation("androidx.work:work-runtime-ktx:2.10.1")
474-
implementation("androidx.navigation:navigation-fragment-ktx:2.8.9")
475-
implementation("androidx.navigation:navigation-ui-ktx:2.8.9")
476-
implementation("androidx.navigation:navigation-runtime-ktx:2.8.9")
472+
implementation("androidx.fragment:fragment-ktx:1.8.8")
473+
implementation("androidx.work:work-runtime-ktx:2.10.2")
474+
implementation("androidx.navigation:navigation-fragment-ktx:2.9.0")
475+
implementation("androidx.navigation:navigation-ui-ktx:2.9.0")
476+
implementation("androidx.navigation:navigation-runtime-ktx:2.9.0")
477477
implementation("androidx.webkit:webkit:1.13.0")
478478

479479
implementation("com.google.android.gms:play-services-base:18.7.0")
@@ -486,10 +486,10 @@ dependencies {
486486
//ACRA needs the following dependency to use a custom report sender
487487
implementation("com.google.auto.service:auto-service-annotations:1.1.1")
488488

489-
implementation("com.squareup.retrofit2:retrofit:2.11.0")
490-
implementation("com.squareup.retrofit2:converter-gson:2.11.0")
491-
implementation("com.squareup.retrofit2:converter-scalars:2.11.0")
492-
implementation("com.squareup.okio:okio:3.11.0")
489+
implementation("com.squareup.retrofit2:retrofit:3.0.0")
490+
implementation("com.squareup.retrofit2:converter-gson:3.0.0")
491+
implementation("com.squareup.retrofit2:converter-scalars:3.0.0")
492+
implementation("com.squareup.okio:okio:3.13.0")
493493
implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
494494

495495
implementation("com.github.bumptech.glide:glide:4.16.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.20" 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.1" apply false
13-
id("org.jetbrains.kotlin.plugin.parcelize") version "2.1.20" apply false
14-
id("com.google.devtools.ksp") version "2.1.20-2.0.1" 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)