From 186faf6b44dfa03394c55e574d4e1fe0e87f0e55 Mon Sep 17 00:00:00 2001 From: Finn Date: Mon, 18 Dec 2023 21:20:11 -0800 Subject: [PATCH] add publishing to core-util-jvm --- libsignal-service-java.patch | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/libsignal-service-java.patch b/libsignal-service-java.patch index 2f59c83..03085ba 100644 --- a/libsignal-service-java.patch +++ b/libsignal-service-java.patch @@ -1,4 +1,4 @@ -From 10985a5bcc937d572c93d28c4591b1351af385e2 Mon Sep 17 00:00:00 2001 +From 21e0a4f1f3aec43589e052f5c46a44c58d41a82b 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 @@ -7,11 +7,12 @@ Subject: [PATCH] update build files and provide a way for the websocket --- build.gradle.kts | 16 ++---- constants.gradle.kts | 2 +- + core-util-jvm/build.gradle.kts | 18 +++++-- dependencies.gradle.kts | 2 +- gradle/verification-metadata.xml | 88 +++++++++++++++++++++++++++++--- service/build.gradle.kts | 21 ++++++-- settings.gradle.kts | 7 ++- - 6 files changed, 109 insertions(+), 27 deletions(-) + 7 files changed, 122 insertions(+), 32 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 89519ef1..8d9d01d9 100644 @@ -62,6 +63,34 @@ index ab7c497a..f1875c35 100644 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/core-util-jvm/build.gradle.kts b/core-util-jvm/build.gradle.kts +index 83af3c34..8ca9ba2b 100644 +--- a/core-util-jvm/build.gradle.kts ++++ b/core-util-jvm/build.gradle.kts +@@ -58,10 +58,18 @@ publishing { + } + } + } ++ repositories { ++ maven { ++ url = uri(System.getenv("CI_API_V4_URL") + "/projects/" + System.getenv("CI_PROJECT_ID") + "/packages/maven") ++ name = "GitLab" ++ credentials(HttpHeaderCredentials::class) { ++ name = "Job-Token" ++ value = System.getenv("CI_JOB_TOKEN") ++ } ++ authentication { ++ create("header", HttpHeaderAuthentication::class) ++ } ++ } ++ } + } + } +- +-signing { +- isRequired = gradle.taskGraph.hasTask("uploadArchives") +- sign(publishing.publications["mavenJava"]) +-} diff --git a/dependencies.gradle.kts b/dependencies.gradle.kts index 152a0298..e0bd16af 100644 --- a/dependencies.gradle.kts