From 020e216311a002080063e0dcab07cbc0205be17d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Wed, 12 Feb 2025 11:22:56 +0100
Subject: [PATCH] Upgrade various depdendencies:
icu4j, jna, jul-to-slf4j, logback-classic, commons-io
Also, replace relocated io.github.microutils:kotlin-logging-jvm with
io.github.oshai:kotlin-logging-jvm
---
briar-desktop/build.gradle.kts | 12 ++++++------
.../kotlin/org/briarproject/briar/desktop/Main.kt | 2 +-
.../desktop/attachment/media/ImageCompressorImpl.kt | 2 +-
.../briarproject/briar/desktop/blog/FeedViewModel.kt | 2 +-
.../desktop/blog/sharing/BlogSharingViewModel.kt | 2 +-
.../briar/desktop/contact/ContactListViewModel.kt | 2 +-
.../briar/desktop/contact/ContactsViewModel.kt | 2 +-
.../contact/add/remote/AddContactViewModel.kt | 2 +-
.../desktop/conversation/ConversationViewModel.kt | 2 +-
.../desktop/conversation/ConversationVisitor.kt | 2 +-
.../briar/desktop/forum/ForumListViewModel.kt | 2 +-
.../desktop/forum/sharing/ForumSharingViewModel.kt | 2 +-
.../briar/desktop/login/RegistrationSubViewModel.kt | 2 +-
.../briar/desktop/login/StartupViewModel.kt | 2 +-
.../briar/desktop/mailbox/MailboxViewModel.kt | 2 +-
.../notification/SoundNotificationProvider.kt | 2 +-
.../linux/LibnotifyNotificationProvider.kt | 2 +-
.../windows/Toast4jNotificationProvider.kt | 2 +-
.../desktop/settings/UnencryptedSettingsImpl.kt | 2 +-
.../threadedgroup/ThreadedGroupListViewModel.kt | 2 +-
.../sharing/ThreadedGroupSharingViewModel.kt | 2 +-
.../briar/desktop/threading/BriarExecutorsImpl.kt | 2 +-
.../briar/desktop/ui/MessageCounterImpl.kt | 2 +-
.../briarproject/briar/desktop/utils/ImagePicker.kt | 2 +-
.../briar/desktop/utils/InternationalizationUtils.kt | 2 +-
.../briarproject/briar/desktop/utils/KLoggerUtils.kt | 2 +-
.../desktop/RunWithMultipleTemporaryAccounts.kt | 2 +-
.../briar/desktop/RunWithTemporaryAccount.kt | 2 +-
.../org/briarproject/briar/desktop/TestUtils.kt | 2 +-
.../testdata/DeterministicTestDataCreatorImpl.kt | 2 +-
.../desktop/builddata/GenerateBuildDataSourceTask.kt | 2 +-
31 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/briar-desktop/build.gradle.kts b/briar-desktop/build.gradle.kts
index c504697a6d..ec3daf0d7b 100644
--- a/briar-desktop/build.gradle.kts
+++ b/briar-desktop/build.gradle.kts
@@ -130,15 +130,15 @@ dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.6.4")
implementation("com.github.ajalt.clikt:clikt:3.4.0")
- implementation("com.ibm.icu:icu4j:70.1")
- implementation("net.java.dev.jna:jna:5.13.0")
+ implementation("com.ibm.icu:icu4j:76.1")
+ implementation("net.java.dev.jna:jna:5.16.0")
implementation(project(path = ":briar-core", configuration = "default"))
implementation(project(path = ":bramble-java", configuration = "default"))
- implementation("io.github.microutils:kotlin-logging-jvm:3.0.4")
- implementation("org.slf4j:jul-to-slf4j:2.0.5")
- implementation("ch.qos.logback:logback-classic:1.4.5")
+ implementation("io.github.oshai:kotlin-logging-jvm:7.0.4")
+ implementation("org.slf4j:jul-to-slf4j:2.0.16")
+ implementation("ch.qos.logback:logback-classic:1.5.16")
implementation("de.mobanisto:toast4j:0.2.0")
implementation("de.jangassen:jfa:1.2.0") {
// not excluding this leads to a strange error during build:
@@ -150,7 +150,7 @@ dependencies {
testImplementation(kotlin("test-testng"))
testImplementation(project(path = ":bramble-core", configuration = "testOutput"))
- testImplementation("commons-io:commons-io:2.11.0")
+ testImplementation("commons-io:commons-io:2.18.0")
kaptTest("com.google.dagger:dagger-compiler:$dagger_version")
}
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/Main.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/Main.kt
index 11bd96ef9e..a306385f40 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/Main.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/Main.kt
@@ -26,7 +26,7 @@ import com.github.ajalt.clikt.parameters.options.default
import com.github.ajalt.clikt.parameters.options.flag
import com.github.ajalt.clikt.parameters.options.option
import com.github.ajalt.clikt.parameters.types.int
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.BrambleCoreEagerSingletons
import org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_CONTROL_PORT
import org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_SOCKS_PORT
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/attachment/media/ImageCompressorImpl.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/attachment/media/ImageCompressorImpl.kt
index 8399876c5d..853c25e7c5 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/attachment/media/ImageCompressorImpl.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/attachment/media/ImageCompressorImpl.kt
@@ -18,7 +18,7 @@
package org.briarproject.briar.desktop.attachment.media
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.briar.api.attachment.MediaConstants.MAX_IMAGE_SIZE
import org.briarproject.briar.desktop.utils.KLoggerUtils.i
import java.awt.geom.AffineTransform
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/FeedViewModel.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/FeedViewModel.kt
index 8d51c06d43..d118d4b2db 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/FeedViewModel.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/FeedViewModel.kt
@@ -21,7 +21,7 @@ package org.briarproject.briar.desktop.blog
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.mutableStateListOf
import androidx.compose.runtime.mutableStateOf
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.api.db.DatabaseExecutor
import org.briarproject.bramble.api.db.Transaction
import org.briarproject.bramble.api.db.TransactionManager
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/sharing/BlogSharingViewModel.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/sharing/BlogSharingViewModel.kt
index 6d23b0cfbf..443f4ecf9f 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/sharing/BlogSharingViewModel.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/sharing/BlogSharingViewModel.kt
@@ -20,7 +20,7 @@ package org.briarproject.briar.desktop.blog.sharing
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.mutableStateOf
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.api.connection.ConnectionRegistry
import org.briarproject.bramble.api.contact.Contact
import org.briarproject.bramble.api.contact.ContactManager
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactListViewModel.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactListViewModel.kt
index a2fcc4a848..8827ce4666 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactListViewModel.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactListViewModel.kt
@@ -21,7 +21,7 @@ package org.briarproject.briar.desktop.contact
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.mutableStateListOf
import androidx.compose.runtime.mutableStateOf
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.api.connection.ConnectionRegistry
import org.briarproject.bramble.api.contact.ContactManager
import org.briarproject.bramble.api.contact.PendingContactId
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactsViewModel.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactsViewModel.kt
index 643014a1c4..5e4b014855 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactsViewModel.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactsViewModel.kt
@@ -19,7 +19,7 @@
package org.briarproject.briar.desktop.contact
import androidx.compose.runtime.mutableStateListOf
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.api.connection.ConnectionRegistry
import org.briarproject.bramble.api.contact.Contact
import org.briarproject.bramble.api.contact.ContactId
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/add/remote/AddContactViewModel.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/add/remote/AddContactViewModel.kt
index 0da354c91b..3073c4def8 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/add/remote/AddContactViewModel.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/add/remote/AddContactViewModel.kt
@@ -19,7 +19,7 @@
package org.briarproject.briar.desktop.contact.add.remote
import androidx.compose.runtime.mutableStateOf
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.api.FormatException
import org.briarproject.bramble.api.contact.ContactManager
import org.briarproject.bramble.api.contact.HandshakeLinkConstants
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationViewModel.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationViewModel.kt
index d211627e2f..f4d40a9d65 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationViewModel.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationViewModel.kt
@@ -23,7 +23,7 @@ import androidx.compose.runtime.mutableStateListOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.toAwtImage
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.api.FormatException
import org.briarproject.bramble.api.connection.ConnectionRegistry
import org.briarproject.bramble.api.contact.ContactId
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationVisitor.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationVisitor.kt
index d8fe35903e..532e0fa664 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationVisitor.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationVisitor.kt
@@ -18,7 +18,7 @@
package org.briarproject.briar.desktop.conversation
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.api.db.DatabaseExecutor
import org.briarproject.bramble.api.db.DbException
import org.briarproject.bramble.api.db.Transaction
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forum/ForumListViewModel.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forum/ForumListViewModel.kt
index 30c25d1bd0..d9366cab99 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forum/ForumListViewModel.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forum/ForumListViewModel.kt
@@ -19,7 +19,7 @@
package org.briarproject.briar.desktop.forum
import androidx.compose.runtime.mutableStateListOf
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.api.db.Transaction
import org.briarproject.bramble.api.db.TransactionManager
import org.briarproject.bramble.api.event.Event
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forum/sharing/ForumSharingViewModel.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forum/sharing/ForumSharingViewModel.kt
index 1d98b8557b..2c87593fd9 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forum/sharing/ForumSharingViewModel.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forum/sharing/ForumSharingViewModel.kt
@@ -19,7 +19,7 @@
package org.briarproject.briar.desktop.forum.sharing
import androidx.compose.runtime.derivedStateOf
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.api.connection.ConnectionRegistry
import org.briarproject.bramble.api.contact.Contact
import org.briarproject.bramble.api.contact.ContactManager
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/login/RegistrationSubViewModel.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/login/RegistrationSubViewModel.kt
index f8556bc01d..9d7d11d6ee 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/login/RegistrationSubViewModel.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/login/RegistrationSubViewModel.kt
@@ -20,7 +20,7 @@ package org.briarproject.briar.desktop.login
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.mutableStateOf
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.api.account.AccountManager
import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator
import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator.QUITE_WEAK
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/login/StartupViewModel.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/login/StartupViewModel.kt
index c44e454ebc..e316344456 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/login/StartupViewModel.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/login/StartupViewModel.kt
@@ -19,7 +19,7 @@
package org.briarproject.briar.desktop.login
import androidx.compose.runtime.mutableStateOf
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.api.account.AccountManager
import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator
import org.briarproject.bramble.api.db.TransactionManager
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/mailbox/MailboxViewModel.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/mailbox/MailboxViewModel.kt
index 1b070e8f2f..8364ad51a0 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/mailbox/MailboxViewModel.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/mailbox/MailboxViewModel.kt
@@ -19,7 +19,7 @@
package org.briarproject.briar.desktop.mailbox
import androidx.compose.runtime.mutableStateOf
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.api.Consumer
import org.briarproject.bramble.api.db.TransactionManager
import org.briarproject.bramble.api.event.Event
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/notification/SoundNotificationProvider.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/notification/SoundNotificationProvider.kt
index 6890ed1375..5ae6639639 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/notification/SoundNotificationProvider.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/notification/SoundNotificationProvider.kt
@@ -17,7 +17,7 @@
*/
package org.briarproject.briar.desktop.notification
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.briar.desktop.utils.AudioUtils.loadAudioFromResource
import org.briarproject.briar.desktop.utils.AudioUtils.play
import org.briarproject.briar.desktop.utils.KLoggerUtils.e
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/notification/linux/LibnotifyNotificationProvider.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/notification/linux/LibnotifyNotificationProvider.kt
index 83b3c2bbea..a28a311b6b 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/notification/linux/LibnotifyNotificationProvider.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/notification/linux/LibnotifyNotificationProvider.kt
@@ -21,7 +21,7 @@ import com.sun.jna.Library
import com.sun.jna.Native
import com.sun.jna.Pointer
import com.sun.jna.ptr.PointerByReference
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.briar.desktop.Strings
import org.briarproject.briar.desktop.notification.AbstractNotificationProvider
import org.briarproject.briar.desktop.utils.InternationalizationUtils.i18n
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/notification/windows/Toast4jNotificationProvider.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/notification/windows/Toast4jNotificationProvider.kt
index 3409b0ff98..76e8ac91b2 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/notification/windows/Toast4jNotificationProvider.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/notification/windows/Toast4jNotificationProvider.kt
@@ -21,7 +21,7 @@ import de.mobanisto.toast4j.ToastBuilder
import de.mobanisto.toast4j.ToastHandle
import de.mobanisto.toast4j.Toaster
import de.mobanisto.wintoast.WinToastTemplate.WinToastTemplateType
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.briar.desktop.BuildData
import org.briarproject.briar.desktop.notification.AbstractNotificationProvider
import org.briarproject.briar.desktop.utils.InternationalizationUtils.i18n
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/settings/UnencryptedSettingsImpl.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/settings/UnencryptedSettingsImpl.kt
index 5987373807..a20346980b 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/settings/UnencryptedSettingsImpl.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/settings/UnencryptedSettingsImpl.kt
@@ -18,7 +18,7 @@
package org.briarproject.briar.desktop.settings
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.api.lifecycle.IoExecutor
import org.briarproject.briar.desktop.settings.UnencryptedSettings.Language
import org.briarproject.briar.desktop.settings.UnencryptedSettings.Language.DEFAULT
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/threadedgroup/ThreadedGroupListViewModel.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/threadedgroup/ThreadedGroupListViewModel.kt
index 4f5b93cf99..5c5b6fbf49 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/threadedgroup/ThreadedGroupListViewModel.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/threadedgroup/ThreadedGroupListViewModel.kt
@@ -20,7 +20,7 @@ package org.briarproject.briar.desktop.threadedgroup
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.mutableStateOf
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.api.db.DatabaseExecutor
import org.briarproject.bramble.api.db.Transaction
import org.briarproject.bramble.api.db.TransactionManager
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/threadedgroup/sharing/ThreadedGroupSharingViewModel.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/threadedgroup/sharing/ThreadedGroupSharingViewModel.kt
index 2ca8120dee..d56961172e 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/threadedgroup/sharing/ThreadedGroupSharingViewModel.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/threadedgroup/sharing/ThreadedGroupSharingViewModel.kt
@@ -20,7 +20,7 @@ package org.briarproject.briar.desktop.threadedgroup.sharing
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.mutableStateOf
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.api.connection.ConnectionRegistry
import org.briarproject.bramble.api.contact.Contact
import org.briarproject.bramble.api.contact.ContactId
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/threading/BriarExecutorsImpl.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/threading/BriarExecutorsImpl.kt
index de0923ebec..4aba607651 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/threading/BriarExecutorsImpl.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/threading/BriarExecutorsImpl.kt
@@ -18,7 +18,7 @@
package org.briarproject.briar.desktop.threading
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.api.db.DatabaseExecutor
import org.briarproject.bramble.api.db.DbCallable
import org.briarproject.bramble.api.db.Transaction
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/MessageCounterImpl.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/MessageCounterImpl.kt
index 833cfcdff6..fe683b0453 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/MessageCounterImpl.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/MessageCounterImpl.kt
@@ -18,7 +18,7 @@
package org.briarproject.briar.desktop.ui
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.api.Multiset
import org.briarproject.bramble.api.contact.ContactId
import org.briarproject.bramble.api.contact.ContactManager
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/utils/ImagePicker.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/utils/ImagePicker.kt
index 1e0891510d..58382524e2 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/utils/ImagePicker.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/utils/ImagePicker.kt
@@ -20,7 +20,7 @@ package org.briarproject.briar.desktop.utils
import androidx.compose.ui.awt.ComposeWindow
import androidx.compose.ui.graphics.ImageBitmap
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.briar.desktop.utils.ImageUtils.loadImageBitmap
import org.briarproject.briar.desktop.utils.KLoggerUtils.d
import org.briarproject.briar.desktop.utils.KLoggerUtils.w
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/utils/InternationalizationUtils.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/utils/InternationalizationUtils.kt
index b26d472126..dc3d78b3fe 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/utils/InternationalizationUtils.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/utils/InternationalizationUtils.kt
@@ -19,7 +19,7 @@
package org.briarproject.briar.desktop.utils
import com.ibm.icu.text.MessageFormat
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.briar.desktop.utils.KLoggerUtils.w
import java.util.Locale
import java.util.MissingResourceException
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/utils/KLoggerUtils.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/utils/KLoggerUtils.kt
index 070c64bc0b..cee8c125f1 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/utils/KLoggerUtils.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/utils/KLoggerUtils.kt
@@ -18,7 +18,7 @@
package org.briarproject.briar.desktop.utils
-import mu.KLogger
+import io.github.oshai.kotlinlogging.KLogger
import org.briarproject.bramble.util.LogUtils
import org.jetbrains.annotations.NonNls
diff --git a/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/RunWithMultipleTemporaryAccounts.kt b/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/RunWithMultipleTemporaryAccounts.kt
index 6a8fbe6d02..3383295b27 100644
--- a/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/RunWithMultipleTemporaryAccounts.kt
+++ b/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/RunWithMultipleTemporaryAccounts.kt
@@ -22,7 +22,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.window.ApplicationScope
import androidx.compose.ui.window.application
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.BrambleCoreEagerSingletons
import org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_CONTROL_PORT
import org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_SOCKS_PORT
diff --git a/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt b/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt
index 7d37c4c0a0..fc9da08c76 100644
--- a/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt
+++ b/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt
@@ -23,7 +23,7 @@ package org.briarproject.briar.desktop
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.window.application
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.BrambleCoreEagerSingletons
import org.briarproject.bramble.api.lifecycle.Service
import org.briarproject.bramble.api.lifecycle.ServiceException
diff --git a/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/TestUtils.kt b/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/TestUtils.kt
index 7b67c41088..acbe8a981d 100644
--- a/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/TestUtils.kt
+++ b/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/TestUtils.kt
@@ -20,7 +20,7 @@
package org.briarproject.briar.desktop
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.api.Bytes.compare
import org.briarproject.bramble.api.FormatException
import org.briarproject.bramble.api.contact.PendingContactId
diff --git a/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/testdata/DeterministicTestDataCreatorImpl.kt b/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/testdata/DeterministicTestDataCreatorImpl.kt
index bc46970b16..c7f3c6b576 100644
--- a/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/testdata/DeterministicTestDataCreatorImpl.kt
+++ b/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/testdata/DeterministicTestDataCreatorImpl.kt
@@ -18,7 +18,7 @@
package org.briarproject.briar.desktop.testdata
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.briarproject.bramble.api.FormatException
import org.briarproject.bramble.api.client.ClientHelper
import org.briarproject.bramble.api.contact.ContactId
diff --git a/buildSrc/src/main/kotlin/org/briarproject/briar/desktop/builddata/GenerateBuildDataSourceTask.kt b/buildSrc/src/main/kotlin/org/briarproject/briar/desktop/builddata/GenerateBuildDataSourceTask.kt
index f9e74290e2..e2107c3e3e 100644
--- a/buildSrc/src/main/kotlin/org/briarproject/briar/desktop/builddata/GenerateBuildDataSourceTask.kt
+++ b/buildSrc/src/main/kotlin/org/briarproject/briar/desktop/builddata/GenerateBuildDataSourceTask.kt
@@ -65,7 +65,7 @@ open class GenerateBuildDataSourceTask : AbstractBuildDataTask() {
put(UnversionedArtifact("com.squareup.okio", "okio-jvm"), "Apache 2.0")
put(UnversionedArtifact("de.mobanisto", "toast4j"), "MIT")
put(UnversionedArtifact("de.jangassen", "jfa"), "Apache 2.0")
- put(UnversionedArtifact("io.github.microutils", "kotlin-logging-jvm"), "Apache 2.0")
+ put(UnversionedArtifact("io.github.oshai", "kotlin-logging-jvm"), "Apache 2.0")
put(UnversionedArtifact("javax.inject", "javax.inject"), "Apache 2.0")
put(UnversionedArtifact("net.i2p.crypto", "eddsa"), "CC0 1.0")
put(UnversionedArtifact("net.java.dev.jna", "jna"), "Apache 2.0/LGPL 2.1")
--
GitLab