diff --git a/fastlane/metadata/android/en-US/changelogs/40101200.txt b/fastlane/metadata/android/en-US/changelogs/40101200.txt new file mode 100644 index 0000000000..59ec82d071 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/40101200.txt @@ -0,0 +1,3 @@ +- Update codebase to Element v1.6.5 +- Add warning about proprietary scalar integration manager above the setting +- Fix some crashes and rendering issues diff --git a/vector-app/build.gradle b/vector-app/build.gradle index e099145f02..59c5d406de 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -39,7 +39,7 @@ ext.versionMinor = 6 // is the value for the next regular release. ext.versionPatch = 5 -ext.scVersion = 69 +ext.scVersion = 70 static def getGitTimestamp() { def cmd = 'git show -s --format=%ct' @@ -156,8 +156,8 @@ android { renderscriptTargetApi 24 renderscriptSupportModeEnabled true - versionCode 4010110 - versionName "1.6.3.sc69" + versionCode 4010120 + versionName "1.6.5.sc70" // Generate a random app task affinity manifestPlaceholders = [appTaskAffinitySuffix: "H_${gitRevision()}"] @@ -317,14 +317,14 @@ android { } dimension "store" - versionName "1.6.3.sc69" + versionName "1.6.5.sc70" buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"G\"" buildConfigField "String", "FLAVOR_DESCRIPTION", "\"GooglePlay\"" } fdroid { dimension "store" - versionName "1.6.3.sc69" + versionName "1.6.5.sc70" buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\"" buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\"" isDefault = true @@ -332,7 +332,7 @@ android { kotlinCrypto { dimension "crypto" - // versionName "1.6.3.sc69" + // versionName "1.6.5.sc70" buildConfigField "String", "CRYPTO_FLAVOR_DESCRIPTION", "\"olm-crypto\"" // buildConfigField "String", "FLAVOR_DESCRIPTION", "\"KotlinCrypto\"" } @@ -343,7 +343,7 @@ android { // versionNameSuffix "-R" // resValue "string", "app_name", "ER" -// // versionName "1.6.3.sc69" +// // versionName "1.6.5.sc70" buildConfigField "String", "CRYPTO_FLAVOR_DESCRIPTION", "\"rust-crypto\"" // buildConfigField "String", "FLAVOR_DESCRIPTION", "\"RustCrypto\"" }