From 41951d0a43ef740290906156b7362ac5e8d12601 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 | 75 ++++++++++++++---------------------- update-hashes.py | 4 +- 4 files changed, 43 insertions(+), 62 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..f6200cd 100644 --- a/hashes.json +++ b/hashes.json @@ -1,26 +1,26 @@ { "aarch64-unknown-linux-gnu": { - "jar": "b0658de8e4b512fcae3962efeb1143ebab0f8e5fa1560f4f795443cbf73d8e0e", - "module": "d9e8813cc82bc846674cfcb5d71867c756d6d61688c7cbdb391bc62662beceee" + "jar": "0f2573702f17f2390bbe084687e9caff7a8526c519a27d58066dd493cd9378da", + "module": "bb56193d9d64102e24047e067a35d13b813bc39d715dad92ebe474a78177a4af" }, "arm-unknown-linux-gnueabi": { - "jar": "3a76b4c2708aad46b4b1f179d3e586fee966251161afbd24004ee7f1eba95238", - "module": "8cfba809664dac88dc95abbb7debb42a3cd98765839fb7f2c2264108c2cc2fd8" + "jar": "048f8562c03906fdc4e45651272c00ee0a1821f2e5fa9cb4e05a6a360df176a6", + "module": "71a4bbbd0678d2fdf43adae7763a03dc02ad01a0947c2960c72219079a3872e6" }, "arm-unknown-linux-gnueabihf": { - "jar": "850834c2ec967d2026356361b3dbf0bdd30bd3bc683eb4b5547d7bd29d92a15c", - "module": "f2d9ce5cdcb975077f0753d2ff1ff7bb2132cbd908e2fc07f56f64733414ae69" + "jar": "afdd3a2728b84e5ea594009680ec9fa888a06a56bf055ccc460735a74f6b1cb6", + "module": "0b87fbf1de3d5d7889109e3bd62a807b3f98bdb1f295a469b6eb71114d561db2" }, "armv7-unknown-linux-gnueabihf": { - "jar": "04e56a800ae0117e15f2363ec43650f2a1f1d44a98bf5f8fb90ead97aad139d8", - "module": "fb3e883221de56d39494694f368280a9cc5e828e95b9b9d19d70142ab405cfb0" + "jar": "11801051a1bafb9c8e01b94fb3333177fe601e82d81f5a7b0f910b95c4167cb1", + "module": "91be468f808b1a615b6ea648fc9e2d2a7698c646c1b1544a971909e7a8558774" }, "x86_64-unknown-linux-gnu": { - "jar": "dc16547f2fb4303bb9f0771c3a7bc70cf59a472e899d206c348b631298e3baa4", - "module": "5b97d734a7248ebf493e2519867aeb3b0ec58b627c42798845bcf073cbe75305" + "jar": "22b55eccaae34c001cb0ad4101e76de5405819a6e1fe20ef9d0dfc5d333f6af4", + "module": "f6cc6f132c64376c9a4687716a9a41022aae3a5ce2d14fb95a31214c2a165c0e" }, "x86_64-apple-darwin": { - "jar": "0b5892636edf693695bb7f81bf739f5d50cb1830a6d5b93948bc402874bd6c87", - "module": "954fa3ffb650b5d90aa5710193d1c747224450a23ea72594c1be4aa0067693e2" + "jar": "0500c7ea64610754cef7edc65e7a1fbdb8fa325a74375c5c8c3deeed24d7f4c9", + "module": "710596dc3f7f08b756586a8827d9be4778817a23c8f617c3f14ce11f67f2ed2a" } } \ No newline at end of file diff --git a/libsignal-service-java.patch b/libsignal-service-java.patch index 8713b57..9367357 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 a51d016e173cf5f656028c921670efffcae9087e 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 | 13 ++++++++----- service/build.gradle | 21 ++++++++++----------- 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 -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..03f925a 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.signald', '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..261b9bd 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -482,6 +482,9 @@ @@ -83,38 +76,26 @@ index 261b8e2..fb92055 100644 -@@ -1130,6 +1133,14 @@ - +@@ -1133,12 +1136,12 @@ + -+ -+ +- +- +- ++ ++ + -+ -+ + +- +- ++ + -+ -+ - - - -@@ -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: