diff --git a/gradle/variables.gradle b/gradle/variables.gradle
index 9345cf083698d3e08c1c0293eb92b084f047322b..c430d183b4cec7593d8f6a5517d564251adbb1bf 100644
--- a/gradle/variables.gradle
+++ b/gradle/variables.gradle
@@ -2,11 +2,10 @@ ext {
kotlin_version = '1.7.22' // 1.8.x has a jackson issue, test with JacksonProguardTest
hilt_version = '2.44.2'
nav_version = '2.5.3'
- tor_version = '0.4.8.9-1'
- obfs4_version = '0.0.14-tor2'
- snowflake_version = '2.9.1'
+ tor_version = '0.4.8.13'
+ lyrebird_version = '0.5.0-2'
junit_version = '5.7.2'
mockk_version = '1.10.4'
ktlint_plugin_version = '10.2.1'
- onionwrapper_version = '0.1.1'
+ onionwrapper_version = '0.1.2'
}
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 12bddd580e5321ac24c77585aeceb1655bcf9177..a53582f2c4f77c44a47c97778405148484fe2ac2 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -3109,84 +3109,68 @@
<sha256 value="b7b1ad2d2ac1b90fa51e0e5b50fb8d2eb4d6d641aeb7ec7ca5c8e689cc5f7a0d" origin="Generated by Gradle"/>
</artifact>
</component>
- <component group="org.briarproject" name="null-safety" version="0.1">
- <artifact name="null-safety-0.1.jar">
- <sha256 value="161760de5e838cb982bafa973df820675d4397098e9a91637a36a306d43ba011" origin="Generated by Gradle"/>
- </artifact>
- <artifact name="null-safety-0.1.pom">
- <sha256 value="972c760e2b1b75895f4dacd6c03ec50b32bf70c844304a6ed531536f13eb90d9" origin="Generated by Gradle"/>
- </artifact>
- </component>
- <component group="org.briarproject" name="obfs4proxy-android" version="0.0.14-tor2">
- <artifact name="obfs4proxy-android-0.0.14-tor2.jar">
- <sha256 value="a0a93770d6760ce57d9dbd31cc7177687374e00c3361dac22ab75e3b6e0f289e" origin="Generated by Gradle"/>
+ <component group="org.briarproject" name="lyrebird-android" version="0.5.0-2">
+ <artifact name="lyrebird-android-0.5.0-2.jar">
+ <sha256 value="5ca2bd723c9eea692cab39ef70272407610b8dc359d267a3486e2f9d3a65d88b" origin="Generated by Gradle"/>
</artifact>
- <artifact name="obfs4proxy-android-0.0.14-tor2.pom">
- <sha256 value="37eeb13e66274b9b7bdec5ed8a5902a127cf19bc7e5ae40d220ece8cf1886779" origin="Generated by Gradle"/>
+ <artifact name="lyrebird-android-0.5.0-2.pom">
+ <sha256 value="9350ed1281330c22febf8b3010ed862b9c2cb7887481b1c25a41b359ea3610ad" origin="Generated by Gradle"/>
</artifact>
</component>
- <component group="org.briarproject" name="obfs4proxy-linux" version="0.0.14-tor2">
- <artifact name="obfs4proxy-linux-0.0.14-tor2.jar">
- <sha256 value="bb2431092b5ad998ad620b0223e725c0f7e43f1b02af2f097a2544edc1fd9738" origin="Generated by Gradle"/>
+ <component group="org.briarproject" name="lyrebird-linux" version="0.5.0-2">
+ <artifact name="lyrebird-linux-0.5.0-2.jar">
+ <sha256 value="8537a7b6d9cdcf880053df8b27250245f6920de4b3c54e58823edfddaf0336fc" origin="Generated by Gradle"/>
</artifact>
- <artifact name="obfs4proxy-linux-0.0.14-tor2.pom">
- <sha256 value="9feb0d95ecef6e394b2a55ec4e451ec659f84a705345976053de166b157a0460" origin="Generated by Gradle"/>
+ <artifact name="lyrebird-linux-0.5.0-2.pom">
+ <sha256 value="54af9f43a1eb1009ff5275ed3cadc6e4f62ca723b041fc3178e24966ea123346" origin="Generated by Gradle"/>
</artifact>
</component>
- <component group="org.briarproject" name="onionwrapper-android" version="0.1.1">
- <artifact name="onionwrapper-android-0.1.1.aar">
- <sha256 value="d761854dac454616b3e0ca099b2cd17060365ce4316afe495cc7ae86b6c81d15" origin="Generated by Gradle"/>
- </artifact>
- <artifact name="onionwrapper-android-0.1.1.module">
- <sha256 value="56e02eb6521b7ddc17163008283f9227740aaea86544c61704876f94e8d99710" origin="Generated by Gradle"/>
- </artifact>
- </component>
- <component group="org.briarproject" name="onionwrapper-core" version="0.1.1">
- <artifact name="onionwrapper-core-0.1.1.jar">
- <sha256 value="176b7c159a45f6397810a1f93f040b3e17fdbc6645b0d189204777920719464b" origin="Generated by Gradle"/>
+ <component group="org.briarproject" name="null-safety" version="0.1">
+ <artifact name="null-safety-0.1.jar">
+ <sha256 value="161760de5e838cb982bafa973df820675d4397098e9a91637a36a306d43ba011" origin="Generated by Gradle"/>
</artifact>
- <artifact name="onionwrapper-core-0.1.1.module">
- <sha256 value="92eccc9af170ca3c44ab0bf50ce9b32537ea55ae6c518b4f1e39916804dc6655" origin="Generated by Gradle"/>
+ <artifact name="null-safety-0.1.pom">
+ <sha256 value="972c760e2b1b75895f4dacd6c03ec50b32bf70c844304a6ed531536f13eb90d9" origin="Generated by Gradle"/>
</artifact>
</component>
- <component group="org.briarproject" name="onionwrapper-java" version="0.1.1">
- <artifact name="onionwrapper-java-0.1.1.jar">
- <sha256 value="96dbf1f5c72381b7c124d2d43748fcbe18db9cc8e3c950160954e10a6042f83d" origin="Generated by Gradle"/>
+ <component group="org.briarproject" name="onionwrapper-android" version="0.1.2">
+ <artifact name="onionwrapper-android-0.1.2.aar">
+ <sha256 value="15231f0b2ad44df8eb1dd362a989ba3f88ebdc9b02a9128daa72a8da83651bf0" origin="Generated by Gradle"/>
</artifact>
- <artifact name="onionwrapper-java-0.1.1.module">
- <sha256 value="0f5458ee0999d8d0e656bdf97495ccc69ee936f27fd797c3ff35c19a26c181bf" origin="Generated by Gradle"/>
+ <artifact name="onionwrapper-android-0.1.2.module">
+ <sha256 value="0215ba11e82a2ebb8e03209b02dfaafe11fbba60667e6ceeb1433062dc5fd8bb" origin="Generated by Gradle"/>
</artifact>
</component>
- <component group="org.briarproject" name="snowflake-android" version="2.9.1">
- <artifact name="snowflake-android-2.9.1.jar">
- <sha256 value="8d6195637edbe3717d205c2e524e9d3cb742b90fc67b10565d16262af134e489" origin="Generated by Gradle"/>
+ <component group="org.briarproject" name="onionwrapper-core" version="0.1.2">
+ <artifact name="onionwrapper-core-0.1.2.jar">
+ <sha256 value="65620cb183d6c392aec21f2e822a499329f89933e2235f7084eaf93ee2d36257" origin="Generated by Gradle"/>
</artifact>
- <artifact name="snowflake-android-2.9.1.pom">
- <sha256 value="550526c404e9a9105e9eae55490eac874b07febce4e64b1053cf357144f7c204" origin="Generated by Gradle"/>
+ <artifact name="onionwrapper-core-0.1.2.module">
+ <sha256 value="4638c3dd1685022fed03603f67a3e973462c65220f5ab5b9177b7a47ff9c904f" origin="Generated by Gradle"/>
</artifact>
</component>
- <component group="org.briarproject" name="snowflake-linux" version="2.9.1">
- <artifact name="snowflake-linux-2.9.1.jar">
- <sha256 value="36b2f406f67a1bf3b4a6cecbba2e153ad939209cc9c22299e4161019dbae0e03" origin="Generated by Gradle"/>
+ <component group="org.briarproject" name="onionwrapper-java" version="0.1.2">
+ <artifact name="onionwrapper-java-0.1.2.jar">
+ <sha256 value="9cab70d6ead3528f9d2975c9bebe24c12c3bed4687d2aa0d3447694ebf747353" origin="Generated by Gradle"/>
</artifact>
- <artifact name="snowflake-linux-2.9.1.pom">
- <sha256 value="9aa9b67b311ab926884a1394a095fd95b9d1ca4bb2549aa7c334da76d7dfc49e" origin="Generated by Gradle"/>
+ <artifact name="onionwrapper-java-0.1.2.module">
+ <sha256 value="d974b19ed6748eeda5ed89c537aebeab31433433542224ece8bf09efb4d2b156" origin="Generated by Gradle"/>
</artifact>
</component>
- <component group="org.briarproject" name="tor-android" version="0.4.8.9-1">
- <artifact name="tor-android-0.4.8.9-1.jar">
- <sha256 value="8fbaaf0cb1663abd12852b7fc51a804534b7e7d865b4dec3fc4e9ec0e79f3ad5" origin="Generated by Gradle"/>
+ <component group="org.briarproject" name="tor-android" version="0.4.8.13">
+ <artifact name="tor-android-0.4.8.13.jar">
+ <sha256 value="056fee77e7c6f1b60bc61234a882e53ee140ad4c4680015eec570f8d29a3430f" origin="Generated by Gradle"/>
</artifact>
- <artifact name="tor-android-0.4.8.9-1.pom">
- <sha256 value="f03a05383064c448d28485a8159338688352ce493f8792f8b45f17a46a81d409" origin="Generated by Gradle"/>
+ <artifact name="tor-android-0.4.8.13.pom">
+ <sha256 value="6d7299f081a0f615d88b5eec1ec74523c1f4209fc0803b0a365f59d8e0bf5614" origin="Generated by Gradle"/>
</artifact>
</component>
- <component group="org.briarproject" name="tor-linux" version="0.4.8.9-1">
- <artifact name="tor-linux-0.4.8.9-1.jar">
- <sha256 value="601b7bd5f0872f9501ef438bd3ce5ed22f8a3a7b77d6f2b063852987d87ed853" origin="Generated by Gradle"/>
+ <component group="org.briarproject" name="tor-linux" version="0.4.8.13">
+ <artifact name="tor-linux-0.4.8.13.jar">
+ <sha256 value="0b3151bfa26eb1c24ed75fa595da2e5c8c2dad11e182db39fc617c5223270ae7" origin="Generated by Gradle"/>
</artifact>
- <artifact name="tor-linux-0.4.8.9-1.pom">
- <sha256 value="109ab2d691b70a89efc279f35059699059f051cfd2aa81715a2a0673c5e0aca3" origin="Generated by Gradle"/>
+ <artifact name="tor-linux-0.4.8.13.pom">
+ <sha256 value="cd0854a7309c2bada056e070dfb7b409f715df1fb68f00f08c39d16c12755beb" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.checkerframework" name="checker-compat-qual" version="2.5.5">
diff --git a/mailbox-android/build.gradle b/mailbox-android/build.gradle
index a23a8ca2bd78038f19ce279c1c0066fb330368d6..f5dffb5ab553ec95f5ae7fce7ba8fe37d8014ee8 100644
--- a/mailbox-android/build.gradle
+++ b/mailbox-android/build.gradle
@@ -110,8 +110,7 @@ dependencies {
implementation "androidx.multidex:multidex:$multidex_version"
tor "org.briarproject:tor-android:$tor_version"
- tor "org.briarproject:obfs4proxy-android:$obfs4_version"
- tor "org.briarproject:snowflake-android:$snowflake_version"
+ tor "org.briarproject:lyrebird-android:$lyrebird_version"
testImplementation 'junit:junit:4.13.2'
diff --git a/mailbox-cli/build.gradle b/mailbox-cli/build.gradle
index cde3040d95a2969a154c9c2ce7bdb8a91158519b..5564cd583fa24df668f91e5a6313252ccd5e2d83 100644
--- a/mailbox-cli/build.gradle
+++ b/mailbox-cli/build.gradle
@@ -73,9 +73,8 @@ void jarFactory(Jar jarTask, os, architecture, configuration) {
String[] architectures = ["aarch64", "armhf", "x86_64"]
for (String arch : architectures) {
if (arch != architecture) {
- exclude arch + "/obfs4proxy"
+ exclude arch + "/lyrebird"
exclude arch + "/tor"
- exclude arch + "/snowflake"
}
}
exclude 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA'
diff --git a/mailbox-lib/build.gradle b/mailbox-lib/build.gradle
index e61f746230508ced44541ea541add71f01e7b251..3b92b590e12d9ab9d30ae5c47363ea1654ba41fb 100644
--- a/mailbox-lib/build.gradle
+++ b/mailbox-lib/build.gradle
@@ -24,8 +24,7 @@ dependencies {
implementation "org.briarproject:onionwrapper-java:$onionwrapper_version"
tor "org.briarproject:tor-linux:$tor_version"
- tor "org.briarproject:obfs4proxy-linux:$obfs4_version"
- tor "org.briarproject:snowflake-linux:$snowflake_version"
+ tor "org.briarproject:lyrebird-linux:$lyrebird_version"
implementation "com.google.dagger:hilt-core:$hilt_version"
kapt "com.google.dagger:hilt-compiler:$hilt_version"