diff --git a/libsignal-service-java.patch b/libsignal-service-java.patch index f1911ca..2f59c83 100644 --- a/libsignal-service-java.patch +++ b/libsignal-service-java.patch @@ -1,4 +1,4 @@ -From c8219a8be171ca170eb9ef8d85100c7ab8a6b9a7 Mon Sep 17 00:00:00 2001 +From 10985a5bcc937d572c93d28c4591b1351af385e2 Mon Sep 17 00:00:00 2001 From: signald Date: Sat, 16 Dec 2023 16:42:49 -0800 Subject: [PATCH] update build files and provide a way for the websocket @@ -6,11 +6,12 @@ Subject: [PATCH] update build files and provide a way for the websocket --- build.gradle.kts | 16 ++---- + constants.gradle.kts | 2 +- dependencies.gradle.kts | 2 +- gradle/verification-metadata.xml | 88 +++++++++++++++++++++++++++++--- - service/build.gradle.kts | 20 ++++++-- - settings.gradle.kts | 3 ++ - 5 files changed, 105 insertions(+), 24 deletions(-) + service/build.gradle.kts | 21 ++++++-- + settings.gradle.kts | 7 ++- + 6 files changed, 109 insertions(+), 27 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 89519ef1..8d9d01d9 100644 @@ -51,6 +52,16 @@ index 89519ef1..8d9d01d9 100644 val lib_signal_service_version_number: String by rootProject.extra val lib_signal_service_group_info: String by rootProject.extra +diff --git a/constants.gradle.kts b/constants.gradle.kts +index ab7c497a..f1875c35 100644 +--- a/constants.gradle.kts ++++ b/constants.gradle.kts +@@ -1,4 +1,4 @@ + val signalJavaVersion by extra(JavaVersion.VERSION_17) + val signalKotlinJvmTarget by extra("17") + val lib_signal_service_version_number by extra { "2.15.3_unofficial_90" } +-val lib_signal_service_group_info by extra { "com.github.turasa" } ++val lib_signal_service_group_info by extra { "org.signald" } diff --git a/dependencies.gradle.kts b/dependencies.gradle.kts index 152a0298..e0bd16af 100644 --- a/dependencies.gradle.kts @@ -240,11 +251,14 @@ index 7b9f9ca9..87bc8856 100644 diff --git a/service/build.gradle.kts b/service/build.gradle.kts -index bc927658..463d9214 100644 +index bc927658..00f2081c 100644 --- a/service/build.gradle.kts +++ b/service/build.gradle.kts -@@ -114,7 +114,7 @@ publishing { +@@ -112,9 +112,10 @@ publishing { + publications { + create("mavenJava") { from(components["java"]) ++ "signal-service-java-" + System.getenv("TARGET") pom { - name.set("signal-service-java") @@ -252,7 +266,7 @@ index bc927658..463d9214 100644 description.set("Signal Service communication library for Java, unofficial fork") url.set("https://github.com/Turasa/libsignal-service-java") licenses { -@@ -141,10 +141,20 @@ publishing { +@@ -141,10 +142,20 @@ publishing { } } } @@ -278,10 +292,10 @@ index bc927658..463d9214 100644 - sign(publishing.publications["mavenJava"]) -} diff --git a/settings.gradle.kts b/settings.gradle.kts -index b0de0df4..6332e1db 100644 +index b0de0df4..83b67727 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts -@@ -1,5 +1,8 @@ +@@ -1,12 +1,15 @@ dependencyResolutionManagement { repositories { + maven { @@ -290,6 +304,15 @@ index b0de0df4..6332e1db 100644 mavenCentral() mavenLocal() } + } + +-include("signal-service-java") +-project(":signal-service-java").projectDir = file("service") ++include("signal-service-java-" + System.getenv("TARGET")) ++project(":signal-service-java-" + System.getenv("TARGET")).projectDir = file("service") + + include(":core-util-jvm") + -- 2.39.2