From ae1b1ce99ef48308ef72637cd7e683378e852a99 Mon Sep 17 00:00:00 2001
From: Skylot <skylot@gmail.com>
Date: Wed, 17 May 2023 16:19:18 +0100
Subject: [PATCH] fix(build): use Kotlin with explicit project dependency

---
 build.gradle                                         | 10 ----------
 buildSrc/build.gradle                                |  8 ++++++++
 buildSrc/src/main/groovy/jadx-kotlin.gradle          | 12 ++++++++++++
 jadx-gui/build.gradle                                |  1 +
 jadx-plugins/jadx-kotlin-metadata/build.gradle.kts   |  1 +
 .../kotlin/metadata/utils/KotlinMetadataUtils.kt     |  1 -
 .../jadx/plugins/kotlin/metadata/utils}/LogExt.kt    |  2 +-
 .../plugins/kotlin/metadata/utils/ToStringParser.kt  |  1 -
 jadx-plugins/jadx-script/examples/build.gradle.kts   |  4 ++++
 .../jadx-script/jadx-script-ide/build.gradle.kts     |  4 ++++
 .../jadx-script/jadx-script-plugin/build.gradle.kts  |  1 +
 .../jadx-script/jadx-script-runtime/build.gradle.kts |  1 +
 12 files changed, 33 insertions(+), 13 deletions(-)
 create mode 100644 buildSrc/src/main/groovy/jadx-kotlin.gradle
 rename {jadx-core/src/main/java/jadx/core/utils/log => jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/utils}/LogExt.kt (87%)

diff --git a/build.gradle b/build.gradle
index 04f6d771a..c3fe4271f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,8 +4,6 @@ plugins {
 	id 'com.github.ben-manes.versions' version '0.46.0'
 	id 'se.patrikerdes.use-latest-versions' version '0.2.18'
 	id 'com.diffplug.spotless' version '6.18.0'
-
-	id 'org.jetbrains.kotlin.jvm' version '1.8.21'
 }
 
 ext.jadxVersion = System.getenv('JADX_VERSION') ?: "dev"
@@ -14,7 +12,6 @@ println("jadx version: ${jadxVersion}")
 
 allprojects {
 	apply plugin: 'java'
-	apply plugin: 'kotlin'
 	apply plugin: 'checkstyle'
 	apply plugin: 'com.diffplug.spotless'
 	apply plugin: 'com.github.ben-manes.versions'
@@ -29,13 +26,6 @@ allprojects {
 		options.encoding = "UTF-8"
 	}
 
-	tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask.class)
-			.configureEach {
-				compilerOptions {
-					jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
-				}
-			}
-
 	jar {
 		manifest {
 			mainAttributes('jadx-version': jadxVersion)
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 063791b4c..d2d0b1bb7 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -1,3 +1,11 @@
 plugins {
 	id 'groovy-gradle-plugin'
 }
+
+dependencies {
+	implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21'
+}
+
+repositories {
+	gradlePluginPortal()
+}
diff --git a/buildSrc/src/main/groovy/jadx-kotlin.gradle b/buildSrc/src/main/groovy/jadx-kotlin.gradle
new file mode 100644
index 000000000..27dd994d9
--- /dev/null
+++ b/buildSrc/src/main/groovy/jadx-kotlin.gradle
@@ -0,0 +1,12 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
+
+plugins {
+	id 'org.jetbrains.kotlin.jvm'
+}
+
+tasks.withType(KotlinCompilationTask.class).configureEach {
+	compilerOptions {
+		jvmTarget.set(JvmTarget.JVM_11)
+	}
+}
diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle
index c7ce0ecf9..0aac0b28a 100644
--- a/jadx-gui/build.gradle
+++ b/jadx-gui/build.gradle
@@ -1,4 +1,5 @@
 plugins {
+	id 'jadx-kotlin'
 	id 'application'
 	id 'edu.sc.seis.launch4j' version '2.5.4'
 	id 'com.github.johnrengelman.shadow' version '8.1.1'
diff --git a/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts b/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts
index 190692794..ac86b3534 100644
--- a/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts
+++ b/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
 	id("jadx-library")
+	id("jadx-kotlin")
 }
 
 dependencies {
diff --git a/jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/utils/KotlinMetadataUtils.kt b/jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/utils/KotlinMetadataUtils.kt
index 38da2d469..b1da5b166 100644
--- a/jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/utils/KotlinMetadataUtils.kt
+++ b/jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/utils/KotlinMetadataUtils.kt
@@ -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
diff --git a/jadx-core/src/main/java/jadx/core/utils/log/LogExt.kt b/jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/utils/LogExt.kt
similarity index 87%
rename from jadx-core/src/main/java/jadx/core/utils/log/LogExt.kt
rename to jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/utils/LogExt.kt
index c12180c9a..62e1152dd 100644
--- a/jadx-core/src/main/java/jadx/core/utils/log/LogExt.kt
+++ b/jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/utils/LogExt.kt
@@ -1,4 +1,4 @@
-package jadx.core.utils.log
+package jadx.plugins.kotlin.metadata.utils
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
diff --git a/jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/utils/ToStringParser.kt b/jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/utils/ToStringParser.kt
index ee40bf894..baa696108 100644
--- a/jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/utils/ToStringParser.kt
+++ b/jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/utils/ToStringParser.kt
@@ -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
 
diff --git a/jadx-plugins/jadx-script/examples/build.gradle.kts b/jadx-plugins/jadx-script/examples/build.gradle.kts
index 287fbd97a..bda87e0f0 100644
--- a/jadx-plugins/jadx-script/examples/build.gradle.kts
+++ b/jadx-plugins/jadx-script/examples/build.gradle.kts
@@ -1,3 +1,7 @@
+plugins {
+	id("jadx-kotlin")
+}
+
 dependencies {
 	implementation(project(":jadx-plugins:jadx-script:jadx-script-runtime"))
 
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 dbf32a137..7e155eec3 100644
--- a/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts
+++ b/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts
@@ -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"))
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 da555f312..b3d0c5241 100644
--- a/jadx-plugins/jadx-script/jadx-script-plugin/build.gradle.kts
+++ b/jadx-plugins/jadx-script/jadx-script-plugin/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
 	id("jadx-library")
+	id("jadx-kotlin")
 }
 
 dependencies {
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 b5f912777..07cd80c07 100644
--- a/jadx-plugins/jadx-script/jadx-script-runtime/build.gradle.kts
+++ b/jadx-plugins/jadx-script/jadx-script-runtime/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
 	id("jadx-library")
+	id("jadx-kotlin")
 }
 
 dependencies {