mirror of
https://gitlab.com/signald/libraries/libsignal-client.git
synced 2024-12-04 19:46:37 +00:00
fix build, update to v0.9.7 and update rust build image
This commit is contained in:
parent
65a591923f
commit
df826dd44e
3 changed files with 177 additions and 28 deletions
13
.cargo/config
Normal file
13
.cargo/config
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
[build]
|
||||
|
||||
[target.aarch64-unknown-linux-gnu]
|
||||
linker = "aarch64-linux-gnu-gcc"
|
||||
|
||||
[target.arm-unknown-linux-gnueabi]
|
||||
linker = "arm-linux-gnueabi-gcc"
|
||||
|
||||
[target.arm-unknown-linux-gnueabihf]
|
||||
linker = "arm-linux-gnueabihf-gcc"
|
||||
|
||||
[target.armv7-unknown-linux-gnueabihf]
|
||||
linker = "arm-linux-gnueabihf-gcc"
|
||||
|
|
@ -3,7 +3,7 @@ stages:
|
|||
- bindings
|
||||
|
||||
variables:
|
||||
libsignal_version: "v0.9.7"
|
||||
libsignal_version: "v0.9.4"
|
||||
GRADLE_OPTS: -Dorg.gradle.daemon=false
|
||||
|
||||
.multitarget:
|
||||
|
|
@ -18,7 +18,7 @@ variables:
|
|||
|
||||
compile:
|
||||
extends: .multitarget
|
||||
image: rust:slim-buster
|
||||
image: rust:slim-bullseye
|
||||
stage: native library
|
||||
before_script:
|
||||
- ./prepare-env.sh
|
||||
|
|
@ -48,7 +48,7 @@ compile x86_64-apple-darwin:
|
|||
|
||||
jar:
|
||||
extends: .multitarget
|
||||
image: gradle:6
|
||||
image: gradle:7
|
||||
stage: bindings
|
||||
needs: ["compile"]
|
||||
script:
|
||||
|
|
@ -62,7 +62,7 @@ jar:
|
|||
- gradle assemble publish
|
||||
|
||||
jar x86_64-apple-darwin:
|
||||
image: gradle:6
|
||||
image: gradle:7
|
||||
stage: bindings
|
||||
tags: [darwin-builder]
|
||||
needs: ["compile x86_64-apple-darwin"]
|
||||
|
|
|
|||
184
libsignal.patch
184
libsignal.patch
|
|
@ -1,21 +1,25 @@
|
|||
From 35c2ba78108d4a7d6527bfe6eba62298f49dfc2c Mon Sep 17 00:00:00 2001
|
||||
From aa16cda2790302d52286048afc3838b7b524df2e Mon Sep 17 00:00:00 2001
|
||||
From: signald <nobody@signald.org>
|
||||
Date: Sun, 24 Oct 2021 12:45:54 -0700
|
||||
Subject: [PATCH] update gradle files
|
||||
|
||||
---
|
||||
java/build.gradle | 9 +--------
|
||||
java/java/build.gradle | 22 ++++++++++++++++++++++
|
||||
2 files changed, 23 insertions(+), 8 deletions(-)
|
||||
java/build.gradle | 35 +--------------
|
||||
java/java/build.gradle | 98 +++++++++--------------------------------
|
||||
java/settings.gradle | 2 +-
|
||||
java/tests/build.gradle | 6 ---
|
||||
4 files changed, 23 insertions(+), 118 deletions(-)
|
||||
|
||||
diff --git a/java/build.gradle b/java/build.gradle
|
||||
index 8c8eefb..3c1c7d9 100644
|
||||
index 8c8eefb..f4e739f 100644
|
||||
--- a/java/build.gradle
|
||||
+++ b/java/build.gradle
|
||||
@@ -11,13 +11,6 @@ subprojects {
|
||||
@@ -9,37 +9,4 @@ subprojects {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
-}
|
||||
-
|
||||
-task makeJniLibrariesAndroid(type:Exec) {
|
||||
- group 'Rust'
|
||||
- description 'Build the JNI libraries'
|
||||
|
|
@ -23,32 +27,141 @@ index 8c8eefb..3c1c7d9 100644
|
|||
- commandLine './build_jni.sh', 'android'
|
||||
-}
|
||||
-
|
||||
task makeJniLibrariesDesktop(type:Exec) {
|
||||
group 'Rust'
|
||||
description 'Build the JNI libraries'
|
||||
@@ -41,5 +34,5 @@ task makeAll() {
|
||||
group 'Rust'
|
||||
description 'Build the native libraries'
|
||||
|
||||
-task makeJniLibrariesDesktop(type:Exec) {
|
||||
- group 'Rust'
|
||||
- description 'Build the JNI libraries'
|
||||
-
|
||||
- commandLine './build_jni.sh', 'desktop'
|
||||
-}
|
||||
-
|
||||
-task clean(type: Delete) {
|
||||
- description 'Clean JNI libs'
|
||||
- delete fileTree('./android/src/main/jniLibs') {
|
||||
- include '**/*.so'
|
||||
- }
|
||||
- delete fileTree('./java/src/main/resources') {
|
||||
- include '**/*.so'
|
||||
- include '**/*.dylib'
|
||||
- include '**/*.dll'
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-task makeAll() {
|
||||
- group 'Rust'
|
||||
- description 'Build the native libraries'
|
||||
-
|
||||
- dependsOn 'makeJniLibrariesDesktop', 'makeJniLibrariesAndroid'
|
||||
+ dependsOn 'makeJniLibrariesDesktop'
|
||||
}
|
||||
-}
|
||||
+}
|
||||
\ No newline at end of file
|
||||
diff --git a/java/java/build.gradle b/java/java/build.gradle
|
||||
index 2f31542..79e50e1 100644
|
||||
index 2f31542..6e8f369 100644
|
||||
--- a/java/java/build.gradle
|
||||
+++ b/java/java/build.gradle
|
||||
@@ -8,6 +8,7 @@ buildscript {
|
||||
@@ -6,8 +6,8 @@ buildscript {
|
||||
}
|
||||
|
||||
apply plugin: 'java'
|
||||
apply plugin: 'maven'
|
||||
-apply plugin: 'maven'
|
||||
apply plugin: 'signing'
|
||||
+apply plugin: 'maven-publish'
|
||||
|
||||
sourceCompatibility = 1.7
|
||||
archivesBaseName = "signal-client-java"
|
||||
@@ -136,3 +137,24 @@ artifacts {
|
||||
tasks.withType(JavaCompile) {
|
||||
compileTask -> compileTask.dependsOn ':makeJniLibrariesDesktop'
|
||||
@@ -19,32 +19,6 @@ repositories {
|
||||
mavenLocal()
|
||||
}
|
||||
|
||||
-sourceSets {
|
||||
- test {
|
||||
- java {
|
||||
- srcDirs = ['src/test/java/', project(':tests').file('src/test/java')]
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-dependencies {
|
||||
- testCompile ('junit:junit:3.8.2')
|
||||
-}
|
||||
-
|
||||
-test {
|
||||
- testLogging {
|
||||
- events 'passed'
|
||||
- showStandardStreams = true
|
||||
- showExceptions true
|
||||
- exceptionFormat 'full'
|
||||
- showCauses true
|
||||
- showStackTraces true
|
||||
- }
|
||||
-
|
||||
- include 'org/whispersystems/**'
|
||||
- include 'org/signal/**'
|
||||
-}
|
||||
-
|
||||
def isReleaseBuild() {
|
||||
return version.contains("SNAPSHOT") == false
|
||||
}
|
||||
@@ -67,54 +41,6 @@ signing {
|
||||
sign configurations.archives
|
||||
}
|
||||
|
||||
-uploadArchives {
|
||||
- configuration = configurations.archives
|
||||
- repositories.mavenDeployer {
|
||||
- beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
|
||||
-
|
||||
- repository(url: getReleaseRepositoryUrl()) {
|
||||
- authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
|
||||
- }
|
||||
-
|
||||
- pom.project {
|
||||
- name 'signal-client-java'
|
||||
- packaging 'jar'
|
||||
- description 'Signal Protocol cryptography library for Java'
|
||||
- url 'https://github.com/signalapp/libsignal-client'
|
||||
-
|
||||
- scm {
|
||||
- url 'scm:git@github.com:signalapp/libsignal-client.git'
|
||||
- connection 'scm:git@github.com:signalapp/libsignal-client.git'
|
||||
- developerConnection 'scm:git@github.com:signalapp/libsignal-client.git'
|
||||
- }
|
||||
-
|
||||
- licenses {
|
||||
- license {
|
||||
- name 'AGPLv3'
|
||||
- url 'https://www.gnu.org/licenses/agpl-3.0.txt'
|
||||
- distribution 'repo'
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- developers {
|
||||
- developer {
|
||||
- name 'Signal Messenger LLC'
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-task installArchives(type: Upload) {
|
||||
- description "Installs the artifacts to the local Maven repository."
|
||||
- configuration = configurations['archives']
|
||||
- repositories {
|
||||
- mavenDeployer {
|
||||
- repository url: "file://${System.properties['user.home']}/.m2/repository"
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
-
|
||||
task packageJavadoc(type: Jar, dependsOn: 'javadoc') {
|
||||
from javadoc.destinationDir
|
||||
classifier = 'javadoc'
|
||||
@@ -133,6 +59,24 @@ artifacts {
|
||||
archives packageSources
|
||||
}
|
||||
|
||||
-tasks.withType(JavaCompile) {
|
||||
- compileTask -> compileTask.dependsOn ':makeJniLibrariesDesktop'
|
||||
+
|
||||
+publishing {
|
||||
+ publications {
|
||||
|
|
@ -69,7 +182,30 @@ index 2f31542..79e50e1 100644
|
|||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
}
|
||||
diff --git a/java/settings.gradle b/java/settings.gradle
|
||||
index 7412250..4a565e5 100644
|
||||
--- a/java/settings.gradle
|
||||
+++ b/java/settings.gradle
|
||||
@@ -1 +1 @@
|
||||
-include ':java', ':android', ':tests'
|
||||
+include ':java', ':tests'
|
||||
diff --git a/java/tests/build.gradle b/java/tests/build.gradle
|
||||
index 013779e..aef19f2 100644
|
||||
--- a/java/tests/build.gradle
|
||||
+++ b/java/tests/build.gradle
|
||||
@@ -3,10 +3,4 @@ apply plugin: 'java'
|
||||
repositories {
|
||||
mavenCentral()
|
||||
mavenLocal()
|
||||
-}
|
||||
-
|
||||
-dependencies {
|
||||
- testCompile 'junit:junit:3.8.2'
|
||||
-
|
||||
- compile project(':java')
|
||||
}
|
||||
\ No newline at end of file
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue