Merge branch 'v0.27.0' into 'v0.21.1'

Bump libsignal-client version and re-enable ARM builds

See merge request signald/libraries/libsignal-client!2

.gitlab-ci.yml

@@ -3,7 +3,7 @@ stages:
   - bindings
 
 variables:
-  libsignal_version: "v0.21.1"
+  libsignal_version: "v0.26.0"
   GRADLE_OPTS: -Dorg.gradle.daemon=false
   CARGO_TERM_COLOR: always
 
@@ -13,6 +13,9 @@ variables:
       - TARGET:
           - aarch64-unknown-linux-gnu
           - x86_64-unknown-linux-gnu
+          - arm-unknown-linux-gnueabi
+          - arm-unknown-linux-gnueabihf
+          - armv7-unknown-linux-gnueabihf
   rules:
   - when: on_success
 
@@ -21,10 +24,7 @@ variables:
     matrix:
       - TARGET:
           - aarch64-unknown-linux-musl
-          - arm-unknown-linux-gnueabi
-          - arm-unknown-linux-gnueabihf
           - arm-unknown-linux-musleabihf
-          - armv7-unknown-linux-gnueabihf
           - armv7-unknown-linux-musleabihf
           - x86_64-unknown-linux-musl
   rules:

libsignal.patch

@@ -22,20 +22,6 @@ index 0c8f9458..01d198e7 100644
  
      if (JavaVersion.current().isJava8Compatible()) {
          allprojects {
-@@ -37,13 +37,6 @@ task makeJniLibrariesDesktop(type:Exec) {
-   commandLine './build_jni.sh', 'desktop'
- }
- 
--task makeAll() {
--  group 'Rust'
--  description 'Build the native libraries'
--
--  dependsOn 'makeJniLibrariesDesktop', 'makeJniLibrariesAndroid'
--}
--
- task cargoClean(type:Exec) {
-   group 'Rust'
-   commandLine 'cargo', 'clean'
 diff --git a/java/client/build.gradle b/java/client/build.gradle
 index 7ee6b154..8fa89874 100644
 --- a/java/client/build.gradle
@@ -101,14 +87,16 @@ diff --git a/java/settings.gradle b/java/settings.gradle
 index f6414646..13575990 100644
 --- a/java/settings.gradle
 +++ b/java/settings.gradle
-@@ -6,13 +6,4 @@ pluginManagement {
+@@ -6,15 +6,4 @@ pluginManagement {
      }
  }
  
 -include ':client', ':server'
 -
--if (JavaVersion.current().isJava11Compatible()) {
--    include ':android'
+-if (hasProperty('skipAndroid')) {
+-    // Do nothing
+-} else if (JavaVersion.current().isJava11Compatible()) {
+-    include ':android', ':android:benchmarks'
 -} else if (gradle.startParameter.getTaskNames().any { name -> name.contains('android:') }) {
 -    throw new GradleException("building for Android requires JDK 11 or newer")
 -} else if (gradle.startParameter.getTaskNames().any { name -> name.lastIndexOf(':') <= 0 }) {