fix(build): use Kotlin with explicit project dependency

2023-05-17 16:19:18 +01:00
parent 5d3c96ead2
commit ae1b1ce99e
12 changed files with 33 additions and 13 deletions
@@ -1,5 +1,6 @@
 plugins {
 	id("jadx-library")
+	id("jadx-kotlin")
 }

 dependencies {
@@ -5,7 +5,6 @@ import jadx.core.dex.attributes.nodes.RenameReasonAttr
 import jadx.core.dex.nodes.ClassNode
 import jadx.core.dex.nodes.MethodNode
 import jadx.core.utils.Utils
-import jadx.core.utils.log.LOG
 import jadx.plugins.kotlin.metadata.model.ClassAliasRename
 import jadx.plugins.kotlin.metadata.model.CompanionRename
 import jadx.plugins.kotlin.metadata.model.FieldRename
@@ -0,0 +1,10 @@
+package jadx.plugins.kotlin.metadata.utils
+
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+inline val <reified T : Any> T.LOG: Logger get() = LoggerFactory.getLogger(T::class.java)
+
+inline fun <reified T : Any, R> T.runCatchingLog(msg: String? = null, block: () -> R) =
+	runCatching(block)
+		.onFailure { LOG.error(msg.orEmpty(), it) }
@@ -14,7 +14,6 @@ import jadx.core.dex.nodes.BlockNode
 import jadx.core.dex.nodes.InsnNode
 import jadx.core.dex.nodes.MethodNode
 import jadx.core.utils.BlockUtils
-import jadx.core.utils.log.LOG
 import jadx.plugins.kotlin.metadata.model.FieldRename
 import jadx.plugins.kotlin.metadata.model.ToStringRename

@@ -1,3 +1,7 @@
+plugins {
+	id("jadx-kotlin")
+}
+
 dependencies {
 	implementation(project(":jadx-plugins:jadx-script:jadx-script-runtime"))

@@ -1,3 +1,7 @@
+plugins {
+	id("jadx-kotlin")
+}
+
 dependencies {
 	implementation(project(":jadx-plugins:jadx-script:jadx-script-runtime"))
 	implementation(project(":jadx-plugins:jadx-script:jadx-script-plugin"))
@@ -1,5 +1,6 @@
 plugins {
 	id("jadx-library")
+	id("jadx-kotlin")
 }

 dependencies {
@@ -1,5 +1,6 @@
 plugins {
 	id("jadx-library")
+	id("jadx-kotlin")
 }

 dependencies {