From 5a8b822e087f15fac8d21cfd0b51d0fa07d57a1e Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Wed, 17 Nov 2021 09:46:49 -0300 Subject: [PATCH] Upgrade Tor to 0.3.5.17 --- bramble-android/build.gradle | 4 ++-- bramble-android/witness.gradle | 2 +- bramble-java/build.gradle | 4 ++-- bramble-java/witness.gradle | 2 +- build.gradle | 10 +++++++--- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/bramble-android/build.gradle b/bramble-android/build.gradle index 1dcbf7823..b57e64315 100644 --- a/bramble-android/build.gradle +++ b/bramble-android/build.gradle @@ -42,8 +42,8 @@ configurations { dependencies { implementation project(path: ':bramble-core', configuration: 'default') - tor 'org.briarproject:tor-android:0.3.5.15' - tor 'org.briarproject:obfs4proxy-android:0.0.12-dev-40245c4a@zip' + tor "org.briarproject:tor-android:$tor_version" + tor "org.briarproject:obfs4proxy-android:$obfs4proxy_version@zip" annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" diff --git a/bramble-android/witness.gradle b/bramble-android/witness.gradle index 0c11e0733..f5fe15402 100644 --- a/bramble-android/witness.gradle +++ b/bramble-android/witness.gradle @@ -77,7 +77,7 @@ dependencyVerification { 'org.bouncycastle:bcpkix-jdk15on:1.56:bcpkix-jdk15on-1.56.jar:7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca', 'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349', 'org.briarproject:obfs4proxy-android:0.0.12-dev-40245c4a:obfs4proxy-android-0.0.12-dev-40245c4a.zip:8ab05a8f8391be2cb5ab2b665c281a06d9e3a756bd0f95a40a36ca927866ea82', - 'org.briarproject:tor-android:0.3.5.15:tor-android-0.3.5.15.jar:560c5070166300b396cb2f28d82d9f639ee1fb5479096a3cef67da56d39937ad', + 'org.briarproject:tor-android:0.3.5.17:tor-android-0.3.5.17.jar:1888afc10a26b93d00a010ea27bf0b1b162a6d524688b08b98d70d14dc363b54', 'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d', 'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a', 'org.checkerframework:checker-qual:2.8.1:checker-qual-2.8.1.jar:9103499008bcecd4e948da29b17864abb64304e15706444ae209d17ebe0575df', diff --git a/bramble-java/build.gradle b/bramble-java/build.gradle index ca1ee1eab..f6aeffb92 100644 --- a/bramble-java/build.gradle +++ b/bramble-java/build.gradle @@ -17,8 +17,8 @@ dependencies { def jna_version = '4.5.2' implementation "net.java.dev.jna:jna:$jna_version" implementation "net.java.dev.jna:jna-platform:$jna_version" - tor 'org.briarproject:tor:0.3.5.15' - tor 'org.briarproject:obfs4proxy:0.0.12-dev-40245c4a@zip' + tor "org.briarproject:tor:$tor_version" + tor "org.briarproject:obfs4proxy:$obfs4proxy_version@zip" annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" diff --git a/bramble-java/witness.gradle b/bramble-java/witness.gradle index ea58c89bf..55f5a3cc1 100644 --- a/bramble-java/witness.gradle +++ b/bramble-java/witness.gradle @@ -25,7 +25,7 @@ dependencyVerification { 'net.ltgt.gradle.incap:incap:0.2:incap-0.2.jar:b625b9806b0f1e4bc7a2e3457119488de3cd57ea20feedd513db070a573a4ffd', 'org.apache-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047', 'org.briarproject:obfs4proxy:0.0.12-dev-40245c4a:obfs4proxy-0.0.12-dev-40245c4a.zip:172029e7058b3a83ac93ac4991a44bf76e16ce8d46f558f5836d57da3cb3a766', - 'org.briarproject:tor:0.3.5.15:tor-0.3.5.15.jar:2ff5b5a3b5eaa97d699629ad24ba9584b3199d0ffdb1ea7d8a02de3016b80e7a', + 'org.briarproject:tor:0.3.5.17:tor-0.3.5.17.jar:ce0e1f4d8f14878e61b23a35a452bc0f2a8e3117ced5a74773cd78475fa7af39', 'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d', 'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a', 'org.codehaus.mojo:animal-sniffer-annotations:1.17:animal-sniffer-annotations-1.17.jar:92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53', diff --git a/build.gradle b/build.gradle index 840ff1ada..a4bb09354 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,11 @@ buildscript { classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.3' classpath files('libs/gradle-witness.jar') } - ext.dagger_version = "2.33" - ext.junit_version = "4.13.2" - ext.jmock_version = '2.12.0' + ext { + dagger_version = "2.33" + tor_version = "0.3.5.17" + obfs4proxy_version = "0.0.12-dev-40245c4a" + junit_version = "4.13.2" + jmock_version = '2.12.0' + } }