From fbb6aa580e545a0e61c52e4e810b04d01cfa2faa Mon Sep 17 00:00:00 2001 From: Ohad Shai Date: Sun, 30 Jul 2023 21:02:56 +0300 Subject: [PATCH] chore: upgrade to kotlin-logging 5 (PR #1966) * upgrade to kotlin-logging 5 * apply code autoformatting * resolve deprecation warnings --------- Co-authored-by: Skylot --- jadx-plugins/jadx-script/examples/build.gradle.kts | 2 +- jadx-plugins/jadx-script/examples/context/Stubs.kt | 2 +- jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts | 2 +- jadx-plugins/jadx-script/jadx-script-plugin/build.gradle.kts | 2 +- jadx-plugins/jadx-script/jadx-script-runtime/build.gradle.kts | 2 +- .../kotlin/jadx/plugins/script/runtime/JadxScriptTemplate.kt | 4 ++-- .../main/kotlin/jadx/plugins/script/runtime/ScriptRuntime.kt | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jadx-plugins/jadx-script/examples/build.gradle.kts b/jadx-plugins/jadx-script/examples/build.gradle.kts index e565baadc..8360bbe7b 100644 --- a/jadx-plugins/jadx-script/examples/build.gradle.kts +++ b/jadx-plugins/jadx-script/examples/build.gradle.kts @@ -8,7 +8,7 @@ dependencies { implementation(kotlin("stdlib-common")) implementation(kotlin("script-runtime")) - implementation("io.github.microutils:kotlin-logging-jvm:3.0.5") + implementation("io.github.oshai:kotlin-logging-jvm:5.0.1") // script context support in IDE is poor, use stubs and manual imports for now // kotlinScriptDef(project(":jadx-plugins:jadx-script:jadx-script-runtime")) diff --git a/jadx-plugins/jadx-script/examples/context/Stubs.kt b/jadx-plugins/jadx-script/examples/context/Stubs.kt index 310aca102..3532b08de 100644 --- a/jadx-plugins/jadx-script/examples/context/Stubs.kt +++ b/jadx-plugins/jadx-script/examples/context/Stubs.kt @@ -1,7 +1,7 @@ @file:Suppress("MayBeConstant", "unused") +import io.github.oshai.kotlinlogging.KotlinLogging import jadx.plugins.script.runtime.JadxScriptInstance -import mu.KotlinLogging /** * Stubs for JadxScriptBaseClass script super class diff --git a/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts b/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts index 5e30d1bfa..9ec2b62c3 100644 --- a/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts +++ b/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts @@ -12,5 +12,5 @@ dependencies { implementation(kotlin("scripting-ide-services")) implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") - implementation("io.github.microutils:kotlin-logging-jvm:3.0.5") + implementation("io.github.oshai:kotlin-logging-jvm:5.0.1") } diff --git a/jadx-plugins/jadx-script/jadx-script-plugin/build.gradle.kts b/jadx-plugins/jadx-script/jadx-script-plugin/build.gradle.kts index 27aaa7107..ebdde15c0 100644 --- a/jadx-plugins/jadx-script/jadx-script-plugin/build.gradle.kts +++ b/jadx-plugins/jadx-script/jadx-script-plugin/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { implementation(kotlin("scripting-jvm")) implementation(kotlin("scripting-jvm-host")) - implementation("io.github.microutils:kotlin-logging-jvm:3.0.5") + implementation("io.github.oshai:kotlin-logging-jvm:5.0.1") testImplementation(project(":jadx-core")) } diff --git a/jadx-plugins/jadx-script/jadx-script-runtime/build.gradle.kts b/jadx-plugins/jadx-script/jadx-script-runtime/build.gradle.kts index 27dea5ac3..ac4f1efc0 100644 --- a/jadx-plugins/jadx-script/jadx-script-runtime/build.gradle.kts +++ b/jadx-plugins/jadx-script/jadx-script-runtime/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { implementation(kotlin("scripting-dependencies-maven")) implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") - implementation("io.github.microutils:kotlin-logging-jvm:3.0.5") + implementation("io.github.oshai:kotlin-logging-jvm:5.0.1") runtimeOnly(project(":jadx-plugins:jadx-dex-input")) runtimeOnly(project(":jadx-plugins:jadx-smali-input")) diff --git a/jadx-plugins/jadx-script/jadx-script-runtime/src/main/kotlin/jadx/plugins/script/runtime/JadxScriptTemplate.kt b/jadx-plugins/jadx-script/jadx-script-runtime/src/main/kotlin/jadx/plugins/script/runtime/JadxScriptTemplate.kt index 160054a28..30a8ff5fc 100644 --- a/jadx-plugins/jadx-script/jadx-script-runtime/src/main/kotlin/jadx/plugins/script/runtime/JadxScriptTemplate.kt +++ b/jadx-plugins/jadx-script/jadx-script-runtime/src/main/kotlin/jadx/plugins/script/runtime/JadxScriptTemplate.kt @@ -44,11 +44,11 @@ abstract class JadxScriptTemplate( fun getJadxInstance() = scriptInstance fun println(message: Any?) { - log.info(message?.toString()) + log.info { message } } fun print(message: Any?) { - log.info(message?.toString()) + log.info { message } } } diff --git a/jadx-plugins/jadx-script/jadx-script-runtime/src/main/kotlin/jadx/plugins/script/runtime/ScriptRuntime.kt b/jadx-plugins/jadx-script/jadx-script-runtime/src/main/kotlin/jadx/plugins/script/runtime/ScriptRuntime.kt index 502057216..fcfa05617 100644 --- a/jadx-plugins/jadx-script/jadx-script-runtime/src/main/kotlin/jadx/plugins/script/runtime/ScriptRuntime.kt +++ b/jadx-plugins/jadx-script/jadx-script-runtime/src/main/kotlin/jadx/plugins/script/runtime/ScriptRuntime.kt @@ -3,6 +3,8 @@ package jadx.plugins.script.runtime +import io.github.oshai.kotlinlogging.KLogger +import io.github.oshai.kotlinlogging.KotlinLogging import jadx.api.JadxArgs import jadx.api.JadxDecompiler import jadx.api.JavaClass @@ -18,8 +20,6 @@ import jadx.plugins.script.runtime.data.Rename import jadx.plugins.script.runtime.data.Replace import jadx.plugins.script.runtime.data.Search import jadx.plugins.script.runtime.data.Stages -import mu.KLogger -import mu.KotlinLogging import java.io.File const val JADX_SCRIPT_LOG_PREFIX = "JadxScript:"