From de095c17116b4b3b2b998b8632ad290c2017c985 Mon Sep 17 00:00:00 2001
From: Brandon Trussell <brandon2k3@gmail.com>
Date: Thu, 20 Mar 2025 20:35:33 -0500
Subject: [PATCH] Changes necessary in order to test linux aarch64
---
build.gradle | 14 ++++-----
gradle/verification-metadata.xml | 54 ++++++++++++++++++--------------
2 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/build.gradle b/build.gradle
index 3c3d95d074..ef472ee4ca 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 = '56b23841a9' // 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..636c2421e7 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -205,44 +205,50 @@
<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="56b23841a9">
+
+ <artifact name="tor-56b23841a9.jar">
+ <sha256 value="12b83bdd6842e37424d6852a7e9909508fb1b856fe690d32458772b2139186a9" 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="56b23841a9">
+ <artifact name="tor.external-56b23841a9.jar">
+ <sha256 value="bc86022625ee418c4a0d17b274bd5f33295d8f0d736988ac6348632758a16b69" 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="56b23841a9">
+ <artifact name="tor.native-56b23841a9.jar">
+ <sha256 value="0198d7420b10ce3244697c2917179d3eed4382b34da1d16704ffae747c8fec1a" 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="338122ddd8b6ace2857de1038634fb09e590f823">
+ <artifact name="tor-binary-geoip-338122ddd8b6ace2857de1038634fb09e590f823.jar">
+ <sha256 value="494cbd5404b52ffdacefb3815f52139c544f185324633ed5c16976414c524a06" 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="338122ddd8b6ace2857de1038634fb09e590f823">
+ <artifact name="tor-binary-linux32-338122ddd8b6ace2857de1038634fb09e590f823.jar">
+ <sha256 value="a18f1f8c76e10d544fceb1e51befe2dfe366fa4e2934bcac6ce7469b568456d5" 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="338122ddd8b6ace2857de1038634fb09e590f823">
+ <artifact name="tor-binary-linux64-338122ddd8b6ace2857de1038634fb09e590f823.jar">
+ <sha256 value="371f45c9965e4dd8f87f32f39ed4e30c98442f0efed96cb8c067b497aee811df" 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="338122ddd8b6ace2857de1038634fb09e590f823">
+ <artifact name="tor-binary-linuxaarch64-338122ddd8b6ace2857de1038634fb09e590f823.jar">
+ <sha256 value="1f6937721159194a28e0b7d8d055808364a1882c7866574be102626c684b043c" 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="338122ddd8b6ace2857de1038634fb09e590f823">
+ <artifact name="tor-binary-macos-338122ddd8b6ace2857de1038634fb09e590f823.jar">
+ <sha256 value="3ac95b24e39e612917fb4e099c418aa19c2cf8ed32daf3a150210782a478ca9e" origin="Generated by Gradle"/>
+ </artifact>
+ </component>
+ <component group="com.github.NorrinRadd.tor-binary" name="tor-binary-windows" version="338122ddd8b6ace2857de1038634fb09e590f823">
+ <artifact name="tor-binary-windows-338122ddd8b6ace2857de1038634fb09e590f823.jar">
+ <sha256 value="77016bbd40fe2776be8b141d3435675b54a4b05059cfd1113eedb763e890ffb2" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.johnrengelman" name="shadow" version="8.1.1">