mirror of
https://github.com/signalapp/libsignal.git
synced 2026-05-10 09:02:05 +02:00
Remove protobuf from Java
This commit is contained in:
@@ -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'
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user