bump compatibility version

.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

build.sh

@@ -7,4 +7,8 @@ git config user.name signald
 git am ../libsignal-service-java.patch
 python3 ../update-verification-metadata.py
 git diff --color=always
-gradle assemble publish || (gradle --write-verification-metadata sha256 && git diff --color=always && exit 1)
+gradle assemble || (gradle --write-verification-metadata sha256 && git diff --color=always && exit 1)
+
+if [ "$CI_COMMIT_REF_PROTECTED" == "true" ]; then
+    gradle publish
+fi

hashes.json

@@ -1,26 +1,26 @@
 {
     "aarch64-unknown-linux-gnu": {
-        "jar": "842116b54ce7a64e7d1a2f5b95e089c274ab35fee45f0e108864b9a6bb47b5db",
+        "jar": "84f1dbec74350455499fd816bed1bcb669ba4ae52febe3becd288a51a3e0fb6f",
-        "module": "30bb4de626a589810b6f01aede8be1d3df1d3adb01d674fc1ba75ee93ed0fa69"
+        "module": "055aaee5b721a46d1e68b629605ba6cf0f41cd6988e8cc14aa8304a7d6b9a48b"
     },
     "arm-unknown-linux-gnueabi": {
-        "jar": "5178c42d4347d727da39f34659c8b964befb9d82225ea069d91517397b638ace",
+        "jar": "c982ca418e30cc145a40f50ece27d0fb0a5cfb033ea7bd1a24190e0c885850af",
-        "module": "b60d58873960d1bede4704ca6c07801cc1ca95543cc04da683aa228d6c35dbdc"
+        "module": "4fd7495f381ac2f202c3850644ecea1e4ecf9c864fcf9e81c35e2b260d33f7b1"
     },
     "arm-unknown-linux-gnueabihf": {
-        "jar": "b5f8779a593c0fe37169a884eccbc0a70b8c55c0e389a0bace5e466e379af367",
+        "jar": "705cc667cb3b056ed2186b848882ca48217f5dc2a891197b950deaf1fe6fa2e5",
-        "module": "dbda76abc260ad88d9cc4986f37f0327ed79fb1a12d0b9f397793ad2004f4e65"
+        "module": "8790e629212b73b650c3c89b1f496c6fbbb00c26540141eb2d422b32aeb88c29"
     },
     "armv7-unknown-linux-gnueabihf": {
-        "jar": "b60df2af653e37cdb858fa844c49b81d568be9d158e6bcf9a99584f2a9fd9463",
+        "jar": "f444ef54a71c8dd631d33ec29f209116c1400d6927c9ceed22444760e80bec44",
-        "module": "135d0a143b581407a4f04d50460f497a7302d46aa9bc532fa9a1d039e60007d2"
+        "module": "78d253a756953563b67687c6f9a8d5e0cbdccac2e5066156a7057e848e781610"
     },
-    "x86_64-unknown-linux-gnu": {
+    "x86-64-unknown-linux-gnu": {
-        "jar": "b7ac682938e12f3b2b9f88a5ad7bd843d86abc4368742e404bc8d1b9e4fc6de5",
+        "jar": "54b4359ddec3b86663d26c4004a3f6963e9a36b5e180cb0b9d08f1dd17a0d51c",
-        "module": "224b6332067e77650065e6dbd4f6b2d8eed1f4830bcf0e4ab31d3c4483352f0c"
+        "module": "22286c2ff5dc69a2773e5ca861de8baa2435e94fdf65e5408dec79cb14f5b4d9"
     },
-    "x86_64-apple-darwin": {
+    "x86-64-apple-darwin": {
-        "jar": "7d22516d32ab6be5648d4b2d728daafa755ac188f0880a99c956265e175e7840",
+        "jar": "1875944c286b35790a2d8542f908cf987468feff1c507e313b4de49753e10108",
-        "module": "efa44dab7df24db4d60030ed613c17bff9f439bc7797124db8cdc18b177acc8f"
+        "module": "067935bebc5a4887cb5c9dda69fccfd541efb40ea61626b3be47daa324b20a2b"
     }
 }

libsignal-service-java.patch

@@ -1,18 +1,18 @@
-From 15483c7c0a29067bad3752cdaa12634beb351995 Mon Sep 17 00:00:00 2001
+From 2022d9a860a53d9ba3641ac2716f3197a8d85c10 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 +++++++++---
+ gradle/verification-metadata.xml | 11 +++++++++++
- service/build.gradle             | 24 +++++++++++-------------
+ service/build.gradle             | 23 +++++++++++------------
- settings.gradle                  |  1 -
+ settings.gradle                  |  2 --
- 5 files changed, 24 insertions(+), 34 deletions(-)
+ 5 files changed, 26 insertions(+), 31 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..d57dea2 100644
 --- a/dependencies.gradle
 +++ b/dependencies.gradle
 @@ -8,8 +8,7 @@ dependencyResolutionManagement {
@@ -65,44 +65,59 @@ 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").replaceAll("_", "-")).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 @@
+@@ -482,6 +482,9 @@
-          <artifact name="protoc-3.10.0-linux-x86_64.exe">
+          <artifact name="protoc-3.18.0-linux-x86_64.exe">
-             <sha256 value="eed3ea189a99e3ad4e4209332e7161b255dc8f39bbde4c8e9fc25535f0f6f4f5" origin="Generated by Gradle"/>
+             <sha256 value="e977a0b300a3b0c7c0135a02b8a4d746081e1cd8946ea747e0247412535692fe" origin="Generated by Gradle"/>
           </artifact>
-+         <artifact name="protoc-3.10.0-osx-x86_64.exe">
++         <artifact name="protoc-3.18.0-osx-x86_64.exe">
-+            <sha256 value="a73d5bc8a2a4ab2a541901aa5ce81beacf8a7be5635be06a99c88f5ec10e840f" origin="Generated by Gradle"/>
++            <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 @@
+@@ -1125,6 +1128,14 @@
-             <sha256 value="970c62e785f9364860a6cba69e481d2d4b830827e616eec470b5dd29410753f1" origin="Generated by Gradle"/>
+             <sha256 value="1dee0481072d19c929b623e155e14d2f6085dc011529a0a0dbefc84cf571d865" origin="Generated by Gradle"/>
           </artifact>
        </component>
--      <component group="org.whispersystems" name="signal-client-java" version="0.11.0">
++      <component group="org.signald" name="signal-client-java-{TARGET}" version="0.12.3">
--         <artifact name="signal-client-java-0.11.0.jar">
++         <artifact name="signal-client-java-{TARGET}-0.12.3.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">
 +            <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>
++          </artifact>
-       </component>
++      </component>
-       <component group="xerces" name="xercesImpl" version="2.12.0">
+       <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..307642b 100644
 --- a/service/build.gradle
 +++ b/service/build.gradle
+@@ -5,13 +5,13 @@ apply plugin: 'maven-publish'
+ apply plugin: 'signing'
+ apply plugin: 'idea'
+ 
+-sourceCompatibility = 1.8
++sourceCompatibility = 1.9
+ archivesBaseName    = "signal-service-java"
+ version             = lib_signal_service_version_number
+ group               = lib_signal_service_group_info
+ 
+ java {
+-    targetCompatibility = 1.8
++    targetCompatibility = 1.9
+     withJavadocJar()
+     withSourcesJar()
+ }
 @@ -21,6 +21,7 @@ compileJava {
  }
  
@@ -119,18 +134,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").replaceAll("_", "-")
-+            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 +161,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-unknown-linux-gnu",
-    "x86_64-apple-darwin"
+    "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: