Compare commits

...

1 Commits

Author SHA1 Message Date
Alan Evans
56e32418dc Update to protobuf 3.10 lite. 2019-10-30 17:16:01 -04:00
5 changed files with 36 additions and 3967 deletions

View File

@ -1,7 +1,7 @@
subprojects {
ext.version_number = "0.0.5"
ext.version_number = "0.0.5-PROTOBUF3"
ext.group_info = "org.signal"
ext.protocol_version = "2.7.1"
ext.protocol_version = "2.7.1-PROTOBUF3"
if (JavaVersion.current().isJava8Compatible()) {
allprojects {

View File

@ -1,4 +1,16 @@
buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
}
}
apply plugin: 'java'
apply plugin: 'com.google.protobuf'
apply plugin: 'maven'
apply plugin: 'signing'
@ -22,10 +34,29 @@ sourceSets {
dependencies {
compile "org.whispersystems:signal-protocol-java:${protocol_version}"
compile 'com.google.protobuf:protobuf-javalite:3.10.0'
testCompile ('junit:junit:3.8.2')
}
protobuf {
protoc {
artifact = 'com.google.protobuf:protoc:3.10.0'
}
generateProtoTasks {
all().each { task ->
task.builtins {
java {
option "lite"
}
}
}
}
}
sourceSets {
main.proto.srcDir '../protobuf'
}
test {
testLogging {

View File

@ -1,3 +0,0 @@
all:
protoc --java_out=../java/src/main/java/ UnidentifiedDelivery.proto

View File

@ -1,6 +1,8 @@
syntax = "proto2";
package signal;
option java_package = "org.signal.libsignal.metadata";
option java_package = "org.signal.libsignal.metadata";
option java_outer_classname = "SignalProtos";
message ServerCertificate {