update patch to use selected target

This commit is contained in:
finn 2021-11-08 15:10:46 -08:00
parent febf5a8082
commit 638d647a72

View file

@ -1,14 +1,14 @@
From 535a594ae5039c60c9e75539297fd6a56233ac68 Mon Sep 17 00:00:00 2001
From 4db44dff74922c8c37824434eee2f6bcab716fad Mon Sep 17 00:00:00 2001
From: finn <finn@janky.solutions>
Date: Tue, 26 Oct 2021 20:18:43 -0700
Subject: [PATCH] update gradle files
---
build.gradle | 9 --------
dependencies.gradle | 2 --
dependencies.gradle | 6 ++---
service/build.gradle | 55 ++++++++------------------------------------
settings.gradle | 2 --
4 files changed, 9 insertions(+), 59 deletions(-)
4 files changed, 11 insertions(+), 61 deletions(-)
diff --git a/build.gradle b/build.gradle
index 9e69283..12973ba 100644
@ -31,16 +31,19 @@ index 9e69283..12973ba 100644
ext.lib_signal_service_version_number = "2.15.3_unofficial_31"
ext.lib_signal_service_group_info = "com.github.turasa"
diff --git a/dependencies.gradle b/dependencies.gradle
index 0fd41a7..f998cb1 100644
index 0fd41a7..30b02c4 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -10,9 +10,7 @@ dependencyResolutionManagement {
@@ -9,10 +9,8 @@ dependencyResolutionManagement {
alias('google-libphonenumber').to('com.googlecode.libphonenumber:libphonenumber:8.12.17')
// 1st Party
alias('signal-client-java').to('org.whispersystems', 'signal-client-java').versionRef('signal-client')
- alias('signal-client-java').to('org.whispersystems', 'signal-client-java').versionRef('signal-client')
- alias('signal-client-android').to('org.whispersystems', 'signal-client-android').versionRef('signal-client')
alias('signal-zkgroup-java').to('org.signal', 'zkgroup-java').versionRef('zkgroup')
- alias('signal-zkgroup-java').to('org.signal', 'zkgroup-java').versionRef('zkgroup')
- alias('signal-zkgroup-android').to('org.signal', 'zkgroup-android').versionRef('zkgroup')
+ alias('signal-client-java').to('org.whispersystems', 'signal-client-java-' + System.getenv("TARGET")).versionRef('signal-client')
+ alias('signal-zkgroup-java').to('org.signal', 'zkgroup-java-' + System.getenv("TARGET")).versionRef('zkgroup')
// Third Party
alias('jackson-core').to('com.fasterxml.jackson.core:jackson-databind:2.9.9.2')