diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8bf0de5488..b22d2b7a3e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -45,8 +45,8 @@ android { defaultConfig { applicationId = "chat.schildi.android" targetSdk = Versions.targetSdk - versionCode = 840 - versionName = "0.6.0.sc8" + versionCode = 850 + versionName = "0.6.0.sc9" // Keep abiFilter for the universalApk ndk { @@ -182,7 +182,7 @@ android { } // SC: downstream package name and versioning, overriding Element default config while reducing merge conflicts -val scVersion = 8 +val scVersion = 9 android { // Use a flavor for common things that the upstream config will not override by the build type flavorDimensions += "package" @@ -191,8 +191,8 @@ android { // Common upstream overrides across all sc variants - only one flavor for this dimension to ensure it's picked up! create("sc") { dimension = "package" - versionCode = 840 - versionName = "0.6.0.sc8" + versionCode = 850 + versionName = "0.6.0.sc9" isDefault = true } // SC variants for different release tracks. Cannot do actual release types for those since fdroid build tools always want `release` builds. diff --git a/metadata/en-US/changelogs/8500.txt b/metadata/en-US/changelogs/8500.txt new file mode 100644 index 0000000000..98824c9825 --- /dev/null +++ b/metadata/en-US/changelogs/8500.txt @@ -0,0 +1 @@ +Fix: enabling the pinned message overlay should disable the action bar item diff --git a/metadata/en-US/changelogs/8501.txt b/metadata/en-US/changelogs/8501.txt new file mode 100644 index 0000000000..98824c9825 --- /dev/null +++ b/metadata/en-US/changelogs/8501.txt @@ -0,0 +1 @@ +Fix: enabling the pinned message overlay should disable the action bar item diff --git a/metadata/en-US/changelogs/8502.txt b/metadata/en-US/changelogs/8502.txt new file mode 100644 index 0000000000..98824c9825 --- /dev/null +++ b/metadata/en-US/changelogs/8502.txt @@ -0,0 +1 @@ +Fix: enabling the pinned message overlay should disable the action bar item diff --git a/metadata/en-US/changelogs/8503.txt b/metadata/en-US/changelogs/8503.txt new file mode 100644 index 0000000000..98824c9825 --- /dev/null +++ b/metadata/en-US/changelogs/8503.txt @@ -0,0 +1 @@ +Fix: enabling the pinned message overlay should disable the action bar item diff --git a/metadata/en-US/changelogs/8504.txt b/metadata/en-US/changelogs/8504.txt new file mode 100644 index 0000000000..98824c9825 --- /dev/null +++ b/metadata/en-US/changelogs/8504.txt @@ -0,0 +1 @@ +Fix: enabling the pinned message overlay should disable the action bar item