libsignal-client/libsignal.patch

From 9362c4dc020c30ced791d1aaeb7efc4a6149f415 Mon Sep 17 00:00:00 2001
From: signald <nobody@signald.org>
Date: Mon, 21 Mar 2022 17:51:58 -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(-)

diff --git a/java/build.gradle b/java/build.gradle
index 3eb575c..bd34b09 100644
--- a/java/build.gradle
+++ b/java/build.gradle
@@ -6,7 +6,7 @@ def version_number = "0.14.0"
 
 subprojects {
     ext.version_number     = version_number
-    ext.group_info         = "org.whispersystems"
+    ext.group_info         = "org.signald"
 
     if (JavaVersion.current().isJava8Compatible()) {
         allprojects {
@@ -31,13 +31,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 e72aec3..e85ab25 100644
--- a/java/client/build.gradle
+++ b/java/client/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id 'signing'
 }
 
 sourceCompatibility = 1.8
@@ -46,20 +45,13 @@ java {
     withJavadocJar()
 }
 
-processResources {
-    // TODO: Build a different variant of the JNI library for server.
-    dependsOn ':makeJniLibrariesDesktop'
-    if (gradle.taskGraph.hasTask(":client:publish")) {
-        dependsOn ':downloadNonLinuxLibraries'
-    }
-}
 
 // MARK: Publishing
 
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            artifactId = archivesBaseName
+            artifactId = archivesBaseName + "-" + System.getenv("TARGET")
             from components.java
 
             pom {
@@ -90,16 +82,14 @@ publishing {
     }
     repositories {
         maven {
-            url = getReleaseRepositoryUrl()
-            credentials {
-                username = getRepositoryUsername()
-                password = getRepositoryPassword()
+            url System.getenv("CI_API_V4_URL") + "/projects/" + System.getenv("CI_PROJECT_ID") + "/packages/maven"
+            credentials(HttpHeaderCredentials) {
+                name = 'Job-Token'
+                value = System.getenv("CI_JOB_TOKEN")
+            }
+            authentication {
+                header(HttpHeaderAuthentication)
             }
         }
     }
 }
-
-signing {
-    required { isReleaseBuild() && gradle.taskGraph.hasTask(":client:publish") }
-    sign publishing.publications.mavenJava
-}
diff --git a/java/settings.gradle b/java/settings.gradle
index 2c6638a..34cf927 100644
--- a/java/settings.gradle
+++ b/java/settings.gradle
@@ -6,4 +6,4 @@ pluginManagement {
     }
 }
 
-include ':client', ':android', ':server'
+include ':client'
-- 
2.30.2