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

Merge branch 'v0.27.0' into 'v0.21.1'

Browse source 
Bump libsignal-client version and re-enable ARM builds

See merge request signald/libraries/libsignal-client!2
This commit is contained in:
Finn 2023-07-16 18:49:09 +00:00
commit b4875de049
2 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -3,7 +3,7 @@ stages:
- bindings - bindings
variables: variables:
libsignal_version: "v0.21.1" libsignal_version: "v0.26.0"
GRADLE_OPTS: -Dorg.gradle.daemon=false GRADLE_OPTS: -Dorg.gradle.daemon=false
CARGO_TERM_COLOR: always CARGO_TERM_COLOR: always
@ -13,6 +13,9 @@ variables:
- TARGET: - TARGET:
- aarch64-unknown-linux-gnu - aarch64-unknown-linux-gnu
- x86_64-unknown-linux-gnu - x86_64-unknown-linux-gnu
- arm-unknown-linux-gnueabi
- arm-unknown-linux-gnueabihf
- armv7-unknown-linux-gnueabihf
rules: rules:
- when: on_success - when: on_success
@ -21,10 +24,7 @@ variables:
matrix: matrix:
- TARGET: - TARGET:
- aarch64-unknown-linux-musl - aarch64-unknown-linux-musl
- arm-unknown-linux-gnueabi
- arm-unknown-linux-gnueabihf
- arm-unknown-linux-musleabihf - arm-unknown-linux-musleabihf
- armv7-unknown-linux-gnueabihf
- armv7-unknown-linux-musleabihf - armv7-unknown-linux-musleabihf
- x86_64-unknown-linux-musl - x86_64-unknown-linux-musl
rules: rules:

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 }) {