signald/libsignal-client
1
0
Fork 0
mirror of https://gitlab.com/signald/libraries/libsignal-client.git synced 2025-01-07 11:46:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "update to v0.18.1"

Browse source 
This reverts commit b7995bc7b3.
This commit is contained in:
finn 2022-09-13 15:10:24 -07:00
parent b7995bc7b3
commit 4d93ee98fc
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -3,7 +3,7 @@ stages:
- bindings - bindings
variables: variables:
libsignal_version: "e54685b281f22b58ef7489b9a86339768bad5a33" # v0.18.1 isn't tagged so we have to use the commit hash libsignal_version: "v0.17.0"
GRADLE_OPTS: -Dorg.gradle.daemon=false GRADLE_OPTS: -Dorg.gradle.daemon=false
.multitarget: .multitarget:

26
libsignal.patch
View file

@ -1,19 +1,19 @@
From ba6c862c64068882477292e5b3a798604a26c3c3 Mon Sep 17 00:00:00 2001 From 89b9e3fd15bbb5241e3327446a2c63de7afddf32 Mon Sep 17 00:00:00 2001
From: signald <nobody@signald.org> From: signald <nobody@signald.org>
Date: Tue, 2 Aug 2022 15:07:16 -0700 Date: Thu, 16 Jun 2022 12:48:11 -0700
Subject: [PATCH] update build files Subject: [PATCH] update build files
--- ---
java/build.gradle | 9 +-------- java/build.gradle | 9 +--------
java/client/build.gradle | 30 ++++++++---------------------- java/client/build.gradle | 30 ++++++++++--------------------
java/settings.gradle | 11 +---------- java/settings.gradle | 11 +----------
3 files changed, 10 insertions(+), 40 deletions(-) 3 files changed, 12 insertions(+), 38 deletions(-)
diff --git a/java/build.gradle b/java/build.gradle diff --git a/java/build.gradle b/java/build.gradle
index 2f9e3915..cbf85f28 100644 index 1f6dba0a..75f5ee09 100644
--- a/java/build.gradle --- a/java/build.gradle
+++ b/java/build.gradle +++ b/java/build.gradle
@@ -6,7 +6,7 @@ def version_number = "0.18.1" @@ -6,7 +6,7 @@ def version_number = "0.17.0"
subprojects { subprojects {
ext.version_number = version_number ext.version_number = version_number
@ -22,7 +22,7 @@ index 2f9e3915..cbf85f28 100644
if (JavaVersion.current().isJava8Compatible()) { if (JavaVersion.current().isJava8Compatible()) {
allprojects { allprojects {
@@ -37,13 +37,6 @@ task makeJniLibrariesDesktop(type:Exec) { @@ -31,13 +31,6 @@ task makeJniLibrariesDesktop(type:Exec) {
commandLine './build_jni.sh', 'desktop' commandLine './build_jni.sh', 'desktop'
} }
@ -37,7 +37,7 @@ index 2f9e3915..cbf85f28 100644
group 'Rust' group 'Rust'
commandLine 'cargo', 'clean' commandLine 'cargo', 'clean'
diff --git a/java/client/build.gradle b/java/client/build.gradle diff --git a/java/client/build.gradle b/java/client/build.gradle
index 7ee6b154..ededcff2 100644 index 7ee6b154..3b3d5fdf 100644
--- a/java/client/build.gradle --- a/java/client/build.gradle
+++ b/java/client/build.gradle +++ b/java/client/build.gradle
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
@ -48,7 +48,7 @@ index 7ee6b154..ededcff2 100644
} }
sourceCompatibility = 1.8 sourceCompatibility = 1.8
@@ -46,23 +45,12 @@ java { @@ -46,23 +45,14 @@ java {
withJavadocJar() withJavadocJar()
} }
@ -62,7 +62,8 @@ index 7ee6b154..ededcff2 100644
- } - }
- } - }
-} -}
- +
// MARK: Publishing // MARK: Publishing
publishing { publishing {
@ -73,7 +74,7 @@ index 7ee6b154..ededcff2 100644
from components.java from components.java
pom { pom {
@@ -93,16 +81,14 @@ publishing { @@ -93,16 +83,16 @@ publishing {
} }
repositories { repositories {
maven { maven {
@ -92,11 +93,12 @@ index 7ee6b154..ededcff2 100644
} }
} }
} }
-
-signing { -signing {
- required { isReleaseBuild() && gradle.taskGraph.hasTask(":client:publish") } - required { isReleaseBuild() && gradle.taskGraph.hasTask(":client:publish") }
- sign publishing.publications.mavenJava - sign publishing.publications.mavenJava
-} -}
+
diff --git a/java/settings.gradle b/java/settings.gradle diff --git a/java/settings.gradle b/java/settings.gradle
index f6414646..34cf9276 100644 index f6414646..34cf9276 100644
--- a/java/settings.gradle --- a/java/settings.gradle