diff --git a/build.gradle.kts b/build.gradle.kts index 7e4d28a96..baf2375df 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ import java.util.Locale plugins { id("com.github.ben-manes.versions") version "0.52.0" - id("se.patrikerdes.use-latest-versions") version "0.2.18" + id("se.patrikerdes.use-latest-versions") version "0.2.19" id("com.diffplug.spotless") version "6.25.0" } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index ff9e7e360..22655b9ad 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.20") implementation("org.openrewrite:plugin:6.19.1") } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55ba..8bdaf60c7 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 78cb6e16a..6a38a8cea 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 23d15a936..adff685a0 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index db3a6ac20..c4bdd3ab8 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/jadx-core/build.gradle.kts b/jadx-core/build.gradle.kts index 2d0bb8d37..d1b038346 100644 --- a/jadx-core/build.gradle.kts +++ b/jadx-core/build.gradle.kts @@ -6,7 +6,7 @@ dependencies { api(project(":jadx-plugins:jadx-input-api")) api(project(":jadx-commons:jadx-zip")) - implementation("com.google.code.gson:gson:2.13.1") + implementation("com.google.code.gson:gson:2.13.2") testImplementation("org.apache.commons:commons-lang3:3.18.0") @@ -22,7 +22,7 @@ dependencies { strictly("[3.33, 3.34[") // from 3.34 compiled with Java 17 } } - testImplementation("tools.profiler:async-profiler:4.0") + testImplementation("tools.profiler:async-profiler:4.1") } val jadxTestJavaVersion = getTestJavaVersion() diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts index b9d64ae71..a309411e1 100644 --- a/jadx-gui/build.gradle.kts +++ b/jadx-gui/build.gradle.kts @@ -2,8 +2,8 @@ plugins { id("jadx-kotlin") id("application") id("jadx-library") - id("edu.sc.seis.launch4j") version "3.0.6" id("com.gradleup.shadow") version "8.3.8" + id("edu.sc.seis.launch4j") version "4.0.0" id("org.beryx.runtime") version "1.13.1" } @@ -23,12 +23,12 @@ dependencies { implementation("com.fifesoft:autocomplete:3.3.2") // use KtLint for format and check jadx scripts - implementation("com.pinterest.ktlint:ktlint-rule-engine:1.7.0") - implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.7.0") + implementation("com.pinterest.ktlint:ktlint-rule-engine:1.7.1") + implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.7.1") implementation("org.jcommander:jcommander:2.0") implementation("ch.qos.logback:logback-classic:1.5.18") - implementation("io.github.oshai:kotlin-logging-jvm:7.0.7") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.13") implementation("com.fifesoft:rsyntaxtextarea:3.6.0") implementation("org.drjekyll:fontchooser:3.1.0") @@ -39,14 +39,14 @@ dependencies { implementation("com.formdev:flatlaf-intellij-themes:3.6.1") implementation("com.formdev:flatlaf-extras:3.6.1") - implementation("com.google.code.gson:gson:2.13.1") + implementation("com.google.code.gson:gson:2.13.2") implementation("org.apache.commons:commons-lang3:3.18.0") - implementation("org.apache.commons:commons-text:1.13.1") + implementation("org.apache.commons:commons-text:1.14.0") implementation("commons-io:commons-io:2.20.0") implementation("io.reactivex.rxjava3:rxjava:3.1.11") implementation("com.github.akarnokd:rxjava3-swing:3.1.1") - implementation("com.android.tools.build:apksig:8.11.1") + implementation("com.android.tools.build:apksig:8.13.0") implementation("io.github.skylot:jdwp:2.0.0") // Library for hex viewing data diff --git a/jadx-plugins-tools/build.gradle.kts b/jadx-plugins-tools/build.gradle.kts index 6288354e7..1edbd7c2b 100644 --- a/jadx-plugins-tools/build.gradle.kts +++ b/jadx-plugins-tools/build.gradle.kts @@ -7,5 +7,5 @@ dependencies { implementation(project(":jadx-commons:jadx-app-commons")) - implementation("com.google.code.gson:gson:2.13.1") + implementation("com.google.code.gson:gson:2.13.2") } diff --git a/jadx-plugins/jadx-aab-input/build.gradle.kts b/jadx-plugins/jadx-aab-input/build.gradle.kts index ab1a1eebb..1159f1ac2 100644 --- a/jadx-plugins/jadx-aab-input/build.gradle.kts +++ b/jadx-plugins/jadx-aab-input/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { compileOnly(project(":jadx-core")) - implementation("com.android.tools.build:aapt2-proto:8.11.1-12782657") + implementation("com.android.tools.build:aapt2-proto:8.13.0-13719691") implementation("com.google.protobuf:protobuf-java") { version { require("3.25.3") // version 4 conflict with `aapt2-proto` diff --git a/jadx-plugins/jadx-apkm-input/build.gradle.kts b/jadx-plugins/jadx-apkm-input/build.gradle.kts index 9bfa50e1e..59445de72 100644 --- a/jadx-plugins/jadx-apkm-input/build.gradle.kts +++ b/jadx-plugins/jadx-apkm-input/build.gradle.kts @@ -7,5 +7,5 @@ dependencies { api(project(":jadx-core")) implementation(project(":jadx-plugins:jadx-dex-input")) - implementation("com.google.code.gson:gson:2.13.1") + implementation("com.google.code.gson:gson:2.13.2") } diff --git a/jadx-plugins/jadx-dex-input/build.gradle.kts b/jadx-plugins/jadx-dex-input/build.gradle.kts index fbbd437a0..b51fc2724 100644 --- a/jadx-plugins/jadx-dex-input/build.gradle.kts +++ b/jadx-plugins/jadx-dex-input/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { implementation("com.android.tools.smali:smali-baksmali:3.0.9") { exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace } - implementation("com.google.guava:guava:33.4.8-jre") // force the latest version for smali + implementation("com.google.guava:guava:33.5.0-jre") // force the latest version for smali // compile smali files in tests testImplementation("com.android.tools.smali:smali:3.0.9") { diff --git a/jadx-plugins/jadx-java-convert/build.gradle.kts b/jadx-plugins/jadx-java-convert/build.gradle.kts index daf171346..7c6611776 100644 --- a/jadx-plugins/jadx-java-convert/build.gradle.kts +++ b/jadx-plugins/jadx-java-convert/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { implementation(project(":jadx-plugins:jadx-dex-input")) implementation("com.jakewharton.android.repackaged:dalvik-dx:14.0.0_r21") - implementation("com.android.tools:r8:8.9.35") + implementation("com.android.tools:r8:8.11.18") implementation("org.ow2.asm:asm:9.8") } diff --git a/jadx-plugins/jadx-script/examples/build.gradle.kts b/jadx-plugins/jadx-script/examples/build.gradle.kts index 2fa5432aa..22f812119 100644 --- a/jadx-plugins/jadx-script/examples/build.gradle.kts +++ b/jadx-plugins/jadx-script/examples/build.gradle.kts @@ -8,14 +8,14 @@ dependencies { implementation(kotlin("stdlib-common")) implementation(kotlin("script-runtime")) - implementation("io.github.oshai:kotlin-logging-jvm:7.0.7") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.13") // script context support in IDE is poor, use stubs and manual imports for now // kotlinScriptDef(project(":jadx-plugins:jadx-script:jadx-script-runtime")) // manual imports (IDE can't import dependencies by scripts annotations) implementation("com.github.javafaker:javafaker:1.0.2") - implementation("org.apache.commons:commons-text:1.13.1") + implementation("org.apache.commons:commons-text:1.14.0") } sourceSets { 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 f2c281e3b..235601cab 100644 --- a/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts +++ b/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts @@ -13,5 +13,5 @@ dependencies { implementation(kotlin("scripting-ide-services")) implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2") - implementation("io.github.oshai:kotlin-logging-jvm:7.0.7") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.13") } 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 3c03d37ef..8e1bbdc89 100644 --- a/jadx-plugins/jadx-script/jadx-script-plugin/build.gradle.kts +++ b/jadx-plugins/jadx-script/jadx-script-plugin/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { implementation(kotlin("scripting-jvm")) implementation(kotlin("scripting-jvm-host")) - implementation("io.github.oshai:kotlin-logging-jvm:7.0.7") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.13") 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 4659355bb..b23a3799d 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.10.2") - implementation("io.github.oshai:kotlin-logging-jvm:7.0.7") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.13") runtimeOnly(project(":jadx-plugins:jadx-dex-input")) runtimeOnly(project(":jadx-plugins:jadx-smali-input")) diff --git a/jadx-plugins/jadx-smali-input/build.gradle.kts b/jadx-plugins/jadx-smali-input/build.gradle.kts index 1edbdd491..baba5e7df 100644 --- a/jadx-plugins/jadx-smali-input/build.gradle.kts +++ b/jadx-plugins/jadx-smali-input/build.gradle.kts @@ -10,5 +10,5 @@ dependencies { implementation("com.android.tools.smali:smali:3.0.9") { exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace } - implementation("com.google.guava:guava:33.4.8-jre") // force the latest version for smali + implementation("com.google.guava:guava:33.5.0-jre") // force the latest version for smali } diff --git a/jadx-plugins/jadx-xapk-input/build.gradle.kts b/jadx-plugins/jadx-xapk-input/build.gradle.kts index cadb23faa..587ccbebc 100644 --- a/jadx-plugins/jadx-xapk-input/build.gradle.kts +++ b/jadx-plugins/jadx-xapk-input/build.gradle.kts @@ -6,5 +6,5 @@ dependencies { api(project(":jadx-core")) implementation(project(":jadx-plugins:jadx-dex-input")) - implementation("com.google.code.gson:gson:2.13.1") + implementation("com.google.code.gson:gson:2.13.2") } diff --git a/settings.gradle.kts b/settings.gradle.kts index 476c004c7..aaec6aae4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0") + id("org.gradle.toolchains.foojay-resolver-convention") version ("1.0.0") } if (!JavaVersion.current().isJava11Compatible) {