diff --git a/build.gradle.kts b/build.gradle.kts index a7ecaa379..14d1f93f9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform import java.util.Locale plugins { - id("com.github.ben-manes.versions") version "0.47.0" + id("com.github.ben-manes.versions") version "0.48.0" id("se.patrikerdes.use-latest-versions") version "0.2.18" id("com.diffplug.spotless") version "6.21.0" } @@ -149,6 +149,6 @@ val dist by tasks.registering { val cleanBuildDir by tasks.registering(Delete::class) { group = "jadx" - delete(buildDir) + delete(layout.buildDirectory) } tasks.getByName("clean").dependsOn(cleanBuildDir) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 2a0e49279..3f4a1cac8 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10") } repositories { diff --git a/buildSrc/src/main/kotlin/jadx-java.gradle.kts b/buildSrc/src/main/kotlin/jadx-java.gradle.kts index f6e4972ff..dc2dd8ab4 100644 --- a/buildSrc/src/main/kotlin/jadx-java.gradle.kts +++ b/buildSrc/src/main/kotlin/jadx-java.gradle.kts @@ -11,7 +11,7 @@ group = "io.github.skylot" version = jadxVersion dependencies { - implementation("org.slf4j:slf4j-api:2.0.7") + implementation("org.slf4j:slf4j-api:2.0.9") compileOnly("org.jetbrains:annotations:24.0.1") testImplementation("ch.qos.logback:logback-classic:1.4.11") diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts index ab76f309a..e11b7aaf3 100644 --- a/jadx-gui/build.gradle.kts +++ b/jadx-gui/build.gradle.kts @@ -21,8 +21,8 @@ dependencies { implementation("com.fifesoft:autocomplete:3.3.1") // use KtLint for format and check jadx scripts - implementation("com.pinterest.ktlint:ktlint-rule-engine:0.50.0") - implementation("com.pinterest.ktlint:ktlint-ruleset-standard:0.50.0") + implementation("com.pinterest.ktlint:ktlint-rule-engine:1.0.0") + implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.0.0") implementation("com.beust:jcommander:1.82") implementation("ch.qos.logback:logback-classic:1.4.11") @@ -32,9 +32,9 @@ dependencies { implementation(files("libs/jfontchooser-1.0.5.jar")) implementation("hu.kazocsaba:image-viewer:1.2.3") - implementation("com.formdev:flatlaf:3.2") - implementation("com.formdev:flatlaf-intellij-themes:3.2") - implementation("com.formdev:flatlaf-extras:3.2") + implementation("com.formdev:flatlaf:3.2.1") + implementation("com.formdev:flatlaf-intellij-themes:3.2.1") + implementation("com.formdev:flatlaf-extras:3.2.1") implementation("com.formdev:svgSalamander:1.1.4") implementation("com.google.code.gson:gson:2.10.1") @@ -99,22 +99,22 @@ tasks.existing(CreateStartScripts::class) { } launch4j { - mainClassName = application.mainClass.get() + mainClassName.set(application.mainClass.get()) copyConfigurable.set(listOf()) setJarTask(tasks.shadowJar.get()) - icon = "$projectDir/src/main/resources/logos/jadx-logo.ico" - outfile = "jadx-gui-$jadxVersion.exe" - copyright = "Skylot" - windowTitle = "jadx" - companyName = "jadx" - jreMinVersion = "11" - jvmOptions = application.applicationDefaultJvmArgs.toSet() - requires64Bit = true - initialHeapPercent = 5 - maxHeapSize = 4096 - maxHeapPercent = 70 - downloadUrl = "https://www.oracle.com/java/technologies/downloads/#jdk17-windows" - bundledJrePath = if (project.hasProperty("bundleJRE")) "%EXEDIR%/jre" else "%JAVA_HOME%" + icon.set("$projectDir/src/main/resources/logos/jadx-logo.ico") + outfile.set("jadx-gui-$jadxVersion.exe") + copyright.set("Skylot") + windowTitle.set("jadx") + companyName.set("jadx") + jreMinVersion.set("11") + jvmOptions.set(application.applicationDefaultJvmArgs.toSet()) + requires64Bit.set(true) + initialHeapPercent.set(5) + maxHeapSize.set(4096) + maxHeapPercent.set(70) + downloadUrl.set("https://www.oracle.com/java/technologies/downloads/#jdk17-windows") + bundledJrePath.set(if (project.hasProperty("bundleJRE")) "%EXEDIR%/jre" else "%JAVA_HOME%") } runtime { @@ -144,7 +144,7 @@ val copyDistWinWithJre by tasks.registering(Copy::class) { from(tasks.named("createExe").get().outputs) { include("*.exe") } - into(File(buildDir, "jadx-gui-$jadxVersion-with-jre-win")) + into(layout.buildDirectory.dir("jadx-gui-$jadxVersion-with-jre-win")) duplicatesStrategy = DuplicatesStrategy.EXCLUDE } @@ -155,7 +155,7 @@ val distWinWithJre by tasks.registering(Zip::class) { from(copyDistWinWithJre.get().outputs) { include("**/*") } - into(buildDir) + into(layout.buildDirectory) duplicatesStrategy = DuplicatesStrategy.EXCLUDE } diff --git a/jadx-gui/src/main/java/jadx/gui/plugins/script/KtLintUtils.kt b/jadx-gui/src/main/java/jadx/gui/plugins/script/KtLintUtils.kt index 3fd1ce386..c248b1c32 100644 --- a/jadx-gui/src/main/java/jadx/gui/plugins/script/KtLintUtils.kt +++ b/jadx-gui/src/main/java/jadx/gui/plugins/script/KtLintUtils.kt @@ -3,6 +3,8 @@ package jadx.gui.plugins.script import com.pinterest.ktlint.rule.engine.api.Code import com.pinterest.ktlint.rule.engine.api.EditorConfigOverride import com.pinterest.ktlint.rule.engine.api.KtLintRuleEngine +import com.pinterest.ktlint.rule.engine.core.api.editorconfig.CODE_STYLE_PROPERTY +import com.pinterest.ktlint.rule.engine.core.api.editorconfig.CodeStyleValue import com.pinterest.ktlint.rule.engine.core.api.editorconfig.INDENT_STYLE_PROPERTY import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider import org.ec4j.core.model.PropertyType @@ -17,6 +19,7 @@ object KtLintUtils { KtLintRuleEngine( ruleProviders = StandardRuleSetProvider().getRuleProviders(), editorConfigOverride = EditorConfigOverride.from( + CODE_STYLE_PROPERTY to CodeStyleValue.intellij_idea, INDENT_STYLE_PROPERTY to PropertyType.IndentStyleValue.tab, ), )