1
0
mirror of https://github.com/vector-im/riotX-android synced 2025-10-06 00:02:48 +02:00

Merge branch 'develop' into feature/bca/rust_flavor

This commit is contained in:
valere
2023-03-09 18:21:41 +01:00
453 changed files with 8561 additions and 2857 deletions

View File

@@ -37,7 +37,7 @@ ext.versionMinor = 5
// Note: even values are reserved for regular release, odd values for hotfix release.
// When creating a hotfix, you should decrease the value, since the current value
// is the value for the next regular release.
ext.versionPatch = 24
ext.versionPatch = 30
static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct'
@@ -449,7 +449,7 @@ dependencies {
androidTestImplementation libs.mockk.mockkAndroid
androidTestUtil libs.androidx.orchestrator
androidTestImplementation libs.androidx.fragmentTesting
androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.8.0"
androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.8.10"
debugImplementation libs.androidx.fragmentTestingManifest
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
}