diff --git a/briar-desktop/build.gradle.kts b/briar-desktop/build.gradle.kts index c504697a6dc288d9f5c312324b502c4ab9aa8d39..ec3daf0d7b3c15bf11ce440be7d5d06636ad7b66 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 11bd96ef9e23d81094f14ed89a640ca80b979d20..a306385f40576eccceaff524faf8ac6191657dc4 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 8399876c5d0fdb6269901fd14e47b31b3885e022..853c25e7c5ad2db86bd090ce24ec516487b82bfa 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 8d51c06d4307508ea58284c607d4af73936e055c..d118d4b2db17bf1a58dc356561d62f6207f34d00 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 6d23b0cfbf061a4588c22e4dfb5d4de83618a351..443f4ecf9f2641cd5bab3e982c1ab42ae8d0f920 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 a2fcc4a848bb8f25bfa4de19f1a90695b3b6b9fe..8827ce466619cbd9ce6b5050bb42d47da0a16122 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 643014a1c4b45a46099c68d325e9763f3a48d650..5e4b01485510ca2f2f5ab7171df78302e077400d 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 0da354c91ba4f195da1541c49ebab2a3efe15a20..3073c4def86fb1966386f47b8bc9755b86feaf56 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 d211627e2f1878672ab5c25134f706da724d5fe8..f4d40a9d65019d50a18dab4a02f59fbab7b63d92 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 d8fe35903eaed2be8d1dce8466a0460ee06c8f33..532e0fa6643ab1652c8fffe4e8c6f3cf78f36d1e 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 30c25d1bd0ba27c860dbaa5716e618968f834341..d9366cab9930a3ab6109f6c205a8aa608b8b1379 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 1d98b8557b147d91ba1f19ec5804a61880b37782..2c87593fd91d5bbfc4bac07f77df409915877c21 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 f8556bc01d63955f1a3df4c5925eaaf80c8aef68..9d7d11d6ee520725ad7f96bb21b4f8fd36bca4a6 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 c44e454ebca48e05d9d06037ab240a2c7794a268..e316344456d381d1cb6acaf9782ab7748ba80be1 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 1b070e8f2f2498c62ed01500a4dfe6ff77ffa154..8364ad51a0b03c31c760fe83038fe69d8dc149f5 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 6890ed137539997701a8a0dd1082f513ae3e3c1c..5ae6639639977f521e2aa84e4e1436611ae96cf6 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 83b3c2bbea8c9b50b65643a483985190401b03b4..a28a311b6b4dacd2d71a9eee425a133f6e6f2287 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 3409b0ff981926086f57bc33898ab8c5aba84832..76e8ac91b2734a1f7ee81cbad01a656a6f4cc585 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 59873738078d4a19bf33f49dbb164af58c61f899..a20346980b23561bf36a363aa226b7780100a500 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 4f5b93cf994d7c6b68529221c4d33d453dcabec5..5c5b6fbf49056161134772507e13ee129c3bf036 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 2ca8120dee102289c1eb78e871b0622c730df3d5..d56961172e6a2c6580ed4e265884ec47dacecc8e 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 de0923ebec55afdf348890f73d397c8645ec928c..4aba607651764c6e802fc108fe1e34719decacc5 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 833cfcdff6a5177d3abada600d78d78ae83d46ab..fe683b0453272058f9e9738efbba4740be0a29a7 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 1e0891510d1f89aac4879b57634c0852c8b04b0c..58382524e2adbf9a9ff646ee17ee102c010e4a25 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 b26d4721265326639357e3267e331a0e3bffbf01..dc3d78b3fe1ef720632dfc060104f83e883c078e 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 070c64bc0bb06b2eb16af0c01eae42055cd36050..cee8c125f143e17c800d69e0994fea19e3123a11 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 6a8fbe6d0242711f2e09b30fc4e57dd808b784bb..3383295b27f9c7ac3452f0edcd083f20ec1fb663 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 7d37c4c0a0ab9fcbf6d4d451ec8a3f363536ae87..fc9da08c76a1e7c393a7b562c6e631ac5136e3ae 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 7b67c41088bf72984d4c04b867e34fdc92123d46..acbe8a981d0dd354d65054932efa7bf11155b1e0 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 bc46970b16e7b04b23828823f3b5806ada5c0448..c7f3c6b576fe5baaf731fdf90ccf0e9c572cde01 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 f9e74290e2124457938c13f2c0ad78ec1346376b..e2107c3e3eeead9bc5034ce53c0ad19e92aabd65 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")