From 3f7e88f82bbf2097fc1dd630ca297d437d56715e Mon Sep 17 00:00:00 2001 From: Syer10 Date: Tue, 1 Jun 2021 17:58:17 -0400 Subject: [PATCH] Update Darklaf --- build.gradle.kts | 9 +++++---- buildSrc/build.gradle.kts | 6 ------ src/main/kotlin/ca/gosyer/ui/main/main.kt | 9 ++++++++- 3 files changed, 13 insertions(+), 11 deletions(-) delete mode 100644 buildSrc/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts index 7a3f4efa..ed2bcc3d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { id("org.jetbrains.compose") version "0.4.0" id("de.fuerstenau.buildconfig") version "1.1.8" id("org.jmailen.kotlinter") version "3.4.4" - id("com.github.ben-manes.versions") version "0.38.0" + id("com.github.ben-manes.versions") version "0.39.0" } group = "ca.gosyer" @@ -32,7 +32,7 @@ dependencies { implementation("ca.gosyer:accompanist-pager:0.9.1") // UI (Swing) - implementation("com.github.weisj:darklaf-core:2.5.5") + implementation("com.github.weisj:darklaf-core:2.6.1") // Threading val coroutinesVersion = "1.5.0" @@ -43,8 +43,9 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.1") // Dependency Injection - implementation("com.github.stephanenicolas.toothpick:ktp:3.1.0") - kapt("com.github.stephanenicolas.toothpick:toothpick-compiler:3.1.0") + val toothpickVersion = "3.1.0" + implementation("com.github.stephanenicolas.toothpick:ktp:$toothpickVersion") + kapt("com.github.stephanenicolas.toothpick:toothpick-compiler:$toothpickVersion") // Http client val ktorVersion = "1.6.0" diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts deleted file mode 100644 index aebe2615..00000000 --- a/buildSrc/build.gradle.kts +++ /dev/null @@ -1,6 +0,0 @@ -plugins { - `kotlin-dsl` -} -repositories { - mavenCentral() -} diff --git a/src/main/kotlin/ca/gosyer/ui/main/main.kt b/src/main/kotlin/ca/gosyer/ui/main/main.kt index 4294f5c2..a7cc43c0 100644 --- a/src/main/kotlin/ca/gosyer/ui/main/main.kt +++ b/src/main/kotlin/ca/gosyer/ui/main/main.kt @@ -37,6 +37,7 @@ import org.apache.logging.log4j.core.config.Configurator import toothpick.configuration.Configuration import toothpick.ktp.KTP import toothpick.ktp.extension.getInstance +import java.util.logging.Level @OptIn(DelicateCoroutinesApi::class) fun main() { @@ -72,7 +73,13 @@ fun main() { ThemeMode.Light -> IntelliJTheme() ThemeMode.Dark -> DarculaTheme() } - LafManager.enableLogging(BuildConfig.DEBUG) + LafManager.setLogLevel( + if (BuildConfig.DEBUG) { + Level.FINE + } else { + Level.WARNING + } + ) withUIContext { LafManager.install(theme) }