Merge branch 'dev' into security

This commit is contained in:
nielsandriesse
2020-10-29 10:19:22 +11:00
42 changed files with 1679 additions and 516 deletions

View File

@@ -151,6 +151,7 @@ dependencies {
implementation "com.fasterxml.jackson.core:jackson-databind:2.9.8"
implementation "com.squareup.okhttp3:okhttp:3.12.1"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
implementation "nl.komponents.kovenant:kovenant:$kovenant_version"
implementation "nl.komponents.kovenant:kovenant-android:$kovenant_version"
implementation "com.github.lelloman:android-identicons:v11"
@@ -183,7 +184,7 @@ dependencies {
testImplementation 'org.robolectric:shadows-multidex:4.2'
}
def canonicalVersionCode = 111
def canonicalVersionCode = 115
def canonicalVersionName = "1.6.2"
def postFixSize = 10
@@ -196,7 +197,7 @@ def abiPostFix = ['armeabi-v7a' : 1,
android {
flavorDimensions "none"
compileSdkVersion 29
buildToolsVersion '28.0.3'
buildToolsVersion '29.0.3'
useLibrary 'org.apache.http.legacy'
dexOptions {