From 406cb461708a7eae3b99f335b2183e0acbe88748 Mon Sep 17 00:00:00 2001
From: Mitchell Syer <Mitchellptbo@gmail.com>
Date: Sun, 5 Feb 2023 13:51:35 -0500
Subject: [PATCH] Fix logging and update system try (#488)

- Dorkbox SystemTray now automatically adds its shutdown hook, and removed the manual function
---
 gradle/libs.versions.toml                          | 14 +++++---------
 .../suwayomi/tachidesk/server/util/SystemTray.kt   |  2 --
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 90f9c4af..425b075f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,13 +28,9 @@ serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-jso
 serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "serialization" }
 
 # Logging
-# Stuck on old versions since
-# 1. Logback 1.3.0+ requires Java 9
-# 2. Slf4j 2.0.0+ doesn't register older versions of Logback
-# 3. Kotlin-logging 3.0.2+ requires Java 11, but this is probably a bug
-slf4japi = "org.slf4j:slf4j-api:1.7.32"
-logback = "ch.qos.logback:logback-classic:1.2.6"
-kotlinlogging = "io.github.microutils:kotlin-logging:2.1.21"
+slf4japi = "org.slf4j:slf4j-api:2.0.6"
+logback = "ch.qos.logback:logback-classic:1.3.5"
+kotlinlogging = "io.github.microutils:kotlin-logging:3.0.5"
 
 # OkHttp
 okhttp-core = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
@@ -63,8 +59,8 @@ exposed-migrations = "com.github.Suwayomi:exposed-migrations:3.2.0"
 kodein = "org.kodein.di:kodein-di-conf-jvm:7.15.0"
 
 # tray icon
-systemtray-core = "com.dorkbox:SystemTray:4.1"
-systemtray-utils = "com.dorkbox:Utilities:1.9" # version locked by SystemTray
+systemtray-core = "com.dorkbox:SystemTray:4.2.1"
+systemtray-utils = "com.dorkbox:Utilities:1.39" # version locked by SystemTray
 systemtray-desktop = "com.dorkbox:Desktop:1.0"
 
 # dependencies of Tachiyomi extensions
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/util/SystemTray.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/util/SystemTray.kt
index ac3439b1..978f6307 100644
--- a/server/src/main/kotlin/suwayomi/tachidesk/server/util/SystemTray.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/server/util/SystemTray.kt
@@ -51,8 +51,6 @@ object SystemTray {
                 }
             )
 
-            systemTray.installShutdownHook()
-
             return systemTray
         } catch (e: Exception) {
             e.printStackTrace()