From 1d6ebed7e5696aaa1068058203f87988f057242b Mon Sep 17 00:00:00 2001
From: Skylot <skylot@gmail.com>
Date: Fri, 14 Apr 2023 22:23:23 +0100
Subject: [PATCH] chore: fix spotless apply

---
 build.gradle                                  | 57 ++++++++++---------
 .../examples/scripts/deobf_by_code.jadx.kts   |  2 +-
 .../examples/scripts/options.jadx.kts         |  2 +-
 .../scripts/replace_method_call.jadx.kts      |  6 +-
 4 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0e3111512..5baf2014a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
 
 plugins {
 	id 'com.github.ben-manes.versions' version '0.46.0'
-	id 'com.diffplug.spotless' version '6.17.0'
+	id 'com.diffplug.spotless' version '6.18.0'
 
 	id 'org.jetbrains.kotlin.jvm' version '1.8.20'
 }
@@ -15,6 +15,7 @@ allprojects {
 	apply plugin: 'java'
 	apply plugin: 'kotlin'
 	apply plugin: 'checkstyle'
+	apply plugin: 'com.diffplug.spotless'
 
 	version = jadxVersion
 
@@ -62,37 +63,37 @@ allprojects {
 		mavenCentral()
 		google()
 	}
-}
 
-spotless {
-	java {
-		importOrderFile 'config/code-formatter/eclipse.importorder'
-		eclipse().configFile 'config/code-formatter/eclipse.xml'
-		removeUnusedImports()
+	spotless {
+		java {
+			importOrderFile "$rootDir/config/code-formatter/eclipse.importorder"
+			eclipse().configFile "$rootDir/config/code-formatter/eclipse.xml"
+			removeUnusedImports()
 
-		lineEndings(com.diffplug.spotless.LineEnding.UNIX)
-		encoding("UTF-8")
-		trimTrailingWhitespace()
-		endWithNewline()
-	}
-	kotlin {
-		ktlint()
-				.setUseExperimental(false)
-				.editorConfigOverride([indent_style: "tab"])
+			lineEndings(com.diffplug.spotless.LineEnding.UNIX)
+			encoding("UTF-8")
+			trimTrailingWhitespace()
+			endWithNewline()
+		}
+		kotlin {
+			ktlint()
+					.setUseExperimental(false)
+					.editorConfigOverride([indent_style: "tab"])
 
-		lineEndings(com.diffplug.spotless.LineEnding.UNIX)
-		encoding("UTF-8")
-		trimTrailingWhitespace()
-		endWithNewline()
-	}
-	format 'misc', {
-		target '**/*.gradle', '**/*.xml', '**/.gitignore', '**/.properties'
-		targetExclude ".gradle/**", ".idea/**", "*/build/**"
+			lineEndings(com.diffplug.spotless.LineEnding.UNIX)
+			encoding("UTF-8")
+			trimTrailingWhitespace()
+			endWithNewline()
+		}
+		format 'misc', {
+			target '**/*.gradle', '**/*.xml', '**/.gitignore', '**/.properties'
+			targetExclude ".gradle/**", ".idea/**", "*/build/**"
 
-		lineEndings(com.diffplug.spotless.LineEnding.UNIX)
-		encoding("UTF-8")
-		trimTrailingWhitespace()
-		endWithNewline()
+			lineEndings(com.diffplug.spotless.LineEnding.UNIX)
+			encoding("UTF-8")
+			trimTrailingWhitespace()
+			endWithNewline()
+		}
 	}
 }
 
diff --git a/jadx-plugins/jadx-script/examples/scripts/deobf_by_code.jadx.kts b/jadx-plugins/jadx-script/examples/scripts/deobf_by_code.jadx.kts
index d5787e3a2..f8af3899e 100644
--- a/jadx-plugins/jadx-script/examples/scripts/deobf_by_code.jadx.kts
+++ b/jadx-plugins/jadx-script/examples/scripts/deobf_by_code.jadx.kts
@@ -7,7 +7,7 @@ import jadx.core.dex.nodes.MethodNode
 
 val renamesMap = mapOf(
 	"specificString" to "newMethodName",
-	"AA6" to "aa6Method"
+	"AA6" to "aa6Method",
 )
 
 val jadx = getJadxInstance()
diff --git a/jadx-plugins/jadx-script/examples/scripts/options.jadx.kts b/jadx-plugins/jadx-script/examples/scripts/options.jadx.kts
index 93d554f64..914d900aa 100644
--- a/jadx-plugins/jadx-script/examples/scripts/options.jadx.kts
+++ b/jadx-plugins/jadx-script/examples/scripts/options.jadx.kts
@@ -4,7 +4,7 @@ val testOpt = jadx.options.registerString(
 	"test",
 	"Simple string option",
 	values = listOf("first", "second"),
-	defaultValue = "first"
+	defaultValue = "first",
 )
 
 val numOpt = jadx.options.registerInt("number", "Number option").validate { it >= 0 }
diff --git a/jadx-plugins/jadx-script/examples/scripts/replace_method_call.jadx.kts b/jadx-plugins/jadx-script/examples/scripts/replace_method_call.jadx.kts
index 3a8a4522f..1297c547d 100644
--- a/jadx-plugins/jadx-script/examples/scripts/replace_method_call.jadx.kts
+++ b/jadx-plugins/jadx-script/examples/scripts/replace_method_call.jadx.kts
@@ -14,10 +14,10 @@ import jadx.core.dex.instructions.args.RegisterArg
 
 val jadx = getJadxInstance()
 
+val mthSignature = "com.xshield.aa.iIiIiiiiII(Ljava/lang/String;)Ljava/lang/String;"
+
 jadx.replace.insns { mth, insn ->
-	if (insn is InvokeNode
-		&& insn.callMth.rawFullId == "com.xshield.aa.iIiIiiiiII(Ljava/lang/String;)Ljava/lang/String;"
-	) {
+	if (insn is InvokeNode && insn.callMth.rawFullId == mthSignature) {
 		val str = getConstStr(insn.getArg(0))
 		if (str != null) {
 			val resultStr = decode(str)