fix libsignal-client-java dependency name

This commit is contained in:
finn 2021-11-20 15:50:18 -08:00
parent 16bafec65a
commit b5fa661ce8

View file

@ -1,14 +1,14 @@
From db918ccd37635338b9ba9605493732d65e44237f Mon Sep 17 00:00:00 2001
From 9c663c86765a9a0b2950ae8850bffc9fe4abe335 Mon Sep 17 00:00:00 2001
From: finn <finn@janky.solutions>
Date: Thu, 18 Nov 2021 18:55:31 -0800
Subject: [PATCH] update gradle files
---
build.gradle | 10 +---------
dependencies.gradle | 1 -
dependencies.gradle | 3 +--
service/build.gradle | 21 ++++++++++-----------
settings.gradle | 2 +-
4 files changed, 12 insertions(+), 22 deletions(-)
4 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/build.gradle b/build.gradle
index 5a4cded..a1d8d70 100644
@ -38,19 +38,21 @@ index 5a4cded..a1d8d70 100644
ext.lib_signal_service_version_number = "2.15.3_unofficial_34"
ext.lib_signal_service_group_info = "com.github.turasa"
diff --git a/dependencies.gradle b/dependencies.gradle
index c1288ca..f32a970 100644
index c1288ca..fc83d0f 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -9,7 +9,6 @@ dependencyResolutionManagement {
@@ -8,8 +8,7 @@ dependencyResolutionManagement {
alias('google-libphonenumber').to('com.googlecode.libphonenumber:libphonenumber:8.12.33')
// 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-client-java').to('org.whispersystems', 'signal-client-java-' + System.getenv("TARGET")).versionRef('signal-client')
// Third Party
alias('jackson-core').to('com.fasterxml.jackson.core:jackson-databind:2.9.9.2')
diff --git a/service/build.gradle b/service/build.gradle
index 98377c1..1fadd35 100644
index 98377c1..ca5a4c0 100644
--- a/service/build.gradle
+++ b/service/build.gradle
@@ -23,6 +23,7 @@ compileJava {
@ -68,7 +70,7 @@ index 98377c1..1fadd35 100644
- mavenJava(MavenPublication) {
- artifactId = 'signal-service-java'
+ library(MavenPublication) {
+ artifactId = 'signal-service-java'+ "-" + System.getenv("TARGET")
+ artifactId = 'signal-service-java-' + System.getenv("TARGET")
from components.java
pom {