Skip to content

Commit

Permalink
Merge branch 'master' into issue_74_gmail_conversation_view
Browse files Browse the repository at this point in the history
  • Loading branch information
DenBond7 committed Nov 27, 2024
2 parents d65d651 + 303baca commit 1c15659
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
22 changes: 11 additions & 11 deletions FlowCrypt/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ val uiTestsImplementation by configurations.named("uiTestsImplementation")

dependencies {
ksp("com.github.bumptech.glide:ksp:4.16.0")
ksp("androidx.annotation:annotation:1.8.2")
ksp("androidx.annotation:annotation:1.9.1")
ksp("androidx.room:room-compiler:2.6.1")
//ACRA needs the following dependency to use a custom report sender

Expand All @@ -381,7 +381,7 @@ 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.3")
uiTestsImplementation("androidx.fragment:fragment-testing:1.8.5")
uiTestsImplementation("androidx.test:core-ktx:1.6.1")

androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
Expand Down Expand Up @@ -420,14 +420,14 @@ dependencies {
implementation("androidx.browser:browser:1.8.0")
implementation("androidx.recyclerview:recyclerview:1.3.2")
implementation("androidx.recyclerview:recyclerview-selection:1.1.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("androidx.constraintlayout:constraintlayout:2.2.0")
implementation("androidx.test.espresso:espresso-idling-resource:3.6.1")
implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6")
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.8.6")
implementation("androidx.lifecycle:lifecycle-process:2.8.6")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6")
implementation("androidx.lifecycle:lifecycle-service:2.8.6")
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7")
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.8.7")
implementation("androidx.lifecycle:lifecycle-process:2.8.7")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
implementation("androidx.lifecycle:lifecycle-service:2.8.7")
implementation("androidx.room:room-runtime:2.6.1")
implementation("androidx.room:room-ktx:2.6.1")
//we disabled warnings about paging-runtime-ktx because a newer version doesn't fit our needs
Expand All @@ -439,9 +439,9 @@ dependencies {
implementation("androidx.activity:activity-ktx:1.9.3")
implementation("androidx.fragment:fragment-ktx:1.8.4")
implementation("androidx.work:work-runtime-ktx:2.9.1")
implementation("androidx.navigation:navigation-fragment-ktx:2.8.3")
implementation("androidx.navigation:navigation-ui-ktx:2.8.3")
implementation("androidx.navigation:navigation-runtime-ktx:2.8.3")
implementation("androidx.navigation:navigation-fragment-ktx:2.8.4")
implementation("androidx.navigation:navigation-ui-ktx:2.8.4")
implementation("androidx.navigation:navigation-runtime-ktx:2.8.4")
implementation("androidx.webkit:webkit:1.12.1")

implementation("com.google.android.gms:play-services-base:18.5.0")
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ plugins {
id("androidx.navigation.safeargs.kotlin") version "2.8.3" apply false
id("com.starter.easylauncher") version "6.4.0" apply false
id("org.jetbrains.kotlin.plugin.parcelize") version "2.0.21" apply false
id("com.google.devtools.ksp") version "2.0.21-1.0.26" apply false
id("com.google.devtools.ksp") version "2.0.21-1.0.28" apply false
id("org.ajoberstar.grgit") version "5.3.0" apply false
}

Expand Down

0 comments on commit 1c15659

Please sign in to comment.