Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'upgrade-tor-lyrebird-onionwrapper' into 'master'

Browse Source 
Tor 0.4.8.14, Lyrebird 0.5.0-3, Onionwrapper 0.1.3

See merge request briar/briar!1839
This commit is contained in:
Torsten Grote
2025-02-13 12:44:07 +00:00
parent 292808dbfc a3f1ce6d87
commit 1e74b213e3
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bramble-android/witness.gradle
View File

@@ -25,11 +25,11 @@ dependencyVerification {
'org.apache-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047',
'org.briarproject:dont-kill-me-lib:0.2.8:dont-kill-me-lib-0.2.8.aar:e21173e480ee3f2364c142cc14db8dc6447be91bde9e62e4985c485ea0af9126',
'org.briarproject:jtorctl:0.5:jtorctl-0.5.jar:43f8c7d390169772b9a2c82ab806c8414c136a2a8636c555e22754bb7260793b',
'org.briarproject:lyrebird-android:0.5.0-2:lyrebird-android-0.5.0-2.jar:5ca2bd723c9eea692cab39ef70272407610b8dc359d267a3486e2f9d3a65d88b',
'org.briarproject:lyrebird-android:0.5.0-3:lyrebird-android-0.5.0-3.jar:67e21cbbfda0b17ab9e0741ada170c606ddda4e9548a70c421aa83b907ebb714',
'org.briarproject:null-safety:0.1:null-safety-0.1.jar:161760de5e838cb982bafa973df820675d4397098e9a91637a36a306d43ba011',
'org.briarproject:onionwrapper-android:0.1.2:onionwrapper-android-0.1.2.aar:15231f0b2ad44df8eb1dd362a989ba3f88ebdc9b02a9128daa72a8da83651bf0',
'org.briarproject:onionwrapper-core:0.1.2:onionwrapper-core-0.1.2.jar:65620cb183d6c392aec21f2e822a499329f89933e2235f7084eaf93ee2d36257',
'org.briarproject:tor-android:0.4.8.13:tor-android-0.4.8.13.jar:056fee77e7c6f1b60bc61234a882e53ee140ad4c4680015eec570f8d29a3430f',
'org.briarproject:onionwrapper-android:0.1.3:onionwrapper-android-0.1.3.aar:15231f0b2ad44df8eb1dd362a989ba3f88ebdc9b02a9128daa72a8da83651bf0',
'org.briarproject:onionwrapper-core:0.1.3:onionwrapper-core-0.1.3.jar:32d08c9d81a9591e08d7e64e3569334fee21f503b00514006f2e6cbbd409d0df',
'org.briarproject:tor-android:0.4.8.14:tor-android-0.4.8.14.jar:fc7c4f5007a98132ba84534a873f101951d2d554d5da5f2031b85c277f8617a6',
'org.checkerframework:checker-compat-qual:2.5.5:checker-compat-qual-2.5.5.jar:11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a',
'org.checkerframework:checker-qual:3.41.0:checker-qual-3.41.0.jar:2f9f245bf68e4259d610894f2406dc1f6363dc639302bd566e8272e4f4541172',
'org.hamcrest:hamcrest-core:2.1:hamcrest-core-2.1.jar:e09109e54a289d88506b9bfec987ddd199f4217c9464132668351b9a4f00bee9',

2
bramble-core/witness.gradle
View File

@@ -34,7 +34,7 @@ dependencyVerification {
'org.bouncycastle:bcprov-jdk15to18:1.71:bcprov-jdk15to18-1.71.jar:143aaa4a40edd5fc2a18db7900059f6c16f4d931b94b94b20f7e2238e6662886',
'org.briarproject:jtorctl:0.5:jtorctl-0.5.jar:43f8c7d390169772b9a2c82ab806c8414c136a2a8636c555e22754bb7260793b',
'org.briarproject:null-safety:0.1:null-safety-0.1.jar:161760de5e838cb982bafa973df820675d4397098e9a91637a36a306d43ba011',
'org.briarproject:onionwrapper-core:0.1.2:onionwrapper-core-0.1.2.jar:65620cb183d6c392aec21f2e822a499329f89933e2235f7084eaf93ee2d36257',
'org.briarproject:onionwrapper-core:0.1.3:onionwrapper-core-0.1.3.jar:32d08c9d81a9591e08d7e64e3569334fee21f503b00514006f2e6cbbd409d0df',
'org.briarproject:socks-socket:0.1:socks-socket-0.1.jar:e5898822d10f5390363c5dddb945891648c92cf93ba50709e07f0d173ec0eb4b',
'org.checkerframework:checker-compat-qual:2.5.5:checker-compat-qual-2.5.5.jar:11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a',
'org.checkerframework:checker-qual:3.41.0:checker-qual-3.41.0.jar:2f9f245bf68e4259d610894f2406dc1f6363dc639302bd566e8272e4f4541172',

4
bramble-java/witness.gradle
View File

@@ -25,8 +25,8 @@ dependencyVerification {
'org.apache-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047',
'org.briarproject:jtorctl:0.5:jtorctl-0.5.jar:43f8c7d390169772b9a2c82ab806c8414c136a2a8636c555e22754bb7260793b',
'org.briarproject:null-safety:0.1:null-safety-0.1.jar:161760de5e838cb982bafa973df820675d4397098e9a91637a36a306d43ba011',
'org.briarproject:onionwrapper-core:0.1.2:onionwrapper-core-0.1.2.jar:65620cb183d6c392aec21f2e822a499329f89933e2235f7084eaf93ee2d36257',
'org.briarproject:onionwrapper-java:0.1.2:onionwrapper-java-0.1.2.jar:9cab70d6ead3528f9d2975c9bebe24c12c3bed4687d2aa0d3447694ebf747353',
'org.briarproject:onionwrapper-core:0.1.3:onionwrapper-core-0.1.3.jar:32d08c9d81a9591e08d7e64e3569334fee21f503b00514006f2e6cbbd409d0df',
'org.briarproject:onionwrapper-java:0.1.3:onionwrapper-java-0.1.3.jar:a6bc535e8ea55e567c932f23123eabd10ad53251d3a1e5648960b177e7ab209b',
'org.checkerframework:checker-compat-qual:2.5.5:checker-compat-qual-2.5.5.jar:11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a',
'org.checkerframework:checker-qual:3.41.0:checker-qual-3.41.0.jar:2f9f245bf68e4259d610894f2406dc1f6363dc639302bd566e8272e4f4541172',
'org.hamcrest:hamcrest-core:2.1:hamcrest-core-2.1.jar:e09109e54a289d88506b9bfec987ddd199f4217c9464132668351b9a4f00bee9',

16
briar-headless/witness.gradle
View File

@@ -39,15 +39,15 @@ dependencyVerification {
'org.apiguardian:apiguardian-api:1.1.0:apiguardian-api-1.1.0.jar:a9aae9ff8ae3e17a2a18f79175e82b16267c246fbbd3ca9dfbbb290b08dcfdd4',
'org.bouncycastle:bcprov-jdk15to18:1.71:bcprov-jdk15to18-1.71.jar:143aaa4a40edd5fc2a18db7900059f6c16f4d931b94b94b20f7e2238e6662886',
'org.briarproject:jtorctl:0.5:jtorctl-0.5.jar:43f8c7d390169772b9a2c82ab806c8414c136a2a8636c555e22754bb7260793b',
'org.briarproject:lyrebird-linux:0.5.0-2:lyrebird-linux-0.5.0-2.jar:8537a7b6d9cdcf880053df8b27250245f6920de4b3c54e58823edfddaf0336fc',
'org.briarproject:lyrebird-macos:0.5.0-2:lyrebird-macos-0.5.0-2.jar:a166aa9f1085cb6f5c9e3f0e7ed94d61f8331889e8848755154cdff07ded25c2',
'org.briarproject:lyrebird-windows:0.5.0-2:lyrebird-windows-0.5.0-2.jar:5ffafef98e75336b36301665b541cca894c11ea28d2b9a095562b47df6bae1f1',
'org.briarproject:lyrebird-linux:0.5.0-3:lyrebird-linux-0.5.0-3.jar:a89534474556a64c1c965a1816332a6c8bb9f2cffc0d9b533467b9e93d35804f',
'org.briarproject:lyrebird-macos:0.5.0-3:lyrebird-macos-0.5.0-3.jar:f9696261bd17c8d8b4080dca955576390376aac3a0601b3776c6da63199303a0',
'org.briarproject:lyrebird-windows:0.5.0-3:lyrebird-windows-0.5.0-3.jar:ef2fa77b00b6deeeb30ab7b261ed488cb9463ca3ab83e4cca4f7e26a30eca1b5',
'org.briarproject:null-safety:0.1:null-safety-0.1.jar:161760de5e838cb982bafa973df820675d4397098e9a91637a36a306d43ba011',
'org.briarproject:onionwrapper-core:0.1.2:onionwrapper-core-0.1.2.jar:65620cb183d6c392aec21f2e822a499329f89933e2235f7084eaf93ee2d36257',
'org.briarproject:onionwrapper-java:0.1.2:onionwrapper-java-0.1.2.jar:9cab70d6ead3528f9d2975c9bebe24c12c3bed4687d2aa0d3447694ebf747353',
'org.briarproject:tor-linux:0.4.8.13:tor-linux-0.4.8.13.jar:0b3151bfa26eb1c24ed75fa595da2e5c8c2dad11e182db39fc617c5223270ae7',
'org.briarproject:tor-macos:0.4.8.13:tor-macos-0.4.8.13.jar:e3ebf87efbc948803058e2e1222c90f8393ce895325dcc2cba1088484c28175b',
'org.briarproject:tor-windows:0.4.8.13:tor-windows-0.4.8.13.jar:d113cf976a27bef02975893db2fb981d782f21ce1995eef971b3400b81de830d',
'org.briarproject:onionwrapper-core:0.1.3:onionwrapper-core-0.1.3.jar:32d08c9d81a9591e08d7e64e3569334fee21f503b00514006f2e6cbbd409d0df',
'org.briarproject:onionwrapper-java:0.1.3:onionwrapper-java-0.1.3.jar:a6bc535e8ea55e567c932f23123eabd10ad53251d3a1e5648960b177e7ab209b',
'org.briarproject:tor-linux:0.4.8.14:tor-linux-0.4.8.14.jar:53f44e6719a01689f0980055bef5ffa3ee8148215dafab2a592ee693e9c2e335',
'org.briarproject:tor-macos:0.4.8.14:tor-macos-0.4.8.14.jar:db2a9ce7581c8d4723aa23ac13a0a2628ad37e0d638b34ff1bbf3d1cb91cdd41',
'org.briarproject:tor-windows:0.4.8.14:tor-windows-0.4.8.14.jar:3fc480854850d48f58c957242fdd3124501bd65806d54a339672ae67015f0677',
'org.checkerframework:checker-compat-qual:2.5.5:checker-compat-qual-2.5.5.jar:11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a',
'org.checkerframework:checker-qual:3.41.0:checker-qual-3.41.0.jar:2f9f245bf68e4259d610894f2406dc1f6363dc639302bd566e8272e4f4541172',
'org.eclipse.jetty.websocket:websocket-api:9.4.20.v20190813:websocket-api-9.4.20.v20190813.jar:779a29060cc17bdeeeba147efc884ebff972cfff93dad2d37b11c93f95d4f67b',

6
build.gradle
View File

@@ -29,14 +29,14 @@ buildscript {
dagger_version = "2.51.1"
okhttp_version = "4.12.0"
jackson_version = "2.13.4"
tor_version = "0.4.8.13"
lyrebird_version = "0.5.0-2"
tor_version = "0.4.8.14"
lyrebird_version = "0.5.0-3"
jsoup_version = '1.15.3'
bouncy_castle_version = '1.71' // 1.72 accidentally depends on Java 7
junit_version = "4.13.2"
jmock_version = '2.12.0'
mockwebserver_version = '4.10.0'
onionwrapper_version = '0.1.2'
onionwrapper_version = '0.1.3'
}
dependencies {
// upgrading this let's us run into https://github.com/gradle/gradle/issues/20330