From b7e8b12e36bcea02f5f00835b01c766517fa236e Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 12 May 2022 11:24:40 +0100
Subject: [PATCH] Upgrade briar-core to 1.4.7.
---
briar | 2 +-
build.gradle.kts | 4 ++--
.../kotlin/org/briarproject/briar/desktop/DesktopModule.kt | 1 +
.../org/briarproject/briar/desktop/DesktopTestModule.kt | 1 +
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/briar b/briar
index 6d22bab5ee..7536f16c61 160000
--- a/briar
+++ b/briar
@@ -1 +1 @@
-Subproject commit 6d22bab5eed26dbf4b03a309c4e371953c9c210c
+Subproject commit 7536f16c6136ebd5700a0f0ad49441050cf60096
diff --git a/build.gradle.kts b/build.gradle.kts
index 5000b323b4..b050ed73a8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -41,8 +41,8 @@ buildscript {
set("dagger_version", "2.33")
set("okhttp_version", "3.12.13")
set("jackson_version", "2.13.0")
- set("tor_version", "0.3.5.17")
- set("obfs4proxy_version", "0.0.12-dev-40245c4a")
+ set("tor_version", "0.4.5.12-2")
+ set("obfs4proxy_version", "0.0.12")
set("junit_version", "4.13.2")
set("jmock_version", "2.12.0")
}
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt b/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
index 72d42d0b39..e8702cea23 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
@@ -156,6 +156,7 @@ internal class DesktopModule(
override fun shouldEnablePrivateGroupsInCore() = desktopFeatureFlags.shouldEnablePrivateGroups()
override fun shouldEnableForumsInCore() = desktopFeatureFlags.shouldEnableForums()
override fun shouldEnableBlogsInCore() = desktopFeatureFlags.shouldEnableBlogs()
+ override fun shouldEnableMailbox() = false
}
@Provides
diff --git a/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt b/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt
index 223ce8baaa..607b771eaa 100644
--- a/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt
+++ b/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt
@@ -161,6 +161,7 @@ internal class DesktopTestModule(
override fun shouldEnablePrivateGroupsInCore() = desktopFeatureFlags.shouldEnablePrivateGroups()
override fun shouldEnableForumsInCore() = desktopFeatureFlags.shouldEnableForums()
override fun shouldEnableBlogsInCore() = desktopFeatureFlags.shouldEnableBlogs()
+ override fun shouldEnableMailbox() = false
}
@Provides
--
GitLab