Bump version to 0.1.2

build.gradle

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

java/build.gradle

@@ -1,4 +1,16 @@
+buildscript {
+    repositories {
+        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'
 
@@ -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 {

java/src/main/java/org/signal/libsignal/metadata/certificate/SenderCertificate.java

@@ -79,7 +79,7 @@ public class SenderCertificate {
   }
 
   public String getSender() {
-    return senderUuid.or(senderE164).orNull();
+    return senderE164.or(senderUuid).orNull();
   }
 
   public long getExpiration() {

java/src/main/java/org/signal/libsignal/metadata/protocol/UnidentifiedSenderMessage.java

@@ -4,7 +4,6 @@ package org.signal.libsignal.metadata.protocol;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 
-import org.omg.CORBA.DynAnyPackage.Invalid;
 import org.signal.libsignal.metadata.InvalidMetadataMessageException;
 import org.signal.libsignal.metadata.InvalidMetadataVersionException;
 import org.signal.libsignal.metadata.SignalProtos;

protobuf/Makefile

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

protobuf/UnidentifiedDelivery.proto

@@ -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 {