diff --git a/build.gradle b/build.gradle index 3c3d95d074..8f32456451 100644 --- a/build.gradle +++ b/build.gradle @@ -71,7 +71,7 @@ configure(subprojects) { loggingVersion = '1.2' lombokVersion = '1.18.30' mockitoVersion = '5.10.0' - netlayerVersion = 'd4f9d0ce24' // Tor browser version 14.0.7 and tor binary version: 0.4.8.14 + netlayerVersion = '67ff7fc40d' // Tor browser version 14.0.7 and tor binary version: 0.4.8.14 protobufVersion = '3.19.1' protocVersion = protobufVersion pushyVersion = '0.13.2' @@ -335,10 +335,10 @@ configure(project(':p2p')) { implementation "org.fxmisc.easybind:easybind:$easybindVersion" implementation "org.slf4j:slf4j-api:$slf4jVersion" implementation "org.apache.commons:commons-lang3:$langVersion" - implementation("com.github.haveno-dex.netlayer:tor.external:$netlayerVersion") { + implementation("com.github.NorrinRadd.netlayer:tor.external:$netlayerVersion") { exclude(module: 'slf4j-api') } - implementation("com.github.haveno-dex.netlayer:tor.native:$netlayerVersion") { + implementation("com.github.NorrinRadd.netlayer:tor.native:$netlayerVersion") { exclude(module: 'slf4j-api') } implementation("com.github.bisq-network:bitcoinj:$bitcoinjVersion") { @@ -400,10 +400,10 @@ configure(project(':core')) { implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") { exclude(module: 'jackson-annotations') } - implementation("com.github.haveno-dex.netlayer:tor.native:$netlayerVersion") { + implementation("com.github.NorrinRadd.netlayer:tor.native:$netlayerVersion") { exclude(module: 'slf4j-api') } - implementation("com.github.haveno-dex.netlayer:tor.external:$netlayerVersion") { + implementation("com.github.NorrinRadd.netlayer:tor.external:$netlayerVersion") { exclude(module: 'slf4j-api') } implementation("com.github.bisq-network:bitcoinj:$bitcoinjVersion") { @@ -705,10 +705,10 @@ configure(project(':monitor')) { implementation "ch.qos.logback:logback-core:$logbackVersion" implementation "com.google.guava:guava:$guavaVersion" implementation "org.slf4j:slf4j-api:$slf4jVersion" - implementation("com.github.haveno-dex.netlayer:tor.external:$netlayerVersion") { + implementation("com.github.NorrinRadd.netlayer:tor.external:$netlayerVersion") { exclude(module: 'slf4j-api') } - implementation("com.github.haveno-dex.netlayer:tor.native:$netlayerVersion") { + implementation("com.github.NorrinRadd.netlayer:tor.native:$netlayerVersion") { exclude(module: 'slf4j-api') } implementation("com.google.inject:guice:$guiceVersion") { diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index cbfb839d9f..699cc304b2 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -205,44 +205,49 @@ <sha256 value="d4ea711258c783e0accb8feaaa204f0414781551b0159fa17e5f1869200f96f7" origin="Generated by Gradle"/> </artifact> </component> - <component group="com.github.haveno-dex.netlayer" name="tor" version="d4f9d0ce24"> - <artifact name="tor-d4f9d0ce24.jar"> - <sha256 value="58c7df7cab675ec3db4f80b456282d49e8d983676af7f053c7514fc5dfb83cee" origin="Generated by Gradle"/> + <component group="com.github.NorrinRadd.netlayer" name="tor" version="67ff7fc40d"> + <artifact name="tor-67ff7fc40d.jar"> + <sha256 value="8fc170bf667262dc2955a9f6baaffaebc5544baf19c73c6f272464692ee6b518" origin="Generated by Gradle"/> </artifact> </component> - <component group="com.github.haveno-dex.netlayer" name="tor.external" version="d4f9d0ce24"> - <artifact name="tor.external-d4f9d0ce24.jar"> - <sha256 value="1231429367e83f7c7536cf6febd4df2e95fec81a776f199791d5b9790aa1d25e" origin="Generated by Gradle"/> + <component group="com.github.NorrinRadd.netlayer" name="tor.external" version="67ff7fc40d"> + <artifact name="tor.external-67ff7fc40d.jar"> + <sha256 value="9ce4e0349e805dd1afb023cd14150101c87063c4bbb21c726d5c58db0d357230" origin="Generated by Gradle"/> </artifact> </component> - <component group="com.github.haveno-dex.netlayer" name="tor.native" version="d4f9d0ce24"> - <artifact name="tor.native-d4f9d0ce24.jar"> - <sha256 value="5d83e8fb429e0fe79df55b220731567b9290f84bd2f1ee03b2a194284290e052" origin="Generated by Gradle"/> + <component group="com.github.NorrinRadd.netlayer" name="tor.native" version="67ff7fc40d"> + <artifact name="tor.native-67ff7fc40d.jar"> + <sha256 value="cd61d50a4d5284098f22e0875f6d78a15e7ce49a19d8c1d51e75efb6b057ac22" origin="Generated by Gradle"/> </artifact> </component> - <component group="com.github.haveno-dex.tor-binary" name="tor-binary-geoip" version="462c44c157cbf0b7574b7ab14d0bf231df770a63"> - <artifact name="tor-binary-geoip-462c44c157cbf0b7574b7ab14d0bf231df770a63.jar"> - <sha256 value="af2c7a517d45c7640f11c28fa5987201ddcb4ea139ef4d56fbcff17336a83289" origin="Generated by Gradle"/> + <component group="com.github.NorrinRadd.tor-binary" name="tor-binary-geoip" version="d685466474286feb78e736276c3673372334aa37"> + <artifact name="tor-binary-geoip-d685466474286feb78e736276c3673372334aa37.jar"> + <sha256 value="e60750128458e4a6e0f8529fb9fc38459fdf93592d2484cafb1ec969bb824492" origin="Generated by Gradle"/> </artifact> </component> - <component group="com.github.haveno-dex.tor-binary" name="tor-binary-linux32" version="462c44c157cbf0b7574b7ab14d0bf231df770a63"> - <artifact name="tor-binary-linux32-462c44c157cbf0b7574b7ab14d0bf231df770a63.jar"> - <sha256 value="6ee4cb8f9cd33bb255fa0e9991e9be49338f574999270434a4499b4554e5e714" origin="Generated by Gradle"/> + <component group="com.github.NorrinRadd.tor-binary" name="tor-binary-linux32" version="d685466474286feb78e736276c3673372334aa37"> + <artifact name="tor-binary-linux32-d685466474286feb78e736276c3673372334aa37.jar"> + <sha256 value="172731fb8adb5e80928b543ed547c5fd528882ee75586c75f40fa14ea79fea91" origin="Generated by Gradle"/> </artifact> </component> - <component group="com.github.haveno-dex.tor-binary" name="tor-binary-linux64" version="462c44c157cbf0b7574b7ab14d0bf231df770a63"> - <artifact name="tor-binary-linux64-462c44c157cbf0b7574b7ab14d0bf231df770a63.jar"> - <sha256 value="7da86fc024976ab46b6e92f4f5c0046b7df1f800cd09f297232698b1a6b7f961" origin="Generated by Gradle"/> + <component group="com.github.NorrinRadd.tor-binary" name="tor-binary-linux64" version="d685466474286feb78e736276c3673372334aa37"> + <artifact name="tor-binary-linux64-d685466474286feb78e736276c3673372334aa37.jar"> + <sha256 value="74d4ff807a1afc8b6219f529950768d7ded5ad492197a3858b04ca05712dda3d" origin="Generated by Gradle"/> </artifact> </component> - <component group="com.github.haveno-dex.tor-binary" name="tor-binary-macos" version="462c44c157cbf0b7574b7ab14d0bf231df770a63"> - <artifact name="tor-binary-macos-462c44c157cbf0b7574b7ab14d0bf231df770a63.jar"> - <sha256 value="f1cd51f9acf7562190fc1ea327325116fcd006f98e16eaef279554f20cca86c3" origin="Generated by Gradle"/> + <component group="com.github.NorrinRadd.tor-binary" name="tor-binary-linuxaarch64" version="d685466474286feb78e736276c3673372334aa37"> + <artifact name="tor-binary-linuxaarch64-d685466474286feb78e736276c3673372334aa37.jar"> + <sha256 value="b4f6ab73b1dac32fb9e230d684957c2f94ca4a4bc549916635d71ca8d638adb5" origin="Generated by Gradle"/> </artifact> </component> - <component group="com.github.haveno-dex.tor-binary" name="tor-binary-windows" version="462c44c157cbf0b7574b7ab14d0bf231df770a63"> - <artifact name="tor-binary-windows-462c44c157cbf0b7574b7ab14d0bf231df770a63.jar"> - <sha256 value="39ae9a91803dae23fc5573f46f136b4ee973babfd72c3495963f1c430d20f162" origin="Generated by Gradle"/> + <component group="com.github.NorrinRadd.tor-binary" name="tor-binary-macos" version="d685466474286feb78e736276c3673372334aa37"> + <artifact name="tor-binary-macos-d685466474286feb78e736276c3673372334aa37.jar"> + <sha256 value="c38a2185536528914fe3ff0a51d0c51ecc497f8a0ec1ea6a85799a548c882bc6" origin="Generated by Gradle"/> + </artifact> + </component> + <component group="com.github.NorrinRadd.tor-binary" name="tor-binary-windows" version="d685466474286feb78e736276c3673372334aa37"> + <artifact name="tor-binary-windows-d685466474286feb78e736276c3673372334aa37.jar"> + <sha256 value="8257c29c8c725d32e840ed5a7a707da7195279643507907b8671449ebafd4cf1" origin="Generated by Gradle"/> </artifact> </component> <component group="com.github.johnrengelman" name="shadow" version="8.1.1">