Skip to content

Commit 4730539

Browse files
authored
Merge branch 'master' into issue_2958_edge_to_edge_support
2 parents aecf9a5 + a067ef9 commit 4730539

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

FlowCrypt/build.gradle.kts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ val uiTestsImplementation by configurations.named("uiTestsImplementation")
413413
dependencies {
414414
ksp("com.github.bumptech.glide:ksp:5.0.5")
415415
ksp("androidx.annotation:annotation:1.9.1")
416-
ksp("androidx.room:room-compiler:2.8.3")
416+
ksp("androidx.room:room-compiler:2.8.4")
417417
//ACRA needs the following dependency to use a custom report sender
418418

419419
ksp("dev.zacsweers.autoservice:auto-service-ksp:1.2.0")
@@ -436,22 +436,22 @@ dependencies {
436436
androidTestImplementation("androidx.test:rules:1.7.0")
437437
androidTestImplementation("androidx.test.ext:junit-ktx:1.3.0")
438438
androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0")
439-
androidTestImplementation("androidx.room:room-testing:2.8.3")
439+
androidTestImplementation("androidx.room:room-testing:2.8.4")
440440
androidTestImplementation("androidx.arch.core:core-testing:2.2.0")
441441
androidTestImplementation("androidx.work:work-testing:2.11.0")
442-
androidTestImplementation("com.squareup.okhttp3:mockwebserver:5.3.1")
443-
androidTestImplementation("com.squareup.okhttp3:okhttp-tls:5.3.1")
442+
androidTestImplementation("com.squareup.okhttp3:mockwebserver:5.3.2")
443+
androidTestImplementation("com.squareup.okhttp3:okhttp-tls:5.3.2")
444444
androidTestImplementation("com.athaydes.rawhttp:rawhttp-core:2.6.0")
445445
androidTestUtil("androidx.test:orchestrator:1.6.1")
446446

447-
testImplementation("com.squareup.okhttp3:mockwebserver:5.3.1")
447+
testImplementation("com.squareup.okhttp3:mockwebserver:5.3.2")
448448
testImplementation("com.flextrade.jfixture:jfixture:2.7.2")
449449
testImplementation("com.shazam:shazamcrest:0.11")
450450
testImplementation("org.robolectric:robolectric:4.16")
451451
//we need it to test Parcelable implementation
452452
testImplementation("org.jetbrains.kotlin:kotlin-reflect:2.2.21")
453453
testImplementation("junit:junit:4.13.2")
454-
testImplementation("androidx.room:room-testing:2.8.3")
454+
testImplementation("androidx.room:room-testing:2.8.4")
455455
testImplementation("io.github.classgraph:classgraph:4.8.184")
456456

457457
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
@@ -466,13 +466,13 @@ dependencies {
466466
implementation("androidx.constraintlayout:constraintlayout:2.2.1")
467467
implementation("androidx.test.espresso:espresso-idling-resource:3.7.0")
468468
implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
469-
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4")
470-
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.9.4")
471-
implementation("androidx.lifecycle:lifecycle-process:2.9.4")
472-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.4")
473-
implementation("androidx.lifecycle:lifecycle-service:2.9.4")
474-
implementation("androidx.room:room-runtime:2.8.3")
475-
implementation("androidx.room:room-ktx:2.8.3")
469+
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0")
470+
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.10.0")
471+
implementation("androidx.lifecycle:lifecycle-process:2.10.0")
472+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.10.0")
473+
implementation("androidx.lifecycle:lifecycle-service:2.10.0")
474+
implementation("androidx.room:room-runtime:2.8.4")
475+
implementation("androidx.room:room-ktx:2.8.4")
476476
//we disabled warnings about paging-runtime-ktx because a newer version doesn't fit our needs
477477
//noinspection GradleDependency
478478
implementation("androidx.paging:paging-runtime-ktx:2.1.2")
@@ -501,7 +501,7 @@ dependencies {
501501
implementation("com.squareup.retrofit2:converter-gson:3.0.0")
502502
implementation("com.squareup.retrofit2:converter-scalars:3.0.0")
503503
implementation("com.squareup.okio:okio:3.16.4")
504-
implementation("com.squareup.okhttp3:logging-interceptor:5.3.1")
504+
implementation("com.squareup.okhttp3:logging-interceptor:5.3.2")
505505

506506
implementation("com.github.bumptech.glide:glide:5.0.5")
507507
implementation("com.nulab-inc:zxcvbn:1.9.0")

0 commit comments

Comments
 (0)