signald/libsignal-client
1
0
Fork 0
mirror of https://gitlab.com/signald/libraries/libsignal-client.git synced 2024-12-04 11:36:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix libsignal-client patch files for v0.26.0

Browse source
This commit is contained in:
Philip Scherer 2023-07-16 10:53:07 +02:00
parent c301819cc5
commit ea1cf6d71b
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libsignal.patch
View file

@ -22,20 +22,6 @@ index 0c8f9458..01d198e7 100644
if (JavaVersion.current().isJava8Compatible()) { if (JavaVersion.current().isJava8Compatible()) {
allprojects { 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 diff --git a/java/client/build.gradle b/java/client/build.gradle
index 7ee6b154..8fa89874 100644 index 7ee6b154..8fa89874 100644
--- a/java/client/build.gradle --- a/java/client/build.gradle
@ -101,14 +87,16 @@ diff --git a/java/settings.gradle b/java/settings.gradle
index f6414646..13575990 100644 index f6414646..13575990 100644
--- a/java/settings.gradle --- a/java/settings.gradle
+++ b/java/settings.gradle +++ b/java/settings.gradle
@@ -6,13 +6,4 @@ pluginManagement { @@ -6,15 +6,4 @@ pluginManagement {
} }
} }
-include ':client', ':server' -include ':client', ':server'
- -
-if (JavaVersion.current().isJava11Compatible()) { -if (hasProperty('skipAndroid')) {
- include ':android' - // Do nothing
-} else if (JavaVersion.current().isJava11Compatible()) {
- include ':android', ':android:benchmarks'
-} else if (gradle.startParameter.getTaskNames().any { name -> name.contains('android:') }) { -} else if (gradle.startParameter.getTaskNames().any { name -> name.contains('android:') }) {
- throw new GradleException("building for Android requires JDK 11 or newer") - throw new GradleException("building for Android requires JDK 11 or newer")
-} else if (gradle.startParameter.getTaskNames().any { name -> name.lastIndexOf(':') <= 0 }) { -} else if (gradle.startParameter.getTaskNames().any { name -> name.lastIndexOf(':') <= 0 }) {