From 7dcf854c9ad34f4891d78f6423c5838f696957d3 Mon Sep 17 00:00:00 2001
From: finn <finn@janky.solutions>
Date: Wed, 26 Oct 2022 20:04:31 -0700
Subject: [PATCH] update to v0.20.0

---
 .gitlab-ci.yml  |  2 +-
 libsignal.patch | 25 ++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 39852a5..5960a5f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ stages:
   - bindings
 
 variables:
-  libsignal_version: "v0.17.0"
+  libsignal_version: "v0.20.0"
   GRADLE_OPTS: -Dorg.gradle.daemon=false
 
 .multitarget:
diff --git a/libsignal.patch b/libsignal.patch
index c746e1f..70c506b 100644
--- a/libsignal.patch
+++ b/libsignal.patch
@@ -1,19 +1,19 @@
-From 89b9e3fd15bbb5241e3327446a2c63de7afddf32 Mon Sep 17 00:00:00 2001
+From df2a3fc267457a6f17527ed49e149ccc89895b25 Mon Sep 17 00:00:00 2001
 From: signald <nobody@signald.org>
-Date: Thu, 16 Jun 2022 12:48:11 -0700
+Date: Wed, 26 Oct 2022 20:02:19 -0700
 Subject: [PATCH] update build files
 
 ---
  java/build.gradle        |  9 +--------
- java/client/build.gradle | 30 ++++++++++--------------------
+ java/client/build.gradle | 28 ++++++++--------------------
  java/settings.gradle     | 11 +----------
- 3 files changed, 12 insertions(+), 38 deletions(-)
+ 3 files changed, 10 insertions(+), 38 deletions(-)
 
 diff --git a/java/build.gradle b/java/build.gradle
-index 1f6dba0a..75f5ee09 100644
+index 0c8f9458..01d198e7 100644
 --- a/java/build.gradle
 +++ b/java/build.gradle
-@@ -6,7 +6,7 @@ def version_number = "0.17.0"
+@@ -6,7 +6,7 @@ def version_number = "0.20.0"
  
  subprojects {
      ext.version_number     = version_number
@@ -22,7 +22,7 @@ index 1f6dba0a..75f5ee09 100644
  
      if (JavaVersion.current().isJava8Compatible()) {
          allprojects {
-@@ -31,13 +31,6 @@ task makeJniLibrariesDesktop(type:Exec) {
+@@ -37,13 +37,6 @@ task makeJniLibrariesDesktop(type:Exec) {
    commandLine './build_jni.sh', 'desktop'
  }
  
@@ -37,7 +37,7 @@ index 1f6dba0a..75f5ee09 100644
    group 'Rust'
    commandLine 'cargo', 'clean'
 diff --git a/java/client/build.gradle b/java/client/build.gradle
-index 7ee6b154..3b3d5fdf 100644
+index 7ee6b154..8fa89874 100644
 --- a/java/client/build.gradle
 +++ b/java/client/build.gradle
 @@ -1,7 +1,6 @@
@@ -48,7 +48,7 @@ index 7ee6b154..3b3d5fdf 100644
  }
  
  sourceCompatibility = 1.8
-@@ -46,23 +45,14 @@ java {
+@@ -46,23 +45,13 @@ java {
      withJavadocJar()
  }
  
@@ -62,7 +62,6 @@ index 7ee6b154..3b3d5fdf 100644
 -        }
 -    }
 -}
-+
  
  // MARK: Publishing
  
@@ -74,7 +73,7 @@ index 7ee6b154..3b3d5fdf 100644
              from components.java
  
              pom {
-@@ -93,16 +83,16 @@ publishing {
+@@ -93,16 +82,15 @@ publishing {
      }
      repositories {
          maven {
@@ -98,9 +97,8 @@ index 7ee6b154..3b3d5fdf 100644
 -    required { isReleaseBuild() && gradle.taskGraph.hasTask(":client:publish") }
 -    sign publishing.publications.mavenJava
 -}
-+
 diff --git a/java/settings.gradle b/java/settings.gradle
-index f6414646..34cf9276 100644
+index f6414646..13575990 100644
 --- a/java/settings.gradle
 +++ b/java/settings.gradle
 @@ -6,13 +6,4 @@ pluginManagement {
@@ -118,6 +116,7 @@ index f6414646..34cf9276 100644
 -    throw new GradleException("building for Android requires JDK 11 or newer; use 'client:' or 'server:' to only build certain products")
 -}
 +include ':client'
+\ No newline at end of file
 -- 
 2.30.2