replace _ with - in jar names

.gitlab-ci.yml

@@ -2,7 +2,7 @@ stages:
   - build
 
 variables:
-  version: "v2.15.3_unofficial_38"
+  version: "v2.15.3_unofficial_41"
   GRADLE_OPTS: -Dorg.gradle.daemon=false
 
 build:
@@ -17,7 +17,7 @@ build:
           - arm-unknown-linux-gnueabi
           - arm-unknown-linux-gnueabihf
           - armv7-unknown-linux-gnueabihf
-          - x86_64-unknown-linux-gnu
+          - x86-64-unknown-linux-gnu
 
 build x86_64-apple-darwin:
   stage: build
@@ -25,4 +25,4 @@ build x86_64-apple-darwin:
   script:
     - ./build.sh
   variables:
-    TARGET: x86_64-apple-darwin
+    TARGET: x86-64-apple-darwin

hashes.json

@@ -1,26 +1,26 @@
 {
     "aarch64-unknown-linux-gnu": {
-        "jar": "842116b54ce7a64e7d1a2f5b95e089c274ab35fee45f0e108864b9a6bb47b5db",
-        "module": "30bb4de626a589810b6f01aede8be1d3df1d3adb01d674fc1ba75ee93ed0fa69"
+        "jar": "bf3465999bbde9e3c7a17c0eec854000f6634edb1aa7617242e58a38e4106a8a",
+        "module": "7c5e147ae703ba2f25695f8f9b2bdb411f76167fb51e865cd10aef8cbf23d487"
     },
     "arm-unknown-linux-gnueabi": {
-        "jar": "5178c42d4347d727da39f34659c8b964befb9d82225ea069d91517397b638ace",
-        "module": "b60d58873960d1bede4704ca6c07801cc1ca95543cc04da683aa228d6c35dbdc"
+        "jar": "c01acd3871e3fae71dce49040f3afd9732157d60e7755e416091a36aa8e57372",
+        "module": "187bb9caa9ecb87180326d406f54a5c3dea02b11ba480cb72ab34b030cbaf3fb"
     },
     "arm-unknown-linux-gnueabihf": {
-        "jar": "b5f8779a593c0fe37169a884eccbc0a70b8c55c0e389a0bace5e466e379af367",
-        "module": "dbda76abc260ad88d9cc4986f37f0327ed79fb1a12d0b9f397793ad2004f4e65"
+        "jar": "8e2ddac2b8debae05dbdf46cbb7c833940ca718b8dd86e13cff841f69a645991",
+        "module": "afc6686faf3a06c25d5564bead161dfebdb8a31dd8ad8a37771c80daf220b352"
     },
     "armv7-unknown-linux-gnueabihf": {
-        "jar": "b60df2af653e37cdb858fa844c49b81d568be9d158e6bcf9a99584f2a9fd9463",
-        "module": "135d0a143b581407a4f04d50460f497a7302d46aa9bc532fa9a1d039e60007d2"
+        "jar": "aed207e50b289f659326aaa4493feca1a55def40e43da2ba45194ca43288e6ae",
+        "module": "80f018eabc5ab2794234e3e4f126c9bff2b3cfa85f0cedabce4fa14042906e59"
     },
-    "x86_64-unknown-linux-gnu": {
-        "jar": "b7ac682938e12f3b2b9f88a5ad7bd843d86abc4368742e404bc8d1b9e4fc6de5",
-        "module": "224b6332067e77650065e6dbd4f6b2d8eed1f4830bcf0e4ab31d3c4483352f0c"
+    "x86-64-unknown-linux-gnu": {
+        "jar": "e0e7b3587c03dd8cdecf3dbe77da8b2e55854eb728db4bd89b19ef9346d425b5",
+        "module": "9d8106cf0a206d10df464995125194a19dfaf8528a88af501bfbecf57331a264"
     },
-    "x86_64-apple-darwin": {
-        "jar": "7d22516d32ab6be5648d4b2d728daafa755ac188f0880a99c956265e175e7840",
-        "module": "efa44dab7df24db4d60030ed613c17bff9f439bc7797124db8cdc18b177acc8f"
+    "x86-64-apple-darwin": {
+        "jar": "eb3e3cc16491a69734ee552bf9a0c3bcc64148b5793f83ecf37a76a254f5b3e3",
+        "module": "6e26dbfa123a6dfeb74f98e2e8f95548bd41ffc867853971ee3e831939436411"
     }
 }

libsignal-service-java.patch

@@ -1,18 +1,18 @@
-From 15483c7c0a29067bad3752cdaa12634beb351995 Mon Sep 17 00:00:00 2001
+From 20ce40c4c4a960720ad7ebbe758500ed2c78b475 Mon Sep 17 00:00:00 2001
 From: signald <nobody@signald.org>
-Date: Sat, 15 Jan 2022 17:34:03 -0800
+Date: Fri, 11 Feb 2022 23:16:57 -0800
 Subject: [PATCH] update gradle files
 
 ---
  build.gradle                     | 18 +++---------------
  dependencies.gradle              |  3 +--
- gradle/verification-metadata.xml | 12 +++++++++---
- service/build.gradle             | 24 +++++++++++-------------
- settings.gradle                  |  1 -
- 5 files changed, 24 insertions(+), 34 deletions(-)
+ gradle/verification-metadata.xml | 11 +++++++++++
+ service/build.gradle             | 19 +++++++++----------
+ settings.gradle                  |  2 --
+ 5 files changed, 24 insertions(+), 29 deletions(-)
 
 diff --git a/build.gradle b/build.gradle
-index 818516d..2083332 100644
+index 41c2533..f486ea8 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_41"
 -    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 b9e6765..85a91ba 100644
 --- a/dependencies.gradle
 +++ b/dependencies.gradle
 @@ -8,8 +8,7 @@ dependencyResolutionManagement {
@@ -65,42 +65,41 @@ 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 77f8957..01c281e 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"/>
+@@ -482,6 +482,9 @@
+          <artifact name="protoc-3.18.0-linux-x86_64.exe">
+             <sha256 value="e977a0b300a3b0c7c0135a02b8a4d746081e1cd8946ea747e0247412535692fe" origin="Generated by Gradle"/>
           </artifact>
-+         <artifact name="protoc-3.10.0-osx-x86_64.exe">
-+            <sha256 value="a73d5bc8a2a4ab2a541901aa5ce81beacf8a7be5635be06a99c88f5ec10e840f" origin="Generated by Gradle"/>
++         <artifact name="protoc-3.18.0-osx-x86_64.exe">
++            <sha256 value="956241e25cac149cf8d01d4f9125f2913b3bc471deea6856231367cdf4be71a4" 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"/>
+@@ -1125,6 +1128,14 @@
+             <sha256 value="1dee0481072d19c929b623e155e14d2f6085dc011529a0a0dbefc84cf571d865" 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.signald" name="signal-client-java-{TARGET}" version="0.12.3">
++         <artifact name="signal-client-java-{TARGET}-0.12.3.jar">
 +            <sha256 value="{TARGET_JAR_SHA256}" origin="Generated by Gradle"/>
 +         </artifact>
-+         <artifact name="signal-client-java-{TARGET}-0.11.0.module">
++         <artifact name="signal-client-java-{TARGET}-0.12.3.module">
 +            <sha256 value="{TARGET_MODULE_SHA256}" origin="Generated by Gradle"/>
-          </artifact>
-       </component>
-       <component group="xerces" name="xercesImpl" version="2.12.0">
++          </artifact>
++      </component>
+       <component group="org.tensorflow" name="tensorflow-lite-metadata" version="0.1.0-rc2">
+          <artifact name="tensorflow-lite-metadata-0.1.0-rc2.jar">
+             <sha256 value="2c2a264f842498c36d34d2a7b91342490d9a962862c85baac1acd54ec2fca6d9" origin="Generated by Gradle"/>
 diff --git a/service/build.gradle b/service/build.gradle
-index 076cf4b..817cbf1 100644
+index db7d2eb..16b3723 100644
 --- a/service/build.gradle
 +++ b/service/build.gradle
 @@ -21,6 +21,7 @@ compileJava {
@@ -119,18 +118,16 @@ index 076cf4b..817cbf1 100644
      }
  }
  
-@@ -97,8 +97,8 @@ def getRepositoryPassword() {
- 
+@@ -98,7 +98,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 +139,15 @@ publishing {
  
      repositories {
          maven {
@@ -148,25 +145,24 @@ index 076cf4b..817cbf1 100644
 +             }
          }
      }
--}
--
+ }
+ 
 -signing {
 -    required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
 -    sign publishing.publications.mavenJava
 -}
-+}
-\ No newline at end of file
 diff --git a/settings.gradle b/settings.gradle
-index 8861c00..8dd0342 100644
+index 8861c00..4048aab 100644
 --- a/settings.gradle
 +++ b/settings.gradle
-@@ -1,6 +1,5 @@
+@@ -1,7 +1,5 @@
  enableFeaturePreview('VERSION_CATALOGS')
  
 -include ':android'
- 
+-
  include 'libsignal-service'
  project(':libsignal-service').projectDir = file('service')
+ 
 -- 
 2.30.2
 

update-hashes.py

@@ -3,17 +3,17 @@ import requests
 import hashlib
 import json
 
-VERSION = "0.11.0"
+VERSION = "0.12.3"
 TARGETS = [
     "aarch64-unknown-linux-gnu",
     "arm-unknown-linux-gnueabi",
     "arm-unknown-linux-gnueabihf",
     "armv7-unknown-linux-gnueabihf",
-    "x86_64-unknown-linux-gnu",
-    "x86_64-apple-darwin"
+    "x86-64-unknown-linux-gnu",
+    "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: