diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d12c080..a74bc80 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ stages: - build variables: - version: "v2.15.3_unofficial_38" + version: "v2.15.3_unofficial_41" GRADLE_OPTS: -Dorg.gradle.daemon=false build: diff --git a/hashes.json b/hashes.json index d4f6f0a..29c4e35 100644 --- a/hashes.json +++ b/hashes.json @@ -1,26 +1,26 @@ { "aarch64-unknown-linux-gnu": { - "jar": "842116b54ce7a64e7d1a2f5b95e089c274ab35fee45f0e108864b9a6bb47b5db", - "module": "30bb4de626a589810b6f01aede8be1d3df1d3adb01d674fc1ba75ee93ed0fa69" + "jar": "52426a2ada523f6d7d1e358d4c18dc05fced6e4869aea31fb71159b707d2695c", + "module": "2fc31bbd009f54480971378166e88de36235b2853ed34e0535effe1dea517d33" }, "arm-unknown-linux-gnueabi": { - "jar": "5178c42d4347d727da39f34659c8b964befb9d82225ea069d91517397b638ace", - "module": "b60d58873960d1bede4704ca6c07801cc1ca95543cc04da683aa228d6c35dbdc" + "jar": "4cd5ffff07f73d157765c560022a7568212bea13fcb6cd48254754a945098a66", + "module": "ef0c60665372ebc43a348ec0c81ce5894dd0f8991119ac5d5f862faafeeb23d4" }, "arm-unknown-linux-gnueabihf": { - "jar": "b5f8779a593c0fe37169a884eccbc0a70b8c55c0e389a0bace5e466e379af367", - "module": "dbda76abc260ad88d9cc4986f37f0327ed79fb1a12d0b9f397793ad2004f4e65" + "jar": "946ad4fb0f735e31b7190f7afadeaaf498d2e9f5593414ecea3604cf03430282", + "module": "6a6ee1fb2e16873445147b7c4d20438bca99752003a5f4b8d61f73cc9d967341" }, "armv7-unknown-linux-gnueabihf": { - "jar": "b60df2af653e37cdb858fa844c49b81d568be9d158e6bcf9a99584f2a9fd9463", - "module": "135d0a143b581407a4f04d50460f497a7302d46aa9bc532fa9a1d039e60007d2" + "jar": "e514c0b08875f46824638510a18ff39604ead47d141970f59a258707e5d99511", + "module": "d4f278cfce34ff20eede0f1f1f918333893f87e8f448656c56291de44d924f4a" }, "x86_64-unknown-linux-gnu": { - "jar": "b7ac682938e12f3b2b9f88a5ad7bd843d86abc4368742e404bc8d1b9e4fc6de5", - "module": "224b6332067e77650065e6dbd4f6b2d8eed1f4830bcf0e4ab31d3c4483352f0c" + "jar": "ef81a07891cde43a94cc3bc16430d1c21a007d3fdb30cd8815960a298960db86", + "module": "6568b38382eff752906aebb2312b15039f5775f2bf75b2d0b8c44bb97d213801" }, "x86_64-apple-darwin": { - "jar": "7d22516d32ab6be5648d4b2d728daafa755ac188f0880a99c956265e175e7840", - "module": "efa44dab7df24db4d60030ed613c17bff9f439bc7797124db8cdc18b177acc8f" + "jar": "efce8de3fc04aee313f117ebabc9b285e15a7519371c2673c5828413c07372b8", + "module": "0b7179f4b40f881c99efca24de2e78fd01825e4c751e14db1850559c9f058d87" } } \ No newline at end of file diff --git a/libsignal-service-java.patch b/libsignal-service-java.patch index 14373b9..126c2a3 100644 --- a/libsignal-service-java.patch +++ b/libsignal-service-java.patch @@ -1,18 +1,18 @@ -From 15483c7c0a29067bad3752cdaa12634beb351995 Mon Sep 17 00:00:00 2001 +From 20ce40c4c4a960720ad7ebbe758500ed2c78b475 Mon Sep 17 00:00:00 2001 From: signald -Date: Sat, 15 Jan 2022 17:34:03 -0800 +Date: Fri, 11 Feb 2022 23:16:57 -0800 Subject: [PATCH] update gradle files --- build.gradle | 18 +++--------------- dependencies.gradle | 3 +-- - gradle/verification-metadata.xml | 12 +++++++++--- - service/build.gradle | 24 +++++++++++------------- - settings.gradle | 1 - - 5 files changed, 24 insertions(+), 34 deletions(-) + gradle/verification-metadata.xml | 11 +++++++++++ + service/build.gradle | 19 +++++++++---------- + settings.gradle | 2 -- + 5 files changed, 24 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle -index 818516d..2083332 100644 +index 41c2533..f486ea8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ @@ -49,14 +49,14 @@ index 818516d..2083332 100644 -} - subprojects { - ext.lib_signal_service_version_number = "2.15.3_unofficial_38" + ext.lib_signal_service_version_number = "2.15.3_unofficial_41" - ext.lib_signal_service_group_info = "com.github.turasa" + ext.lib_signal_service_group_info = "org.signald" if (JavaVersion.current().isJava8Compatible()) { allprojects { diff --git a/dependencies.gradle b/dependencies.gradle -index c3a0278..b28c32d 100644 +index b9e6765..85a91ba 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -8,8 +8,7 @@ dependencyResolutionManagement { @@ -65,42 +65,41 @@ index c3a0278..b28c32d 100644 // 1st Party - 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') ++ alias('signal-client-java').to('org.signald', 'signal-client-java-'+ System.getenv("TARGET")).versionRef('signal-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 447b720..5fa2f62 100644 +index 77f8957..01c281e 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml -@@ -477,6 +477,9 @@ - - +@@ -482,6 +482,9 @@ + + -+ -+ ++ ++ + -@@ -1140,9 +1143,12 @@ - +@@ -1125,6 +1128,14 @@ + -- -- -- -+ -+ ++ ++ + + -+ ++ + - - - ++ ++ + + + diff --git a/service/build.gradle b/service/build.gradle -index 076cf4b..817cbf1 100644 +index db7d2eb..16b3723 100644 --- a/service/build.gradle +++ b/service/build.gradle @@ -21,6 +21,7 @@ compileJava { @@ -119,18 +118,16 @@ index 076cf4b..817cbf1 100644 } } -@@ -97,8 +97,8 @@ def getRepositoryPassword() { - +@@ -98,7 +98,7 @@ def getRepositoryPassword() { publishing { publications { -- mavenJava(MavenPublication) { + mavenJava(MavenPublication) { - artifactId = 'signal-service-java' -+ library(MavenPublication) { + artifactId = 'signal-service-java-' + System.getenv("TARGET") from components.java pom { -@@ -139,16 +139,14 @@ publishing { +@@ -139,16 +139,15 @@ publishing { repositories { maven { @@ -148,25 +145,24 @@ index 076cf4b..817cbf1 100644 + } } } --} -- + } + -signing { - required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") } - sign publishing.publications.mavenJava -} -+} -\ No newline at end of file diff --git a/settings.gradle b/settings.gradle -index 8861c00..8dd0342 100644 +index 8861c00..4048aab 100644 --- a/settings.gradle +++ b/settings.gradle -@@ -1,6 +1,5 @@ +@@ -1,7 +1,5 @@ enableFeaturePreview('VERSION_CATALOGS') -include ':android' - +- include 'libsignal-service' project(':libsignal-service').projectDir = file('service') + -- 2.30.2 diff --git a/update-hashes.py b/update-hashes.py index dbaa0f5..3d25950 100644 --- a/update-hashes.py +++ b/update-hashes.py @@ -3,7 +3,7 @@ import requests import hashlib import json -VERSION = "0.11.0" +VERSION = "0.12.3" TARGETS = [ "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabi", @@ -13,7 +13,7 @@ TARGETS = [ "x86_64-apple-darwin" ] -urlFormat = "https://gitlab.com/api/v4/groups/6853927/-/packages/maven/org/whispersystems/signal-client-java-{target}/{version}/signal-client-java-{target}-{version}.{ext}" +urlFormat = "https://gitlab.com/api/v4/groups/6853927/-/packages/maven/org/signald/signal-client-java-{target}/{version}/signal-client-java-{target}-{version}.{ext}" output = {} for target in TARGETS: