signald/libsignal-service-java
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to unofficial_46

Browse source
This commit is contained in:
finn 2022-04-06 11:45:49 -07:00
parent 19f6df8197
commit 41951d0a43
4 changed files with 43 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -2,7 +2,7 @@ stages:
- build - build
variables: variables:
version: "v2.15.3_unofficial_45" version: "v2.15.3_unofficial_46"
GRADLE_OPTS: -Dorg.gradle.daemon=false GRADLE_OPTS: -Dorg.gradle.daemon=false
build: build:

24
hashes.json
View file

@ -1,26 +1,26 @@
{ {
"aarch64-unknown-linux-gnu": { "aarch64-unknown-linux-gnu": {
"jar": "b0658de8e4b512fcae3962efeb1143ebab0f8e5fa1560f4f795443cbf73d8e0e", "jar": "0f2573702f17f2390bbe084687e9caff7a8526c519a27d58066dd493cd9378da",
"module": "d9e8813cc82bc846674cfcb5d71867c756d6d61688c7cbdb391bc62662beceee" "module": "bb56193d9d64102e24047e067a35d13b813bc39d715dad92ebe474a78177a4af"
}, },
"arm-unknown-linux-gnueabi": { "arm-unknown-linux-gnueabi": {
"jar": "3a76b4c2708aad46b4b1f179d3e586fee966251161afbd24004ee7f1eba95238", "jar": "048f8562c03906fdc4e45651272c00ee0a1821f2e5fa9cb4e05a6a360df176a6",
"module": "8cfba809664dac88dc95abbb7debb42a3cd98765839fb7f2c2264108c2cc2fd8" "module": "71a4bbbd0678d2fdf43adae7763a03dc02ad01a0947c2960c72219079a3872e6"
}, },
"arm-unknown-linux-gnueabihf": { "arm-unknown-linux-gnueabihf": {
"jar": "850834c2ec967d2026356361b3dbf0bdd30bd3bc683eb4b5547d7bd29d92a15c", "jar": "afdd3a2728b84e5ea594009680ec9fa888a06a56bf055ccc460735a74f6b1cb6",
"module": "f2d9ce5cdcb975077f0753d2ff1ff7bb2132cbd908e2fc07f56f64733414ae69" "module": "0b87fbf1de3d5d7889109e3bd62a807b3f98bdb1f295a469b6eb71114d561db2"
}, },
"armv7-unknown-linux-gnueabihf": { "armv7-unknown-linux-gnueabihf": {
"jar": "04e56a800ae0117e15f2363ec43650f2a1f1d44a98bf5f8fb90ead97aad139d8", "jar": "11801051a1bafb9c8e01b94fb3333177fe601e82d81f5a7b0f910b95c4167cb1",
"module": "fb3e883221de56d39494694f368280a9cc5e828e95b9b9d19d70142ab405cfb0" "module": "91be468f808b1a615b6ea648fc9e2d2a7698c646c1b1544a971909e7a8558774"
}, },
"x86_64-unknown-linux-gnu": { "x86_64-unknown-linux-gnu": {
"jar": "dc16547f2fb4303bb9f0771c3a7bc70cf59a472e899d206c348b631298e3baa4", "jar": "22b55eccaae34c001cb0ad4101e76de5405819a6e1fe20ef9d0dfc5d333f6af4",
"module": "5b97d734a7248ebf493e2519867aeb3b0ec58b627c42798845bcf073cbe75305" "module": "f6cc6f132c64376c9a4687716a9a41022aae3a5ce2d14fb95a31214c2a165c0e"
}, },
"x86_64-apple-darwin": { "x86_64-apple-darwin": {
"jar": "0b5892636edf693695bb7f81bf739f5d50cb1830a6d5b93948bc402874bd6c87", "jar": "0500c7ea64610754cef7edc65e7a1fbdb8fa325a74375c5c8c3deeed24d7f4c9",
"module": "954fa3ffb650b5d90aa5710193d1c747224450a23ea72594c1be4aa0067693e2" "module": "710596dc3f7f08b756586a8827d9be4778817a23c8f617c3f14ce11f67f2ed2a"
} }
} }

75
libsignal-service-java.patch
View file

@ -1,28 +1,21 @@
From f43d826dc39e172db303aab5c0db73d11a43a6d2 Mon Sep 17 00:00:00 2001 From a51d016e173cf5f656028c921670efffcae9087e Mon Sep 17 00:00:00 2001
From: signald <nobody@signald.org> From: signald <nobody@signald.org>
Date: Mon, 21 Mar 2022 18:40:29 -0700 Date: Wed, 6 Apr 2022 11:44:36 -0700
Subject: [PATCH] update gradle files Subject: [PATCH] update gradle files
--- ---
build.gradle | 18 +++--------------- build.gradle | 16 ++--------------
dependencies.gradle | 3 +-- dependencies.gradle | 3 +--
gradle/verification-metadata.xml | 19 +++++++++++-------- gradle/verification-metadata.xml | 13 ++++++++-----
service/build.gradle | 21 ++++++++++----------- service/build.gradle | 21 ++++++++++-----------
settings.gradle | 1 - settings.gradle | 1 -
5 files changed, 25 insertions(+), 37 deletions(-) 5 files changed, 21 insertions(+), 33 deletions(-)
diff --git a/build.gradle b/build.gradle diff --git a/build.gradle b/build.gradle
index 7b6a436..6641bb0 100644 index d00de49..ac78820 100644
--- a/build.gradle --- a/build.gradle
+++ b/build.gradle +++ b/build.gradle
@@ -1,5 +1,6 @@ @@ -9,11 +9,7 @@ buildscript {
buildscript {
repositories {
+ maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages
google()
mavenCentral()
}
@@ -9,11 +10,7 @@ buildscript {
} }
} }
@ -35,7 +28,7 @@ index 7b6a436..6641bb0 100644
def getRepositoryUsername() { def getRepositoryUsername() {
return hasProperty('whisperSonatypeUsername') ? whisperSonatypeUsername : "" return hasProperty('whisperSonatypeUsername') ? whisperSonatypeUsername : ""
@@ -23,18 +20,9 @@ def getRepositoryPassword() { @@ -23,18 +19,10 @@ def getRepositoryPassword() {
return hasProperty('whisperSonatypePassword') ? whisperSonatypePassword : "" return hasProperty('whisperSonatypePassword') ? whisperSonatypePassword : ""
} }
@ -47,30 +40,30 @@ index 7b6a436..6641bb0 100644
- } - }
- } - }
-} -}
-
subprojects { subprojects {
ext.lib_signal_service_version_number = "2.15.3_unofficial_45" ext.lib_signal_service_version_number = "2.15.3_unofficial_46"
- ext.lib_signal_service_group_info = "com.github.turasa" - ext.lib_signal_service_group_info = "com.github.turasa"
+ ext.lib_signal_service_group_info = "org.signald" + ext.lib_signal_service_group_info = "org.signald"
if (JavaVersion.current().isJava8Compatible()) { if (JavaVersion.current().isJava8Compatible()) {
allprojects { allprojects {
diff --git a/dependencies.gradle b/dependencies.gradle diff --git a/dependencies.gradle b/dependencies.gradle
index d468f38..1f0ba1b 100644 index 0db5725..03f925a 100644
--- a/dependencies.gradle --- a/dependencies.gradle
+++ b/dependencies.gradle +++ b/dependencies.gradle
@@ -8,8 +8,7 @@ dependencyResolutionManagement { @@ -8,8 +8,7 @@ dependencyResolutionManagement {
alias('google-libphonenumber').to('com.googlecode.libphonenumber:libphonenumber:8.12.33') alias('google-libphonenumber').to('com.googlecode.libphonenumber:libphonenumber:8.12.33')
// 1st Party // 1st Party
- alias('signal-client-java').to('org.whispersystems', 'signal-client-java').versionRef('signal-client') - alias('libsignal-client').to('org.signal', 'libsignal-client').versionRef('libsignal-client')
- alias('signal-client-android').to('org.whispersystems', 'signal-client-android').versionRef('signal-client') - alias('libsignal-android').to('org.signal', 'libsignal-android').versionRef('libsignal-client')
+ alias('signal-client-java').to('org.signald', 'signal-client-java-' + System.getenv("TARGET")).versionRef('signal-client') + alias('libsignal-client').to('org.signald', 'libsignal-client-' + System.getenv("TARGET")).versionRef('libsignal-client')
// Third Party // Third Party
alias('jackson-core').to('com.fasterxml.jackson.core:jackson-databind:2.13.0') 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 diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 261b8e2..fb92055 100644 index 83ef67a..261b9bd 100644
--- a/gradle/verification-metadata.xml --- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml
@@ -482,6 +482,9 @@ @@ -482,6 +482,9 @@
@ -83,38 +76,26 @@ index 261b8e2..fb92055 100644
</component> </component>
<component group="com.google.testing.platform" name="core-proto" version="0.0.8-alpha04"> <component group="com.google.testing.platform" name="core-proto" version="0.0.8-alpha04">
<artifact name="core-proto-0.0.8-alpha04.jar"> <artifact name="core-proto-0.0.8-alpha04.jar">
@@ -1130,6 +1133,14 @@ @@ -1133,12 +1136,12 @@
<sha256 value="2c2a264f842498c36d34d2a7b91342490d9a962862c85baac1acd54ec2fca6d9" origin="Generated by Gradle"/> <sha256 value="e0ad9cb0073a699fce187d527bb1d423a9082fb7a2f75e1fbf89fef6fb880cec" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
+ <component group="org.signald" name="signal-client-java-{TARGET}" version="0.14.0"> - <component group="org.signal" name="libsignal-client" version="0.15.0">
+ <artifact name="signal-client-java-{TARGET}-0.14.0.jar"> - <artifact name="libsignal-client-0.15.0.jar">
- <sha256 value="dfbd132106ef6dbd4355043355a47132874bccbf0d42c85350686013084b953c" origin="Generated by Gradle"/>
+ <component group="org.signald" name="libsignal-client-{TARGET}" version="0.15.0">
+ <artifact name="libsignal-client-{TARGET}-0.15.0.jar">
+ <sha256 value="{TARGET_JAR_SHA256}" origin="Generated by Gradle"/> + <sha256 value="{TARGET_JAR_SHA256}" origin="Generated by Gradle"/>
+ </artifact> </artifact>
+ <artifact name="signal-client-java-{TARGET}-0.14.0.module"> - <artifact name="libsignal-client-0.15.0.module">
- <sha256 value="76625d04c538f791275cb34870ed7805c09fb3a6f3deb3a256e13a48ef440fde" origin="Generated by Gradle"/>
+ <artifact name="libsignal-client-{TARGET}-0.15.0.module">
+ <sha256 value="{TARGET_MODULE_SHA256}" origin="Generated by Gradle"/> + <sha256 value="{TARGET_MODULE_SHA256}" origin="Generated by Gradle"/>
+ </artifact>
+ </component>
<component group="org.testng" name="testng" version="7.3.0">
<artifact name="testng-7.3.0.jar">
<sha256 value="63727488f9717d57f0d0a0fee5a1fc10a2be9cfcff2ec3a7187656d663c0774e" origin="Generated by Gradle"/>
@@ -1148,14 +1159,6 @@
<sha256 value="ebcdde2d03c677dbefd612819b8cf477cbb35872f1d59d4ab61bda3d56a9c87f" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
- <component group="org.whispersystems" name="signal-client-java" version="0.14.0"> <component group="org.tensorflow" name="tensorflow-lite-metadata" version="0.1.0-rc2">
- <artifact name="signal-client-java-0.14.0.jar">
- <sha256 value="c9e98d95d427caac518ad9ae0300502ae76cc228def2dd2ada0c23f52b8dfed6" origin="Generated by Gradle"/>
- </artifact>
- <artifact name="signal-client-java-0.14.0.module">
- <sha256 value="9f0b7ab60329b9049c19f6f762a3e603df287662247a2317f7dea657ff749b2f" origin="Generated by Gradle"/>
- </artifact>
- </component>
<component group="xerces" name="xercesImpl" version="2.12.0">
<artifact name="xercesImpl-2.12.0.jar">
<sha256 value="b50d3a4ca502faa4d1c838acb8aa9480446953421f7327e338c5dda3da5e76d0" origin="Generated by Gradle"/>
diff --git a/service/build.gradle b/service/build.gradle diff --git a/service/build.gradle b/service/build.gradle
index db7d2eb..8e6d0d1 100644 index ae4df43..1daadf5 100644
--- a/service/build.gradle --- a/service/build.gradle
+++ b/service/build.gradle +++ b/service/build.gradle
@@ -21,6 +21,7 @@ compileJava { @@ -21,6 +21,7 @@ compileJava {

4
update-hashes.py
View file

@ -3,7 +3,7 @@ import requests
import hashlib import hashlib
import json import json
VERSION = "0.14.0" VERSION = "0.15.0"
TARGETS = [ TARGETS = [
"aarch64-unknown-linux-gnu", "aarch64-unknown-linux-gnu",
"arm-unknown-linux-gnueabi", "arm-unknown-linux-gnueabi",
@ -13,7 +13,7 @@ TARGETS = [
"x86_64-apple-darwin" "x86_64-apple-darwin"
] ]
urlFormat = "https://gitlab.com/api/v4/groups/6853927/-/packages/maven/org/signald/signal-client-java-{target}/{version}/signal-client-java-{target}-{version}.{ext}" urlFormat = "https://gitlab.com/api/v4/groups/6853927/-/packages/maven/org/signald/libsignal-client-{target}/{version}/libsignal-client-{target}-{version}.{ext}"
output = {} output = {}
for target in TARGETS: for target in TARGETS: