From ce61210b39aa53ea804286d547d11a75aaa94a1e Mon Sep 17 00:00:00 2001
From: finn <finn@beeper.com>
Date: Wed, 6 Apr 2022 11:23:15 -0700
Subject: [PATCH] update to v0.15.0

---
 .gitlab-ci.yml  |  2 +-
 libsignal.patch | 51 ++++++++++++++++++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7bbf06a..29f9aa9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ stages:
   - bindings
 
 variables:
-  libsignal_version: "v0.14.0"
+  libsignal_version: "v0.15.0"
   GRADLE_OPTS: -Dorg.gradle.daemon=false
 
 .multitarget:
diff --git a/libsignal.patch b/libsignal.patch
index 00e5145..255cd74 100644
--- a/libsignal.patch
+++ b/libsignal.patch
@@ -1,23 +1,23 @@
-From 9362c4dc020c30ced791d1aaeb7efc4a6149f415 Mon Sep 17 00:00:00 2001
+From fe061a45bd30cfd242c89cd7f6f39769cd2f34d4 Mon Sep 17 00:00:00 2001
 From: signald <nobody@signald.org>
-Date: Mon, 21 Mar 2022 17:51:58 -0700
+Date: Wed, 6 Apr 2022 11:22:32 -0700
 Subject: [PATCH] update gradle files
 
 ---
  java/build.gradle        |  9 +--------
- java/client/build.gradle | 26 ++++++++------------------
- java/settings.gradle     |  2 +-
- 3 files changed, 10 insertions(+), 27 deletions(-)
+ java/client/build.gradle | 32 +++++++++-----------------------
+ java/settings.gradle     | 11 +----------
+ 3 files changed, 11 insertions(+), 41 deletions(-)
 
 diff --git a/java/build.gradle b/java/build.gradle
-index 3eb575c..bd34b09 100644
+index 0b62e4ac..1d67021c 100644
 --- a/java/build.gradle
 +++ b/java/build.gradle
-@@ -6,7 +6,7 @@ def version_number = "0.14.0"
+@@ -6,7 +6,7 @@ def version_number = "0.15.0"
  
  subprojects {
      ext.version_number     = version_number
--    ext.group_info         = "org.whispersystems"
+-    ext.group_info         = "org.signal"
 +    ext.group_info         = "org.signald"
  
      if (JavaVersion.current().isJava8Compatible()) {
@@ -37,7 +37,7 @@ index 3eb575c..bd34b09 100644
    group 'Rust'
    commandLine 'cargo', 'clean'
 diff --git a/java/client/build.gradle b/java/client/build.gradle
-index e72aec3..e85ab25 100644
+index 7ee6b154..5dfdea74 100644
 --- a/java/client/build.gradle
 +++ b/java/client/build.gradle
 @@ -1,7 +1,6 @@
@@ -48,18 +48,21 @@ index e72aec3..e85ab25 100644
  }
  
  sourceCompatibility = 1.8
-@@ -46,20 +45,13 @@ java {
+@@ -46,23 +45,12 @@ java {
      withJavadocJar()
  }
  
 -processResources {
 -    // TODO: Build a different variant of the JNI library for server.
 -    dependsOn ':makeJniLibrariesDesktop'
--    if (gradle.taskGraph.hasTask(":client:publish")) {
--        dependsOn ':downloadNonLinuxLibraries'
+-    dependsOn ':downloadNonLinuxLibraries'
+-    gradle.taskGraph.whenReady { graph ->
+-        if (graph.hasTask(":client:publish")) {
+-            tasks.getByPath(":downloadNonLinuxLibraries").enabled = true
+-        }
 -    }
 -}
- 
+-
  // MARK: Publishing
  
  publishing {
@@ -70,7 +73,7 @@ index e72aec3..e85ab25 100644
              from components.java
  
              pom {
-@@ -90,16 +82,14 @@ publishing {
+@@ -93,16 +81,14 @@ publishing {
      }
      repositories {
          maven {
@@ -88,22 +91,34 @@ index e72aec3..e85ab25 100644
              }
          }
      }
- }
+-}
 -
 -signing {
 -    required { isReleaseBuild() && gradle.taskGraph.hasTask(":client:publish") }
 -    sign publishing.publications.mavenJava
 -}
++}
+\ No newline at end of file
 diff --git a/java/settings.gradle b/java/settings.gradle
-index 2c6638a..34cf927 100644
+index f6414646..13575990 100644
 --- a/java/settings.gradle
 +++ b/java/settings.gradle
-@@ -6,4 +6,4 @@ pluginManagement {
+@@ -6,13 +6,4 @@ pluginManagement {
      }
  }
  
--include ':client', ':android', ':server'
+-include ':client', ':server'
+-
+-if (JavaVersion.current().isJava11Compatible()) {
+-    include ':android'
+-} 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 }) {
+-    // If there are any top-level tasks ("build" or ":build" but not ":client:build")...
+-    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