From bdabceac8d8cac7b55f42dd745cda7359cfa5131 Mon Sep 17 00:00:00 2001 From: finn Date: Wed, 6 Apr 2022 11:45:49 -0700 Subject: [PATCH] update to unofficial_46 --- .gitlab-ci.yml | 2 +- hashes.json | 24 +++++++------- libsignal-service-java.patch | 62 ++++++++++++------------------------ update-hashes.py | 4 +-- 4 files changed, 35 insertions(+), 57 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6eaf3a..d97d652 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ stages: - build variables: - version: "v2.15.3_unofficial_45" + version: "v2.15.3_unofficial_46" GRADLE_OPTS: -Dorg.gradle.daemon=false build: diff --git a/hashes.json b/hashes.json index f4f3eac..f5f4740 100644 --- a/hashes.json +++ b/hashes.json @@ -1,26 +1,26 @@ { "aarch64-unknown-linux-gnu": { - "jar": "b0658de8e4b512fcae3962efeb1143ebab0f8e5fa1560f4f795443cbf73d8e0e", - "module": "d9e8813cc82bc846674cfcb5d71867c756d6d61688c7cbdb391bc62662beceee" + "jar": "4f1a9dacf4efd58a9516aa5d503e996b1e67aa9533576007f70ee3109995681f", + "module": "53f7ebb82f271181ca4ae89c427de9bf45db26d5eb765fa9d6d7e0b9fd63feb5" }, "arm-unknown-linux-gnueabi": { - "jar": "3a76b4c2708aad46b4b1f179d3e586fee966251161afbd24004ee7f1eba95238", - "module": "8cfba809664dac88dc95abbb7debb42a3cd98765839fb7f2c2264108c2cc2fd8" + "jar": "92e39cb9c5498d94775410134ff7b35bbe6e15b4fcfbd2923cb74724f30caf58", + "module": "0c1360bdd227f37574fc35090e04bd390ea08903d00db015b92068ec0d20617e" }, "arm-unknown-linux-gnueabihf": { - "jar": "850834c2ec967d2026356361b3dbf0bdd30bd3bc683eb4b5547d7bd29d92a15c", - "module": "f2d9ce5cdcb975077f0753d2ff1ff7bb2132cbd908e2fc07f56f64733414ae69" + "jar": "59ddb2ecd326034d4ed4ae4948863e7ee65d697ae6453700856cc82c6552550a", + "module": "7d2eb90f46ec957c5d7f6858b7b5620c23d8f347b3dd7bffa361fd12e7faacea" }, "armv7-unknown-linux-gnueabihf": { - "jar": "04e56a800ae0117e15f2363ec43650f2a1f1d44a98bf5f8fb90ead97aad139d8", - "module": "fb3e883221de56d39494694f368280a9cc5e828e95b9b9d19d70142ab405cfb0" + "jar": "f369ad62ce457022516b67e2583681825d67f1e0b8f6ff7c1d911ad4cfd84a3c", + "module": "6d0013904c4d24ce22472b13abd9c34a17580ab56b353e9b857918f33f30cb86" }, "x86_64-unknown-linux-gnu": { - "jar": "dc16547f2fb4303bb9f0771c3a7bc70cf59a472e899d206c348b631298e3baa4", - "module": "5b97d734a7248ebf493e2519867aeb3b0ec58b627c42798845bcf073cbe75305" + "jar": "5e3065bcb2d9e37362eda546a5fb604d6e38c68f28cf999be9af5448d3af20ee", + "module": "79ac1607b59ec0e3b31d46dcb4f06c7cd2ed5dac527002c83dfe34602ed80837" }, "x86_64-apple-darwin": { - "jar": "0b5892636edf693695bb7f81bf739f5d50cb1830a6d5b93948bc402874bd6c87", - "module": "954fa3ffb650b5d90aa5710193d1c747224450a23ea72594c1be4aa0067693e2" + "jar": "25667e179ccec6008aeafa22c5e3f5c7f4876aff5bf684afb9312bebba3352ab", + "module": "2049445c02b840073cbf7a8433de0fea92138df369b94d0824aa77957c1cdd7f" } } \ No newline at end of file diff --git a/libsignal-service-java.patch b/libsignal-service-java.patch index 8713b57..ebd7090 100644 --- a/libsignal-service-java.patch +++ b/libsignal-service-java.patch @@ -1,28 +1,21 @@ -From f43d826dc39e172db303aab5c0db73d11a43a6d2 Mon Sep 17 00:00:00 2001 +From 1d389bc9c1a81b4b3e1cc9a4ac1749c75c30d056 Mon Sep 17 00:00:00 2001 From: signald -Date: Mon, 21 Mar 2022 18:40:29 -0700 +Date: Wed, 6 Apr 2022 11:44:36 -0700 Subject: [PATCH] update gradle files --- - build.gradle | 18 +++--------------- + build.gradle | 16 ++-------------- dependencies.gradle | 3 +-- - gradle/verification-metadata.xml | 19 +++++++++++-------- + gradle/verification-metadata.xml | 11 +++++++++++ service/build.gradle | 21 ++++++++++----------- settings.gradle | 1 - - 5 files changed, 25 insertions(+), 37 deletions(-) + 5 files changed, 24 insertions(+), 28 deletions(-) diff --git a/build.gradle b/build.gradle -index 7b6a436..6641bb0 100644 +index d00de49..ac78820 100644 --- a/build.gradle +++ b/build.gradle -@@ -1,5 +1,6 @@ - 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 { +@@ -9,11 +9,7 @@ buildscript { } } @@ -35,7 +28,7 @@ index 7b6a436..6641bb0 100644 def getRepositoryUsername() { return hasProperty('whisperSonatypeUsername') ? whisperSonatypeUsername : "" -@@ -23,18 +20,9 @@ def getRepositoryPassword() { +@@ -23,18 +19,10 @@ def getRepositoryPassword() { return hasProperty('whisperSonatypePassword') ? whisperSonatypePassword : "" } @@ -47,30 +40,30 @@ index 7b6a436..6641bb0 100644 - } - } -} -- + 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 = "org.signald" if (JavaVersion.current().isJava8Compatible()) { allprojects { diff --git a/dependencies.gradle b/dependencies.gradle -index d468f38..1f0ba1b 100644 +index 0db5725..0ed2b63 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -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-android').to('org.whispersystems', 'signal-client-android').versionRef('signal-client') -+ alias('signal-client-java').to('org.signald', 'signal-client-java-' + System.getenv("TARGET")).versionRef('signal-client') +- alias('libsignal-client').to('org.signal', 'libsignal-client').versionRef('libsignal-client') +- alias('libsignal-android').to('org.signal', 'libsignal-android').versionRef('libsignal-client') ++ alias('libsignal-client').to('org.signal', 'libsignal-client-' + System.getenv("TARGET")).versionRef('libsignal-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 261b8e2..fb92055 100644 +index 83ef67a..b578e39 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -482,6 +482,9 @@ @@ -83,38 +76,23 @@ index 261b8e2..fb92055 100644 -@@ -1130,6 +1133,14 @@ +@@ -1146,6 +1149,14 @@ -+ -+ ++ ++ + + -+ ++ + + + -@@ -1148,14 +1159,6 @@ - - - -- -- -- -- -- -- -- -- - - - diff --git a/service/build.gradle b/service/build.gradle -index db7d2eb..8e6d0d1 100644 +index ae4df43..1daadf5 100644 --- a/service/build.gradle +++ b/service/build.gradle @@ -21,6 +21,7 @@ compileJava { diff --git a/update-hashes.py b/update-hashes.py index eb0565a..40cdcf4 100644 --- a/update-hashes.py +++ b/update-hashes.py @@ -3,7 +3,7 @@ import requests import hashlib import json -VERSION = "0.14.0" +VERSION = "0.15.0" 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/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 = {} for target in TARGETS: