Update to protobuf 3.10 lite.

Update fingerprint logic.
Update for additional validation around SignalServiceAddresses.

Co-authored-by: Greyson Parrelli <greyson@signal.org>
This commit is contained in:
Alan Evans
2019-11-04 09:03:18 -05:00
parent 2ab8db33e3
commit a1b10b3222
11 changed files with 75 additions and 7594 deletions

View File

@@ -17,10 +17,12 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:3.5.1'
classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0'
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
}
}
apply plugin: 'com.android.application'
apply plugin: 'com.google.protobuf'
apply plugin: 'androidx.navigation.safeargs'
apply plugin: 'witness'
apply from: 'translations.gradle'
@@ -58,10 +60,26 @@ repositories {
}
}
google()
mavenCentral()
jcenter()
mavenLocal()
}
protobuf {
protoc {
artifact = 'com.google.protobuf:protoc:3.10.0'
}
generateProtoTasks {
all().each { task ->
task.builtins {
java {
option "lite"
}
}
}
}
}
dependencies {
implementation 'androidx.appcompat:appcompat:1.1.0-beta01'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
@@ -97,7 +115,7 @@ dependencies {
implementation 'org.conscrypt:conscrypt-android:2.0.0'
implementation 'org.signal:aesgcmprovider:0.0.3'
implementation 'org.whispersystems:signal-service-android:2.14.0'
implementation 'org.whispersystems:signal-service-android:2.15.0'
implementation 'org.signal:ringrtc-android:0.1.9'
@@ -330,6 +348,7 @@ android {
res.srcDirs = ['res']
assets.srcDirs = ['assets']
jniLibs.srcDirs = ['libs']
proto.srcDir 'protobuf'
}
androidTest {
java.srcDirs = ['test/androidTest/java']