From d50394b4a64ebc437b8504a16a377e471f1ed023 Mon Sep 17 00:00:00 2001
From: Philip Scherer <phesch@phesch.de>
Date: Tue, 13 Jun 2023 16:22:06 +0200
Subject: [PATCH 1/4] Bump to version v0.27.0

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45d5b5d..7207744 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ stages:
   - bindings
 
 variables:
-  libsignal_version: "v0.21.1"
+  libsignal_version: "v0.27.0"
   GRADLE_OPTS: -Dorg.gradle.daemon=false
   CARGO_TERM_COLOR: always
 

From 5a5d6ee539ac53494433ffa6d1918353e0525f17 Mon Sep 17 00:00:00 2001
From: Philip Scherer <phesch@phesch.de>
Date: Tue, 13 Jun 2023 16:33:54 +0200
Subject: [PATCH 2/4] Add arm linux targets back into main build

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7207744..6e116cc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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:

From c301819cc5edb9bd6543616ad2be371e63fe48d7 Mon Sep 17 00:00:00 2001
From: phesch <phesch@phesch.de>
Date: Tue, 13 Jun 2023 14:44:14 +0000
Subject: [PATCH 3/4] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e116cc..62d8886 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ stages:
   - bindings
 
 variables:
-  libsignal_version: "v0.27.0"
+  libsignal_version: "v0.26.0"
   GRADLE_OPTS: -Dorg.gradle.daemon=false
   CARGO_TERM_COLOR: always
 

From ea1cf6d71b74513ad8c3c6608f61d262fd8dad7c Mon Sep 17 00:00:00 2001
From: Philip Scherer <phesch@phesch.de>
Date: Sun, 16 Jul 2023 10:53:07 +0200
Subject: [PATCH 4/4] Fix libsignal-client patch files for v0.26.0

---
 libsignal.patch | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/libsignal.patch b/libsignal.patch
index 70c506b..f2de41c 100644
--- a/libsignal.patch
+++ b/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 }) {