Merge branch 'master' into fix_prevent_sending_database_as_att

# Conflicts:
#	gradle/wrapper/gradle-wrapper.properties

Author: DenBond7

FlowCrypt/build.gradle.kts

@@ -490,18 +490,18 @@ dependencies {
   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.10.0")
-  implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.10.0")
-  implementation("androidx.lifecycle:lifecycle-process:2.10.0")
-  implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.10.0")
-  implementation("androidx.lifecycle:lifecycle-service:2.10.0")
+  implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.11.0")
+  implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.11.0")
+  implementation("androidx.lifecycle:lifecycle-process:2.11.0")
+  implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.11.0")
+  implementation("androidx.lifecycle:lifecycle-service:2.11.0")
   implementation("androidx.room:room-runtime:2.8.4")
   implementation("androidx.room:room-ktx:2.8.4")
   //we disabled warnings about paging-runtime-ktx because a newer version doesn't fit our needs
   //noinspection GradleDependency
   implementation("androidx.paging:paging-runtime-ktx:2.1.2")
   implementation("androidx.preference:preference-ktx:1.2.1")
-  implementation("androidx.core:core-ktx:1.18.0")
+  implementation("androidx.core:core-ktx:1.19.0")
   implementation("androidx.core:core-splashscreen:1.2.0")
   implementation("androidx.activity:activity-ktx:1.13.0")
   implementation("androidx.fragment:fragment-ktx:1.8.9")

ext.gradle.kts

@@ -5,6 +5,6 @@
 
 extra["appVersionCode"] = 164
 extra["appVersionName"] = "1.6.4"
-extra["compileSdkVersion"] = 36
-extra["targetSdkVersion"] = 36
+extra["compileSdkVersion"] = 37
+extra["targetSdkVersion"] = 37
 extra["minSdkVersion"] = 29