GitHub-Mirror/riotX-android
1
0
Fork 1
mirror of https://github.com/vector-im/riotX-android synced 2025-10-06 00:02:48 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into feature/bca/rust_flavor

Browse Source
This commit is contained in:
valere
2023-01-12 14:51:03 +01:00
parent f330a00834 b1d2581bf3
commit c0397875f0
72 changed files with 1201 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vector-app/build.gradle
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 = 20
ext.versionPatch = 22
static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct'
@@ -251,7 +251,7 @@ android {
signingConfig signingConfigs.debug
if (project.hasProperty("coverage")) {
testCoverageEnabled = coverage.enableTestCoverage
testCoverageEnabled = coverage == "true"
}
}
@@ -448,7 +448,7 @@ dependencies {
androidTestImplementation libs.mockk.mockkAndroid
androidTestUtil libs.androidx.orchestrator
androidTestImplementation libs.androidx.fragmentTesting
androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.22"
debugImplementation libs.androidx.fragmentTesting
androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.8.0"
debugImplementation libs.androidx.fragmentTestingManifest
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
}