Merge branch 'dev' of https://github.com/loki-project/session-android into backup-restore

This commit is contained in:
Anton Chekulaev
2020-10-29 13:54:21 +11:00
50 changed files with 1793 additions and 556 deletions

View File

@@ -55,6 +55,12 @@ repositories {
includeGroupByRegex "com\\.amulyakhare.*"
}
}
maven {
url "https://dl.bintray.com/terl/lazysodium-maven"
content {
includeGroupByRegex "com\\.goterl\\.lazycode.*"
}
}
google()
jcenter()
maven { url "https://jitpack.io" }
@@ -145,10 +151,13 @@ dependencies {
implementation "org.whispersystems:signal-service-android:2.13.2" // Run ./gradlew install from session-android-service to install
implementation "org.whispersystems:curve25519-java:0.5.0"
// Remote:
implementation "com.goterl.lazycode:lazysodium-android:4.2.0@aar"
implementation "net.java.dev.jna:jna:5.5.0@aar"
implementation "com.google.protobuf:protobuf-java:2.5.0"
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 'androidx.fragment:fragment-ktx:1.3.0-beta01'
implementation 'androidx.activity:activity-ktx:1.1.0'
implementation "nl.komponents.kovenant:kovenant:$kovenant_version"
@@ -183,8 +192,8 @@ dependencies {
testImplementation 'org.robolectric:shadows-multidex:4.2'
}
def canonicalVersionCode = 110
def canonicalVersionName = "1.6.1"
def canonicalVersionCode = 116
def canonicalVersionName = "1.6.3"
def postFixSize = 10
def abiPostFix = ['armeabi-v7a' : 1,
@@ -196,7 +205,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 {
@@ -265,6 +274,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'),
'proguard-dagger.pro',
'proguard-jackson.pro',
'proguard-jna.pro',
'proguard-sqlite.pro',
'proguard-appcompat-v7.pro',
'proguard-square-okhttp.pro',