Merge pull request #105 from signalapp/jack/no-more-java-protobuf

Remove protobuf from Java binding
This commit is contained in:
Jack Lloyd
2020-12-10 10:24:14 -05:00
committed by GitHub
5 changed files with 2 additions and 107 deletions

View File

@@ -3,14 +3,9 @@ buildscript {
google()
mavenCentral()
}
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'
@@ -33,31 +28,9 @@ sourceSets {
}
dependencies {
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 {
events 'passed'

View File

@@ -6,9 +6,6 @@
package org.whispersystems.libsignal.protocol;
import org.signal.client.internal.Native;
import com.google.protobuf.ByteString;
import com.google.protobuf.InvalidProtocolBufferException;
import org.whispersystems.libsignal.IdentityKey;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.InvalidMessageException;