From b8ee40751301bd956a4152b8cf7721cae90c53b1 Mon Sep 17 00:00:00 2001 From: finn Date: Mon, 21 Mar 2022 17:52:25 -0700 Subject: [PATCH] update patch --- libsignal.patch | 193 ++++++++++++++---------------------------------- 1 file changed, 55 insertions(+), 138 deletions(-) diff --git a/libsignal.patch b/libsignal.patch index c8079a9..fed00e2 100644 --- a/libsignal.patch +++ b/libsignal.patch @@ -1,29 +1,30 @@ -From bc27064e0561e6cffe799caf2439f4bbe1291059 Mon Sep 17 00:00:00 2001 +From fc966c69590d24b3046af0c6fe2bf2c53104a4ca Mon Sep 17 00:00:00 2001 From: signald -Date: Thu, 18 Nov 2021 17:54:25 -0800 +Date: Mon, 21 Mar 2022 17:51:58 -0700 Subject: [PATCH] update gradle files --- - java/build.gradle | 8 +--- - java/java/build.gradle | 98 +++++++----------------------------------- - java/settings.gradle | 2 +- - 3 files changed, 17 insertions(+), 91 deletions(-) + java/build.gradle | 9 +-------- + java/client/build.gradle | 22 ++++++++-------------- + java/settings.gradle | 2 +- + 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/java/build.gradle b/java/build.gradle -index 8a64a47..79d80b5 100644 +index 3eb575c..bd34b09 100644 --- a/java/build.gradle +++ b/java/build.gradle -@@ -1,6 +1,6 @@ +@@ -6,7 +6,7 @@ def version_number = "0.14.0" + subprojects { - ext.version_number = "0.12.3" + ext.version_number = version_number - ext.group_info = "org.whispersystems" + ext.group_info = "org.signald" if (JavaVersion.current().isJava8Compatible()) { allprojects { -@@ -43,9 +43,3 @@ task clean(type: Delete) { +@@ -31,13 +31,6 @@ task makeJniLibrariesDesktop(type:Exec) { + commandLine './build_jni.sh', 'desktop' } - clean.dependsOn(cargoClean) -task makeAll() { - group 'Rust' @@ -31,101 +32,52 @@ index 8a64a47..79d80b5 100644 - - dependsOn 'makeJniLibrariesDesktop', 'makeJniLibrariesAndroid' -} -diff --git a/java/java/build.gradle b/java/java/build.gradle -index 55b1ee2..8ae83c0 100644 ---- a/java/java/build.gradle -+++ b/java/java/build.gradle -@@ -7,11 +7,10 @@ buildscript { - +- + task cargoClean(type:Exec) { + group 'Rust' + commandLine 'cargo', 'clean' +diff --git a/java/client/build.gradle b/java/client/build.gradle +index e72aec3..ae6890e 100644 +--- a/java/client/build.gradle ++++ b/java/client/build.gradle +@@ -1,7 +1,5 @@ plugins { - id "de.undercouch.download" version "4.1.1" -+ id 'maven-publish' + id 'java-library' +- id 'maven-publish' +- id 'signing' } - apply plugin: 'java' --apply plugin: 'maven' --apply plugin: 'signing' - - sourceCompatibility = 1.7 - archivesBaseName = "signal-client-java" -@@ -24,18 +23,9 @@ repositories { + sourceCompatibility = 1.8 +@@ -46,20 +44,13 @@ java { + withJavadocJar() } - sourceSets { -- test { -- java { -- srcDirs = ['src/test/java/', project(':tests').file('src/test/java')] -- } +-processResources { +- // TODO: Build a different variant of the JNI library for server. +- dependsOn ':makeJniLibrariesDesktop' +- if (gradle.taskGraph.hasTask(":client:publish")) { +- dependsOn ':downloadNonLinuxLibraries' - } - otherPlatformLibraries {} - } - --dependencies { -- testCompile ('junit:junit:4.12') -} -- - test { - testLogging { - events 'passed' -@@ -67,55 +57,23 @@ def getRepositoryPassword() { - return hasProperty('whisperSonatypePassword') ? whisperSonatypePassword : "" - } --signing { -- required { isReleaseBuild() && gradle.taskGraph.hasTask(":java:uploadArchives") } -- 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' -- } -- } -+publishing { -+ publications { -+ library(MavenPublication) { -+ from components.java + // MARK: Publishing + + publishing { + publications { + mavenJava(MavenPublication) { +- artifactId = archivesBaseName + artifactId = archivesBaseName + "-" + System.getenv("TARGET") - } + from components.java + + pom { +@@ -90,10 +81,13 @@ publishing { } --} -- --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" -+ maven { + 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' @@ -133,54 +85,19 @@ index 55b1ee2..8ae83c0 100644 + } + authentication { + header(HttpHeaderAuthentication) -+ } + } } } - } -@@ -130,36 +88,10 @@ task packageSources(type: Jar) { - classifier = 'sources' - } - --task testableJar(type: Jar) { -- from sourceSets.main.output -- from sourceSets.otherPlatformLibraries.resources -- classifier = 'testable' -- -- onlyIf { gradle.taskGraph.hasTask(':java:uploadArchives') } -- -- def extraResources = ['signal_jni.dll', 'libsignal_jni.dylib'] -- def extraResourcesDir = 'src/otherPlatformLibraries/resources' -- -- doFirst { -- mkdir extraResourcesDir -- extraResources.each { name -> -- download { -- src 'https://github.com/signalapp/libsignal-client/releases/download/v' + project.version + '/' + name -- dest extraResourcesDir + '/' + name -- } -- } -- } --} -- - artifacts { - archives(packageJavadoc) { - type = 'javadoc' - } - - archives packageSources -- archives testableJar --} -- --tasks.withType(JavaCompile) { -- compileTask -> compileTask.dependsOn ':makeJniLibrariesDesktop' - } diff --git a/java/settings.gradle b/java/settings.gradle -index 7412250..4c0f3cd 100644 +index 2c6638a..34cf927 100644 --- a/java/settings.gradle +++ b/java/settings.gradle -@@ -1 +1 @@ --include ':java', ':android', ':tests' -+include ':java' +@@ -6,4 +6,4 @@ pluginManagement { + } + } + +-include ':client', ':android', ':server' ++include ':client' -- 2.30.2