update to unofficial_47

.gitlab-ci.yml

@@ -2,11 +2,11 @@ stages:
   - build
 
 variables:
-  version: "v2.15.3_unofficial_46"
+  version: "v2.15.3_unofficial_47"
   GRADLE_OPTS: -Dorg.gradle.daemon=false
 
 build:
-  image: gradle:7.2
+  image: gradle:7.4
   stage: build
   script:
     - ./build.sh

libsignal-service-java.patch

@@ -1,18 +1,18 @@
-From a51d016e173cf5f656028c921670efffcae9087e Mon Sep 17 00:00:00 2001
+From 603b26fe4daacdfecc04d612bc095916f65b8b06 Mon Sep 17 00:00:00 2001
-From: signald <nobody@signald.org>
+From: nobody <nobody@signald.org>
-Date: Wed, 6 Apr 2022 11:44:36 -0700
+Date: Tue, 26 Apr 2022 17:25:06 -0700
 Subject: [PATCH] update gradle files
 
 ---
- build.gradle                     | 16 ++--------------
+ build.gradle                     | 17 ++---------------
  dependencies.gradle              |  3 +--
- gradle/verification-metadata.xml | 13 ++++++++-----
+ gradle/verification-metadata.xml | 14 ++++++++------
- service/build.gradle             | 21 ++++++++++-----------
+ service/build.gradle             | 19 +++++++++----------
- settings.gradle                  |  1 -
+ settings.gradle                  |  2 --
- 5 files changed, 21 insertions(+), 33 deletions(-)
+ 5 files changed, 20 insertions(+), 35 deletions(-)
 
 diff --git a/build.gradle b/build.gradle
-index d00de49..ac78820 100644
+index 638912f..dbbfce9 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -9,11 +9,7 @@ buildscript {
@@ -28,7 +28,7 @@ index d00de49..ac78820 100644
  
  def getRepositoryUsername() {
      return hasProperty('whisperSonatypeUsername') ? whisperSonatypeUsername : ""
-@@ -23,18 +19,10 @@ def getRepositoryPassword() {
+@@ -23,18 +19,9 @@ def getRepositoryPassword() {
      return hasProperty('whisperSonatypePassword') ? whisperSonatypePassword : ""
  }
  
@@ -40,9 +40,9 @@ index d00de49..ac78820 100644
 -        }
 -    }
 -}
- 
+-
  subprojects {
-     ext.lib_signal_service_version_number = "2.15.3_unofficial_46"
+     ext.lib_signal_service_version_number = "2.15.3_unofficial_47"
 -    ext.lib_signal_service_group_info     = "com.github.turasa"
 +    ext.lib_signal_service_group_info     = "org.signald"
  
@@ -63,7 +63,7 @@ index 0db5725..03f925a 100644
              // 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 83ef67a..261b9bd 100644
+index 83ef67a..bc01fa8 100644
 --- a/gradle/verification-metadata.xml
 +++ b/gradle/verification-metadata.xml
 @@ -482,6 +482,9 @@
@@ -76,26 +76,26 @@ index 83ef67a..261b9bd 100644
        </component>
        <component group="com.google.testing.platform" name="core-proto" version="0.0.8-alpha04">
           <artifact name="core-proto-0.0.8-alpha04.jar">
-@@ -1133,12 +1136,12 @@
+@@ -1133,12 +1136,11 @@
              <sha256 value="e0ad9cb0073a699fce187d527bb1d423a9082fb7a2f75e1fbf89fef6fb880cec" origin="Generated by Gradle"/>
           </artifact>
        </component>
 -      <component group="org.signal" name="libsignal-client" version="0.15.0">
 -         <artifact name="libsignal-client-0.15.0.jar">
 -            <sha256 value="dfbd132106ef6dbd4355043355a47132874bccbf0d42c85350686013084b953c" origin="Generated by Gradle"/>
+-         </artifact>
+-         <artifact name="libsignal-client-0.15.0.module">
+-            <sha256 value="76625d04c538f791275cb34870ed7805c09fb3a6f3deb3a256e13a48ef440fde" origin="Generated by Gradle"/>
 +      <component group="org.signald" name="libsignal-client-{TARGET}" version="0.15.0">
 +         <artifact name="libsignal-client-{TARGET}-0.15.0.jar">
 +            <sha256 value="{TARGET_JAR_SHA256}" origin="Generated by Gradle"/>
-          </artifact>
--         <artifact name="libsignal-client-0.15.0.module">
--            <sha256 value="76625d04c538f791275cb34870ed7805c09fb3a6f3deb3a256e13a48ef440fde" origin="Generated by Gradle"/>
 +         <artifact name="libsignal-client-{TARGET}-0.15.0.module">
 +            <sha256 value="{TARGET_MODULE_SHA256}" origin="Generated by Gradle"/>
           </artifact>
        </component>
        <component group="org.tensorflow" name="tensorflow-lite-metadata" version="0.1.0-rc2">
 diff --git a/service/build.gradle b/service/build.gradle
-index ae4df43..1daadf5 100644
+index ae4df43..4b0240d 100644
 --- a/service/build.gradle
 +++ b/service/build.gradle
 @@ -21,6 +21,7 @@ compileJava {
@@ -133,25 +133,24 @@ index ae4df43..1daadf5 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