Update to unofficial_45

.gitlab-ci.yml

@@ -2,7 +2,7 @@ stages:
   - build
 
 variables:
-  version: "v2.15.3_unofficial_38"
+  version: "v2.15.3_unofficial_45"
   GRADLE_OPTS: -Dorg.gradle.daemon=false
 
 build:

hashes.json

@@ -1,26 +1,26 @@
 {
     "aarch64-unknown-linux-gnu": {
-        "jar": "842116b54ce7a64e7d1a2f5b95e089c274ab35fee45f0e108864b9a6bb47b5db",
-        "module": "30bb4de626a589810b6f01aede8be1d3df1d3adb01d674fc1ba75ee93ed0fa69"
+        "jar": "b0658de8e4b512fcae3962efeb1143ebab0f8e5fa1560f4f795443cbf73d8e0e",
+        "module": "d9e8813cc82bc846674cfcb5d71867c756d6d61688c7cbdb391bc62662beceee"
     },
     "arm-unknown-linux-gnueabi": {
-        "jar": "5178c42d4347d727da39f34659c8b964befb9d82225ea069d91517397b638ace",
-        "module": "b60d58873960d1bede4704ca6c07801cc1ca95543cc04da683aa228d6c35dbdc"
+        "jar": "3a76b4c2708aad46b4b1f179d3e586fee966251161afbd24004ee7f1eba95238",
+        "module": "8cfba809664dac88dc95abbb7debb42a3cd98765839fb7f2c2264108c2cc2fd8"
     },
     "arm-unknown-linux-gnueabihf": {
-        "jar": "b5f8779a593c0fe37169a884eccbc0a70b8c55c0e389a0bace5e466e379af367",
-        "module": "dbda76abc260ad88d9cc4986f37f0327ed79fb1a12d0b9f397793ad2004f4e65"
+        "jar": "850834c2ec967d2026356361b3dbf0bdd30bd3bc683eb4b5547d7bd29d92a15c",
+        "module": "f2d9ce5cdcb975077f0753d2ff1ff7bb2132cbd908e2fc07f56f64733414ae69"
     },
     "armv7-unknown-linux-gnueabihf": {
-        "jar": "b60df2af653e37cdb858fa844c49b81d568be9d158e6bcf9a99584f2a9fd9463",
-        "module": "135d0a143b581407a4f04d50460f497a7302d46aa9bc532fa9a1d039e60007d2"
+        "jar": "04e56a800ae0117e15f2363ec43650f2a1f1d44a98bf5f8fb90ead97aad139d8",
+        "module": "fb3e883221de56d39494694f368280a9cc5e828e95b9b9d19d70142ab405cfb0"
     },
     "x86_64-unknown-linux-gnu": {
-        "jar": "b7ac682938e12f3b2b9f88a5ad7bd843d86abc4368742e404bc8d1b9e4fc6de5",
-        "module": "224b6332067e77650065e6dbd4f6b2d8eed1f4830bcf0e4ab31d3c4483352f0c"
+        "jar": "dc16547f2fb4303bb9f0771c3a7bc70cf59a472e899d206c348b631298e3baa4",
+        "module": "5b97d734a7248ebf493e2519867aeb3b0ec58b627c42798845bcf073cbe75305"
     },
     "x86_64-apple-darwin": {
-        "jar": "7d22516d32ab6be5648d4b2d728daafa755ac188f0880a99c956265e175e7840",
-        "module": "efa44dab7df24db4d60030ed613c17bff9f439bc7797124db8cdc18b177acc8f"
+        "jar": "0b5892636edf693695bb7f81bf739f5d50cb1830a6d5b93948bc402874bd6c87",
+        "module": "954fa3ffb650b5d90aa5710193d1c747224450a23ea72594c1be4aa0067693e2"
     }
 }

libsignal-service-java.patch

@@ -1,18 +1,18 @@
-From 15483c7c0a29067bad3752cdaa12634beb351995 Mon Sep 17 00:00:00 2001
+From 5ee12828bd36c1127a914ddd55ad3f728a88a82e Mon Sep 17 00:00:00 2001
 From: signald <nobody@signald.org>
-Date: Sat, 15 Jan 2022 17:34:03 -0800
+Date: Mon, 21 Mar 2022 18:40:29 -0700
 Subject: [PATCH] update gradle files
 
 ---
  build.gradle                     | 18 +++---------------
  dependencies.gradle              |  3 +--
- gradle/verification-metadata.xml | 12 +++++++++---
- service/build.gradle             | 24 +++++++++++-------------
+ gradle/verification-metadata.xml | 10 +++++-----
+ service/build.gradle             | 21 ++++++++++-----------
  settings.gradle                  |  1 -
- 5 files changed, 24 insertions(+), 34 deletions(-)
+ 5 files changed, 19 insertions(+), 34 deletions(-)
 
 diff --git a/build.gradle b/build.gradle
-index 818516d..2083332 100644
+index 7b6a436..6641bb0 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -1,5 +1,6 @@
@@ -49,14 +49,14 @@ index 818516d..2083332 100644
 -}
 -
  subprojects {
-     ext.lib_signal_service_version_number = "2.15.3_unofficial_38"
+     ext.lib_signal_service_version_number = "2.15.3_unofficial_45"
 -    ext.lib_signal_service_group_info     = "com.github.turasa"
 +    ext.lib_signal_service_group_info     = "org.signald"
  
      if (JavaVersion.current().isJava8Compatible()) {
          allprojects {
 diff --git a/dependencies.gradle b/dependencies.gradle
-index c3a0278..b28c32d 100644
+index d468f38..1f0ba1b 100644
 --- a/dependencies.gradle
 +++ b/dependencies.gradle
 @@ -8,8 +8,7 @@ dependencyResolutionManagement {
@@ -65,42 +65,34 @@ index c3a0278..b28c32d 100644
              // 1st Party
 -            alias('signal-client-java').to('org.whispersystems', 'signal-client-java').versionRef('signal-client')
 -            alias('signal-client-android').to('org.whispersystems', 'signal-client-android').versionRef('signal-client')
-+            alias('signal-client-java').to('org.whispersystems', 'signal-client-java-'  + System.getenv("TARGET")).versionRef('signal-client')
++            alias('signal-client-java').to('org.signald', 'signal-client-java-' + System.getenv("TARGET")).versionRef('signal-client')
  
              // Third Party
              alias('jackson-core').to('com.fasterxml.jackson.core:jackson-databind:2.13.0')
 diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
-index 447b720..5fa2f62 100644
+index 261b8e2..22d8f79 100644
 --- a/gradle/verification-metadata.xml
 +++ b/gradle/verification-metadata.xml
-@@ -477,6 +477,9 @@
-          <artifact name="protoc-3.10.0-linux-x86_64.exe">
-             <sha256 value="eed3ea189a99e3ad4e4209332e7161b255dc8f39bbde4c8e9fc25535f0f6f4f5" origin="Generated by Gradle"/>
-          </artifact>
-+         <artifact name="protoc-3.10.0-osx-x86_64.exe">
-+            <sha256 value="a73d5bc8a2a4ab2a541901aa5ce81beacf8a7be5635be06a99c88f5ec10e840f" origin="Generated by Gradle"/>
-+         </artifact>
-       </component>
-       <component group="com.google.testing.platform" name="core-proto" version="0.0.8-alpha04">
-          <artifact name="core-proto-0.0.8-alpha04.jar">
-@@ -1140,9 +1143,12 @@
-             <sha256 value="970c62e785f9364860a6cba69e481d2d4b830827e616eec470b5dd29410753f1" origin="Generated by Gradle"/>
+@@ -1148,12 +1148,12 @@
+             <sha256 value="ebcdde2d03c677dbefd612819b8cf477cbb35872f1d59d4ab61bda3d56a9c87f" origin="Generated by Gradle"/>
           </artifact>
        </component>
--      <component group="org.whispersystems" name="signal-client-java" version="0.11.0">
--         <artifact name="signal-client-java-0.11.0.jar">
--            <sha256 value="7bd19ccfbfc9c0f98c80aafc44bedc18706ab2e142e257e91f592bf9cbbd070a" origin="Generated by Gradle"/>
-+      <component group="org.whispersystems" name="signal-client-java-{TARGET}" version="0.11.0">
-+         <artifact name="signal-client-java-{TARGET}-0.11.0.jar">
+-      <component group="org.whispersystems" name="signal-client-java" version="0.14.0">
+-         <artifact name="signal-client-java-0.14.0.jar">
+-            <sha256 value="c9e98d95d427caac518ad9ae0300502ae76cc228def2dd2ada0c23f52b8dfed6" origin="Generated by Gradle"/>
++      <component group="org.signald" name="signal-client-java-{TARGET}" version="0.14.0">
++         <artifact name="signal-client-java-{TARGET}-0.14.0.jar">
 +            <sha256 value="{TARGET_JAR_SHA256}" origin="Generated by Gradle"/>
-+         </artifact>
-+         <artifact name="signal-client-java-{TARGET}-0.11.0.module">
-+            <sha256 value="{TARGET_MODULE_SHA256}" origin="Generated by Gradle"/>
+          </artifact>
+-         <artifact name="signal-client-java-0.14.0.module">
+-            <sha256 value="9f0b7ab60329b9049c19f6f762a3e603df287662247a2317f7dea657ff749b2f" origin="Generated by Gradle"/>
++         <artifact name="signal-client-java-{TARGET}-0.14.0.module">
++            <sha256 value="{MODULE_JAR_SHA245}" origin="Generated by Gradle"/>
           </artifact>
        </component>
        <component group="xerces" name="xercesImpl" version="2.12.0">
 diff --git a/service/build.gradle b/service/build.gradle
-index 076cf4b..817cbf1 100644
+index db7d2eb..8e6d0d1 100644
 --- a/service/build.gradle
 +++ b/service/build.gradle
 @@ -21,6 +21,7 @@ compileJava {
@@ -111,26 +103,16 @@ index 076cf4b..817cbf1 100644
      mavenCentral()
      mavenLocal()
  }
-@@ -74,7 +75,6 @@ protobuf {
- idea {
-     module {
-         generatedSourceDirs += file("${protobuf.generatedFilesBaseDir}/main/java")
--        scopes.COMPILE.plus += [configurations.ideaTestFixturesImplementation]
-     }
- }
- 
-@@ -97,8 +97,8 @@ def getRepositoryPassword() {
- 
+@@ -98,7 +99,7 @@ def getRepositoryPassword() {
  publishing {
      publications {
--        mavenJava(MavenPublication) {
+         mavenJava(MavenPublication) {
 -            artifactId = 'signal-service-java'
-+        library(MavenPublication) {
 +            artifactId = 'signal-service-java-' + System.getenv("TARGET")
              from components.java
  
              pom {
-@@ -139,16 +139,14 @@ publishing {
+@@ -139,16 +140,14 @@ publishing {
  
      repositories {
          maven {
@@ -142,10 +124,10 @@ index 076cf4b..817cbf1 100644
 +            credentials(HttpHeaderCredentials) {
 +                name = 'Job-Token'
 +                value = System.getenv("CI_JOB_TOKEN")
-             }
++            }
 +            authentication {
-+                header(HttpHeaderAuthentication)
-+             }
++                 header(HttpHeaderAuthentication)
+             }
          }
      }
 -}

update-hashes.py

@@ -3,7 +3,7 @@ import requests
 import hashlib
 import json
 
-VERSION = "0.11.0"
+VERSION = "0.14.0"
 TARGETS = [
     "aarch64-unknown-linux-gnu",
     "arm-unknown-linux-gnueabi",
@@ -13,7 +13,7 @@ TARGETS = [
     "x86_64-apple-darwin"
 ]
 
-urlFormat = "https://gitlab.com/api/v4/groups/6853927/-/packages/maven/org/whispersystems/signal-client-java-{target}/{version}/signal-client-java-{target}-{version}.{ext}"
+urlFormat = "https://gitlab.com/api/v4/groups/6853927/-/packages/maven/org/signald/signal-client-java-{target}/{version}/signal-client-java-{target}-{version}.{ext}"
 output = {}
 
 for target in TARGETS: