From ac90eeb42f857ed47dd13b8b64f8e7cd28371b0d Mon Sep 17 00:00:00 2001
From: Alan Evans <thealanevans@gmail.com>
Date: Thu, 30 Dec 2021 00:15:16 -0500
Subject: [PATCH] Protoc update to 3.18.0

Windows and M1 gradle verification sha256 values.

Using: gradlew --write-verification-metadata sha256 help

But aapt2 artifact had to be manually added.

Fixes #11871, Fixes #11878, Closes #11877
---
 app/build.gradle                 |  2 +-
 core-util/build.gradle           |  2 +-
 gradle/verification-metadata.xml | 21 ++++++++++++++-------
 libsignal/service/build.gradle   |  2 +-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 326a2add71..e0ec7e8ce9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,7 +44,7 @@ repositories {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.11.4'
+        artifact = 'com.google.protobuf:protoc:3.18.0'
     }
     generateProtoTasks {
         all().each { task ->
diff --git a/core-util/build.gradle b/core-util/build.gradle
index 3c21b03592..661e497e5f 100644
--- a/core-util/build.gradle
+++ b/core-util/build.gradle
@@ -27,7 +27,7 @@ android {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.10.0'
+        artifact = 'com.google.protobuf:protoc:3.18.0'
     }
     generateProtoTasks {
         all().each { task ->
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index a96a5e6458..5286485712 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -1008,6 +1008,12 @@
          <artifact name="aapt2-7.0.3-7396180-linux.jar">
             <sha256 value="bcecb8127be3ff1e764af5e7f35ebb5a61fd54d14118f8ec1e4e6cfb517e5b6d" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="aapt2-7.0.3-7396180-osx.jar">
+            <sha256 value="91c63ff4aa93f8b7db53f0410bf33b1c3eb3a2641358ad094a188868c717edda" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="aapt2-7.0.3-7396180-windows.jar">
+            <sha256 value="261092207d3e8d99c972c02cc86b09055f6a4b493fac339795d1259c0eef6b37" origin="Generated by Gradle"/>
+         </artifact>
       </component>
       <component group="com.android.tools.build" name="aapt2-proto" version="0.4.0">
          <artifact name="aapt2-proto-0.4.0.jar">
@@ -1779,14 +1785,15 @@
             <sha256 value="8cacea2f7a042dabae295c509dcdbfe32a49aa3708eec6ddb8efd8593aa0b4a3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.protobuf" name="protoc" version="3.10.0">
-         <artifact name="protoc-3.10.0-linux-x86_64.exe">
-            <sha256 value="eed3ea189a99e3ad4e4209332e7161b255dc8f39bbde4c8e9fc25535f0f6f4f5" origin="Generated by Gradle"/>
+      <component group="com.google.protobuf" name="protoc" version="3.18.0">
+         <artifact name="protoc-3.18.0-osx-aarch_64.exe">
+            <sha256 value="956241e25cac149cf8d01d4f9125f2913b3bc471deea6856231367cdf4be71a4" origin="Generated by Gradle"/>
          </artifact>
-      </component>
-      <component group="com.google.protobuf" name="protoc" version="3.11.4">
-         <artifact name="protoc-3.11.4-linux-x86_64.exe">
-            <sha256 value="5405b8939f23a32b70700386ff0edb9bc1a78b29b90396371d4c0fc973c60249" origin="Generated by Gradle"/>
+         <artifact name="protoc-3.18.0-linux-x86_64.exe">
+            <sha256 value="e977a0b300a3b0c7c0135a02b8a4d746081e1cd8946ea747e0247412535692fe" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="protoc-3.18.0-windows-x86_64.exe">
+            <sha256 value="dc335931c36500406a98b1fa9a3da0b02075c98818f81e711ee210245cf317f9" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google.testing.platform" name="core-proto" version="0.0.8-alpha04">
diff --git a/libsignal/service/build.gradle b/libsignal/service/build.gradle
index 787b8e7bd0..287fea6fba 100644
--- a/libsignal/service/build.gradle
+++ b/libsignal/service/build.gradle
@@ -58,7 +58,7 @@ tasks.whenTaskAdded { task ->
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.10.0'
+        artifact = 'com.google.protobuf:protoc:3.18.0'
     }
     generateProtoTasks {
         all().each { task ->