signald/libsignal-service-java
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix dependencies

Browse source
This commit is contained in:
finn 2022-04-06 13:22:40 -07:00
parent bdabceac8d
commit 49a3075def
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
libsignal-service-java.patch
View file

@ -1,4 +1,4 @@
From 1d389bc9c1a81b4b3e1cc9a4ac1749c75c30d056 Mon Sep 17 00:00:00 2001 From a51d016e173cf5f656028c921670efffcae9087e Mon Sep 17 00:00:00 2001
From: signald <nobody@signald.org> From: signald <nobody@signald.org>
Date: Wed, 6 Apr 2022 11:44:36 -0700 Date: Wed, 6 Apr 2022 11:44:36 -0700
Subject: [PATCH] update gradle files Subject: [PATCH] update gradle files
@ -6,10 +6,10 @@ Subject: [PATCH] update gradle files
--- ---
build.gradle | 16 ++-------------- build.gradle | 16 ++--------------
dependencies.gradle | 3 +-- dependencies.gradle | 3 +--
gradle/verification-metadata.xml | 11 +++++++++++ gradle/verification-metadata.xml | 13 ++++++++-----
service/build.gradle | 21 ++++++++++----------- service/build.gradle | 21 ++++++++++-----------
settings.gradle | 1 - settings.gradle | 1 -
5 files changed, 24 insertions(+), 28 deletions(-) 5 files changed, 21 insertions(+), 33 deletions(-)
diff --git a/build.gradle b/build.gradle diff --git a/build.gradle b/build.gradle
index d00de49..ac78820 100644 index d00de49..ac78820 100644
@ -49,7 +49,7 @@ index d00de49..ac78820 100644
if (JavaVersion.current().isJava8Compatible()) { if (JavaVersion.current().isJava8Compatible()) {
allprojects { allprojects {
diff --git a/dependencies.gradle b/dependencies.gradle diff --git a/dependencies.gradle b/dependencies.gradle
index 0db5725..0ed2b63 100644 index 0db5725..03f925a 100644
--- a/dependencies.gradle --- a/dependencies.gradle
+++ b/dependencies.gradle +++ b/dependencies.gradle
@@ -8,8 +8,7 @@ dependencyResolutionManagement { @@ -8,8 +8,7 @@ dependencyResolutionManagement {
@ -58,12 +58,12 @@ index 0db5725..0ed2b63 100644
// 1st Party // 1st Party
- alias('libsignal-client').to('org.signal', 'libsignal-client').versionRef('libsignal-client') - alias('libsignal-client').to('org.signal', 'libsignal-client').versionRef('libsignal-client')
- alias('libsignal-android').to('org.signal', 'libsignal-android').versionRef('libsignal-client') - alias('libsignal-android').to('org.signal', 'libsignal-android').versionRef('libsignal-client')
+ alias('libsignal-client').to('org.signal', 'libsignal-client-' + System.getenv("TARGET")).versionRef('libsignal-client') + alias('libsignal-client').to('org.signald', 'libsignal-client-' + System.getenv("TARGET")).versionRef('libsignal-client')
// Third Party // Third Party
alias('jackson-core').to('com.fasterxml.jackson.core:jackson-databind:2.13.0') alias('jackson-core').to('com.fasterxml.jackson.core:jackson-databind:2.13.0')
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 83ef67a..b578e39 100644 index 83ef67a..261b9bd 100644
--- a/gradle/verification-metadata.xml --- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml
@@ -482,6 +482,9 @@ @@ -482,6 +482,9 @@
@ -76,21 +76,24 @@ index 83ef67a..b578e39 100644
</component> </component>
<component group="com.google.testing.platform" name="core-proto" version="0.0.8-alpha04"> <component group="com.google.testing.platform" name="core-proto" version="0.0.8-alpha04">
<artifact name="core-proto-0.0.8-alpha04.jar"> <artifact name="core-proto-0.0.8-alpha04.jar">
@@ -1146,6 +1149,14 @@ @@ -1133,12 +1136,12 @@
<sha256 value="2c2a264f842498c36d34d2a7b91342490d9a962862c85baac1acd54ec2fca6d9" origin="Generated by Gradle"/> <sha256 value="e0ad9cb0073a699fce187d527bb1d423a9082fb7a2f75e1fbf89fef6fb880cec" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
- <component group="org.signal" name="libsignal-client" version="0.15.0">
- <artifact name="libsignal-client-0.15.0.jar">
- <sha256 value="dfbd132106ef6dbd4355043355a47132874bccbf0d42c85350686013084b953c" origin="Generated by Gradle"/>
+ <component group="org.signald" name="libsignal-client-{TARGET}" version="0.15.0"> + <component group="org.signald" name="libsignal-client-{TARGET}" version="0.15.0">
+ <artifact name="libsignal-client-{TARGET}-0.15.0.jar"> + <artifact name="libsignal-client-{TARGET}-0.15.0.jar">
+ <sha256 value="{TARGET_JAR_SHA256}" origin="Generated by Gradle"/> + <sha256 value="{TARGET_JAR_SHA256}" origin="Generated by Gradle"/>
+ </artifact> </artifact>
- <artifact name="libsignal-client-0.15.0.module">
- <sha256 value="76625d04c538f791275cb34870ed7805c09fb3a6f3deb3a256e13a48ef440fde" origin="Generated by Gradle"/>
+ <artifact name="libsignal-client-{TARGET}-0.15.0.module"> + <artifact name="libsignal-client-{TARGET}-0.15.0.module">
+ <sha256 value="{TARGET_MODULE_SHA256}" origin="Generated by Gradle"/> + <sha256 value="{TARGET_MODULE_SHA256}" origin="Generated by Gradle"/>
+ </artifact> </artifact>
+ </component> </component>
<component group="org.testng" name="testng" version="7.3.0"> <component group="org.tensorflow" name="tensorflow-lite-metadata" version="0.1.0-rc2">
<artifact name="testng-7.3.0.jar">
<sha256 value="63727488f9717d57f0d0a0fee5a1fc10a2be9cfcff2ec3a7187656d663c0774e" origin="Generated by Gradle"/>
diff --git a/service/build.gradle b/service/build.gradle diff --git a/service/build.gradle b/service/build.gradle
index ae4df43..1daadf5 100644 index ae4df43..1daadf5 100644
--- a/service/build.gradle --- a/service/build.gradle