From 49a3075def54dffca9c07807e3ead0bb7a6cebed Mon Sep 17 00:00:00 2001 From: finn Date: Wed, 6 Apr 2022 13:22:40 -0700 Subject: [PATCH] fix dependencies --- libsignal-service-java.patch | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/libsignal-service-java.patch b/libsignal-service-java.patch index ebd7090..9367357 100644 --- a/libsignal-service-java.patch +++ b/libsignal-service-java.patch @@ -1,4 +1,4 @@ -From 1d389bc9c1a81b4b3e1cc9a4ac1749c75c30d056 Mon Sep 17 00:00:00 2001 +From a51d016e173cf5f656028c921670efffcae9087e Mon Sep 17 00:00:00 2001 From: signald Date: Wed, 6 Apr 2022 11:44:36 -0700 Subject: [PATCH] update gradle files @@ -6,10 +6,10 @@ Subject: [PATCH] update gradle files --- build.gradle | 16 ++-------------- dependencies.gradle | 3 +-- - gradle/verification-metadata.xml | 11 +++++++++++ + gradle/verification-metadata.xml | 13 ++++++++----- service/build.gradle | 21 ++++++++++----------- 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 index d00de49..ac78820 100644 @@ -49,7 +49,7 @@ index d00de49..ac78820 100644 if (JavaVersion.current().isJava8Compatible()) { allprojects { diff --git a/dependencies.gradle b/dependencies.gradle -index 0db5725..0ed2b63 100644 +index 0db5725..03f925a 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -8,8 +8,7 @@ dependencyResolutionManagement { @@ -58,12 +58,12 @@ index 0db5725..0ed2b63 100644 // 1st Party - alias('libsignal-client').to('org.signal', 'libsignal-client').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 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 -index 83ef67a..b578e39 100644 +index 83ef67a..261b9bd 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -482,6 +482,9 @@ @@ -76,21 +76,24 @@ index 83ef67a..b578e39 100644 -@@ -1146,6 +1149,14 @@ - +@@ -1133,12 +1136,12 @@ + +- +- +- + + + -+ + +- +- + + -+ -+ - - - + + + diff --git a/service/build.gradle b/service/build.gradle index ae4df43..1daadf5 100644 --- a/service/build.gradle