From f17889b3e3c8c3e9ca704968164fc6d57117d74e Mon Sep 17 00:00:00 2001 From: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com> Date: Mon, 7 Aug 2023 18:53:25 +0300 Subject: [PATCH] android: 5.2.2, build 142 (revert to API 32) --- apps/multiplatform/android/build.gradle.kts | 2 +- .../chat/simplex/app/views/onboarding/SetNotificationsMode.kt | 3 ++- apps/multiplatform/common/build.gradle.kts | 2 +- apps/multiplatform/gradle.properties | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/multiplatform/android/build.gradle.kts b/apps/multiplatform/android/build.gradle.kts index 5d54c5f7b6..62dab0b953 100644 --- a/apps/multiplatform/android/build.gradle.kts +++ b/apps/multiplatform/android/build.gradle.kts @@ -17,7 +17,7 @@ android { defaultConfig { applicationId = "chat.simplex.app" minSdkVersion(26) - targetSdkVersion(33) + targetSdkVersion(32) // !!! // skip version code after release to F-Droid, as it uses two version codes versionCode = (extra["android.version_code"] as String).toInt() diff --git a/apps/multiplatform/android/src/main/java/chat/simplex/app/views/onboarding/SetNotificationsMode.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/onboarding/SetNotificationsMode.kt index 9f3b87194e..c47a983219 100644 --- a/apps/multiplatform/android/src/main/java/chat/simplex/app/views/onboarding/SetNotificationsMode.kt +++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/onboarding/SetNotificationsMode.kt @@ -58,7 +58,8 @@ fun SetNotificationsMode(m: ChatModel) { @Composable fun SetNotificationsModeAdditions() { - if (Build.VERSION.SDK_INT >= 33) { + // When target and compile SDK are different + if (Build.VERSION.SDK_INT >= 33 && SimplexApp.context.applicationInfo.targetSdkVersion >= 33) { val notificationsPermissionState = rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS) LaunchedEffect(notificationsPermissionState.hasPermission) { if (notificationsPermissionState.hasPermission) { diff --git a/apps/multiplatform/common/build.gradle.kts b/apps/multiplatform/common/build.gradle.kts index 092f87690b..f591378a25 100644 --- a/apps/multiplatform/common/build.gradle.kts +++ b/apps/multiplatform/common/build.gradle.kts @@ -116,7 +116,7 @@ android { sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") defaultConfig { minSdkVersion(26) - targetSdkVersion(33) + targetSdkVersion(32) } compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/apps/multiplatform/gradle.properties b/apps/multiplatform/gradle.properties index 4381a9134d..3138d68ea2 100644 --- a/apps/multiplatform/gradle.properties +++ b/apps/multiplatform/gradle.properties @@ -25,8 +25,8 @@ android.nonTransitiveRClass=true android.enableJetifier=true kotlin.mpp.androidSourceSetLayoutVersion=2 -android.version_name=5.2.1 -android.version_code=139 +android.version_name=5.2.2 +android.version_code=142 desktop.version_name=1.0