From e1382092d33615ad457087915214b918c48d80b6 Mon Sep 17 00:00:00 2001 From: finn Date: Thu, 16 Jun 2022 13:08:44 -0700 Subject: [PATCH] update to unofficial_50 --- .gitlab-ci.yml | 2 +- hashes.json | 24 +++++++------- libsignal-service-java.patch | 64 +++++++++++++++++------------------- update-hashes.py | 2 +- 4 files changed, 45 insertions(+), 47 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 24c4597..cd80581 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ stages: - build variables: - version: "v2.15.3_unofficial_47" + version: "v2.15.3_unofficial_50" GRADLE_OPTS: -Dorg.gradle.daemon=false build: diff --git a/hashes.json b/hashes.json index f6200cd..5fed677 100644 --- a/hashes.json +++ b/hashes.json @@ -1,26 +1,26 @@ { "aarch64-unknown-linux-gnu": { - "jar": "0f2573702f17f2390bbe084687e9caff7a8526c519a27d58066dd493cd9378da", - "module": "bb56193d9d64102e24047e067a35d13b813bc39d715dad92ebe474a78177a4af" + "jar": "23fff858bf4bcc5c54025985e7ebfff4ef962b8fbc53d6b40643859fee7baebc", + "module": "8ce69b13baa2e55f18d8697eaac3b31bb368757e69db253368837efcb1336efc" }, "arm-unknown-linux-gnueabi": { - "jar": "048f8562c03906fdc4e45651272c00ee0a1821f2e5fa9cb4e05a6a360df176a6", - "module": "71a4bbbd0678d2fdf43adae7763a03dc02ad01a0947c2960c72219079a3872e6" + "jar": "fa434c0eb0382d760daf0dfa33d7608165a163a7ef7ba5d032fbaa0ed702a0e0", + "module": "92192e932f76f916b768450c564a939e419c32bf3498dd41d7f940cc1a91ef88" }, "arm-unknown-linux-gnueabihf": { - "jar": "afdd3a2728b84e5ea594009680ec9fa888a06a56bf055ccc460735a74f6b1cb6", - "module": "0b87fbf1de3d5d7889109e3bd62a807b3f98bdb1f295a469b6eb71114d561db2" + "jar": "c533bb67e0f5ecb1c26c2e271a5bb172523336bdfa38bcea11d8d34ec5c8d709", + "module": "299801969962e677348894b4bd9d7efc1faea342824d09846c69f239adf8a48a" }, "armv7-unknown-linux-gnueabihf": { - "jar": "11801051a1bafb9c8e01b94fb3333177fe601e82d81f5a7b0f910b95c4167cb1", - "module": "91be468f808b1a615b6ea648fc9e2d2a7698c646c1b1544a971909e7a8558774" + "jar": "34396d42050b5f8d7ed8da65d14903c47ddc8a0730e8153828cd87e2353a23e0", + "module": "7d48dae9a26b9ffc218211407d54849d24b79a774eacd5d066e71b63d88f09ba" }, "x86_64-unknown-linux-gnu": { - "jar": "22b55eccaae34c001cb0ad4101e76de5405819a6e1fe20ef9d0dfc5d333f6af4", - "module": "f6cc6f132c64376c9a4687716a9a41022aae3a5ce2d14fb95a31214c2a165c0e" + "jar": "f4938212a9be733cd6fbfe1910b5fcc7b3a0e75e7065f8c8e1abf09c69f28a60", + "module": "a98dea88331ad9861f3b3b0a99f93e5fdab04b41784e74234abca9bebf63ad77" }, "x86_64-apple-darwin": { - "jar": "0500c7ea64610754cef7edc65e7a1fbdb8fa325a74375c5c8c3deeed24d7f4c9", - "module": "710596dc3f7f08b756586a8827d9be4778817a23c8f617c3f14ce11f67f2ed2a" + "jar": "690745c6d40bbddbe1632c52942746428eafa6fdc02423f7c3d1d7ced5267777", + "module": "d561f31ef5d232245d6f5f717264c6b44f7cffcd37b8c58ac65b276ff5257215" } } \ No newline at end of file diff --git a/libsignal-service-java.patch b/libsignal-service-java.patch index 7e51233..fdbc2fe 100644 --- a/libsignal-service-java.patch +++ b/libsignal-service-java.patch @@ -1,34 +1,34 @@ -From 27eab116fdf0375d27c90584cd1250a6040b3c3e Mon Sep 17 00:00:00 2001 -From: nobody -Date: Tue, 26 Apr 2022 17:25:06 -0700 -Subject: [PATCH] update gradle files +From dfcc82ab4b4f4d3c18e210ba724ce761deaa6e91 Mon Sep 17 00:00:00 2001 +From: signald +Date: Thu, 16 Jun 2022 13:04:00 -0700 +Subject: [PATCH] update build files --- - build.gradle | 17 ++--------------- + build.gradle | 15 ++------------- dependencies.gradle | 3 +-- - gradle/verification-metadata.xml | 15 +++++++++------ + gradle/verification-metadata.xml | 13 ++++++++----- service/build.gradle | 19 +++++++++---------- - settings.gradle | 2 -- - 5 files changed, 21 insertions(+), 35 deletions(-) + settings.gradle | 1 - + 5 files changed, 20 insertions(+), 31 deletions(-) diff --git a/build.gradle b/build.gradle -index 638912f..dbbfce9 100644 +index 2498bfcb..9a69ac82 100644 --- a/build.gradle +++ b/build.gradle -@@ -9,11 +9,7 @@ buildscript { +@@ -9,11 +9,8 @@ buildscript { } } -plugins { - id("io.github.gradle-nexus.publish-plugin") version "1.1.0" -} -- + -project.group = "com.github.turasa" +project.group = "org.signald" def getRepositoryUsername() { return hasProperty('whisperSonatypeUsername') ? whisperSonatypeUsername : "" -@@ -23,18 +19,9 @@ def getRepositoryPassword() { +@@ -23,18 +20,10 @@ def getRepositoryPassword() { return hasProperty('whisperSonatypePassword') ? whisperSonatypePassword : "" } @@ -40,20 +40,20 @@ index 638912f..dbbfce9 100644 - } - } -} -- + subprojects { - ext.lib_signal_service_version_number = "2.15.3_unofficial_47" + ext.lib_signal_service_version_number = "2.15.3_unofficial_50" - 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 0db5725..03f925a 100644 +index e4b9f8a8..20e0d2f2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -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.48') // 1st Party - alias('libsignal-client').to('org.signal', 'libsignal-client').versionRef('libsignal-client') @@ -63,7 +63,7 @@ index 0db5725..03f925a 100644 // 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 83ef67a..eedf52e 100644 +index fc39d024..59fde59c 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -482,6 +482,9 @@ @@ -77,26 +77,25 @@ index 83ef67a..eedf52e 100644 @@ -1133,12 +1136,12 @@ - + -- -- -- -- -- -- -+ -+ +- +- +- ++ ++ + -+ -+ + +- +- ++ + diff --git a/service/build.gradle b/service/build.gradle -index ae4df43..4b0240d 100644 +index ae4df43a..4b0240d8 100644 --- a/service/build.gradle +++ b/service/build.gradle @@ -21,6 +21,7 @@ compileJava { @@ -141,17 +140,16 @@ index ae4df43..4b0240d 100644 - sign publishing.publications.mavenJava -} diff --git a/settings.gradle b/settings.gradle -index 8861c00..4048aab 100644 +index 8861c008..8dd03423 100644 --- a/settings.gradle +++ b/settings.gradle -@@ -1,7 +1,5 @@ +@@ -1,6 +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 40cdcf4..0c4ff14 100644 --- a/update-hashes.py +++ b/update-hashes.py @@ -3,7 +3,7 @@ import requests import hashlib import json -VERSION = "0.15.0" +VERSION = "0.17.0" TARGETS = [ "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabi",