Remove protobuf from Java

This commit is contained in:
Jack Lloyd
2020-12-09 13:01:31 -05:00
parent 191444f972
commit 612ef9f44c
6 changed files with 2 additions and 112 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;

View File

@@ -13,7 +13,6 @@ import org.whispersystems.libsignal.ecc.ECKeyPair;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.whispersystems.libsignal.InvalidKeyException;
import java.io.IOException;
import static org.whispersystems.libsignal.state.StorageProtos.SessionStructure;
public class SessionState {
private long handle;
@@ -64,10 +63,6 @@ public class SessionState {
this.handle = Native.SessionState_Deserialize(serialized);
}
public SessionState(SessionStructure sessionStructure) {
this.handle = Native.SessionState_Deserialize(sessionStructure.toByteArray());
}
SessionState(long handle) {
this.handle = handle;
}