update to v0.9.7

.gitlab-ci.yml

@@ -1,10 +1,9 @@
 stages:
-  - native libraries
+  - native library
   - bindings
-  - java
 
 variables:
-  libsignal_version: "v0.9.0"
+  libsignal_version: "v0.9.7"
   GRADLE_OPTS: -Dorg.gradle.daemon=false
 
 .multitarget:
@@ -20,7 +19,7 @@ variables:
 compile:
   extends: .multitarget
   image: rust:slim-buster
-  stage: native libraries
+  stage: native library
   before_script:
     - ./prepare-env.sh
   script:
@@ -34,7 +33,7 @@ compile:
       - libsignal_jni-$TARGET.so
 
 compile x86_64-apple-darwin:
-  stage: native libraries
+  stage: native library
   tags: [darwin-builder]
   script:
     - git clone https://github.com/signalapp/libsignal-client

libsignal.patch

@@ -1,18 +1,18 @@
-From 46c6a177211022656abcbb30001044b7592b2552 Mon Sep 17 00:00:00 2001
+From 35c2ba78108d4a7d6527bfe6eba62298f49dfc2c Mon Sep 17 00:00:00 2001
 From: signald <nobody@signald.org>
-Date: Thu, 20 May 2021 23:56:48 -0700
-Subject: [PATCH] Update gradle files
+Date: Sun, 24 Oct 2021 12:45:54 -0700
+Subject: [PATCH] update gradle files
 
 ---
- java/build.gradle      | 16 +---------------
- java/java/build.gradle | 23 +++++++++++++++++++++--
- 2 files changed, 22 insertions(+), 17 deletions(-)
+ java/build.gradle      |  9 +--------
+ java/java/build.gradle | 22 ++++++++++++++++++++++
+ 2 files changed, 23 insertions(+), 8 deletions(-)
 
 diff --git a/java/build.gradle b/java/build.gradle
-index a88e374..b89a098 100644
+index 8c8eefb..3c1c7d9 100644
 --- a/java/build.gradle
 +++ b/java/build.gradle
-@@ -11,20 +11,6 @@ subprojects {
+@@ -11,13 +11,6 @@ subprojects {
      }
  }
  
@@ -23,25 +23,18 @@ index a88e374..b89a098 100644
 -  commandLine './build_jni.sh', 'android'
 -}
 -
--task makeJniLibrariesDesktop(type:Exec) {
--  group 'Rust'
--  description 'Build the JNI libraries'
--
--  commandLine './build_jni.sh', 'desktop'
--}
--
- task clean(type: Delete) {
-   description 'Clean JNI libs'
-   delete fileTree('./android/src/main/jniLibs') {
-@@ -41,5 +27,5 @@ task makeAll() {
+ task makeJniLibrariesDesktop(type:Exec) {
+   group 'Rust'
+   description 'Build the JNI libraries'
+@@ -41,5 +34,5 @@ task makeAll() {
    group 'Rust'
    description 'Build the native libraries'
  
--  dependsOn 'makeDesktop', 'makeAndroid'
-+  dependsOn 'makeDesktop'
+-  dependsOn 'makeJniLibrariesDesktop', 'makeJniLibrariesAndroid'
++  dependsOn 'makeJniLibrariesDesktop'
  }
 diff --git a/java/java/build.gradle b/java/java/build.gradle
-index 2f31542..ba4bdbc 100644
+index 2f31542..79e50e1 100644
 --- a/java/java/build.gradle
 +++ b/java/java/build.gradle
 @@ -8,6 +8,7 @@ buildscript {
@@ -52,12 +45,10 @@ index 2f31542..ba4bdbc 100644
  
  sourceCompatibility = 1.7
  archivesBaseName = "signal-client-java"
-@@ -133,6 +134,24 @@ artifacts {
-     archives packageSources
+@@ -136,3 +137,24 @@ artifacts {
+ tasks.withType(JavaCompile) {
+     compileTask -> compileTask.dependsOn ':makeJniLibrariesDesktop'
  }
- 
--tasks.withType(JavaCompile) {
--    compileTask -> compileTask.dependsOn ':makeJniLibrariesDesktop'
 +
 +publishing {
 +    publications {
@@ -78,7 +69,7 @@ index 2f31542..ba4bdbc 100644
 +            }
 +        }
 +    }
- }
++}
 -- 
 2.20.1