android: target API 36, AGP 8.10.1 (#7656)

* android: migrate back handling to callbacks

* android: target API 36, AGP 8.10.1

* android: opt out of predictive back app-wide
This commit is contained in:
sh
2026-10-07 10:30:26 +01:00
committed by GitHub
parent 84f73ce8b8
commit 40478c1c45
4 changed files with 11 additions and 7 deletions
+2 -2
View File
@@ -9,13 +9,13 @@ plugins {
}
android {
compileSdk = 35
compileSdk = 36
defaultConfig {
applicationId = "chat.simplex.app"
namespace = "chat.simplex.app"
minSdk = 26
targetSdk = 35
targetSdk = 36
// !!!
// skip version code after release to F-Droid, as it uses two version codes
versionCode = (extra["android.version_code"] as String).toInt()
@@ -35,6 +35,8 @@
</intent>
</queries>
<!-- enableOnBackInvokedCallback="false": Activity.onBackPressed() overrides are not called on Android 16+ without it.
UnusedAttribute is ignored because the attribute only exists on API 33+, older versions call onBackPressed() anyway -->
<application
android:name="SimplexApp"
android:allowBackup="false"
@@ -44,7 +46,9 @@
android:largeHeap="true"
android:extractNativeLibs="${extract_native_libs}"
android:supportsRtl="true"
android:theme="@style/Theme.SimpleX">
android:enableOnBackInvokedCallback="false"
android:theme="@style/Theme.SimpleX"
tools:ignore="UnusedAttribute">
<!-- android:localeConfig="@xml/locales_config"-->
<!-- Main activity -->
+3 -3
View File
@@ -158,13 +158,13 @@ kotlin {
android {
namespace = "chat.simplex.common"
compileSdk = 35
compileSdk = 36
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
defaultConfig {
minSdk = 26
}
testOptions.targetSdk = 34
lint.targetSdk = 34
testOptions.targetSdk = 36
lint.targetSdk = 36
val isAndroid = gradle.startParameter.taskNames.find {
val lower = it.lowercase()
lower.contains("release") || lower.startsWith("assemble") || lower.startsWith("install")
+1 -1
View File
@@ -31,7 +31,7 @@ desktop.version_name=7.1-beta.6
desktop.version_code=167
kotlin.version=2.1.20
gradle.plugin.version=8.7.0
gradle.plugin.version=8.10.1
compose.version=1.8.2
# Choose sqlite or postgres backend