diff --git a/buildSrc/src/main/kotlin/jadx-java.gradle.kts b/buildSrc/src/main/kotlin/jadx-java.gradle.kts index 9910029fb..bcb831b3e 100644 --- a/buildSrc/src/main/kotlin/jadx-java.gradle.kts +++ b/buildSrc/src/main/kotlin/jadx-java.gradle.kts @@ -11,15 +11,15 @@ group = "io.github.skylot" version = jadxVersion dependencies { - implementation("org.slf4j:slf4j-api:2.0.11") + implementation("org.slf4j:slf4j-api:2.0.12") compileOnly("org.jetbrains:annotations:24.1.0") testImplementation("ch.qos.logback:logback-classic:1.4.14") testImplementation("org.hamcrest:hamcrest-library:2.2") testImplementation("org.mockito:mockito-core:5.10.0") - testImplementation("org.assertj:assertj-core:3.25.2") + testImplementation("org.assertj:assertj-core:3.25.3") - testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") + testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") testRuntimeOnly("org.junit.platform:junit-platform-launcher") testCompileOnly("org.jetbrains:annotations:24.1.0") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135c4..d64cd4917 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 db8c3baaf..4baf5a11d 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=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 93e3f59f1..25da30dbd 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/jadx-plugins/jadx-dex-input/build.gradle.kts b/jadx-plugins/jadx-dex-input/build.gradle.kts index f4213eb5e..89828ac78 100644 --- a/jadx-plugins/jadx-dex-input/build.gradle.kts +++ b/jadx-plugins/jadx-dex-input/build.gradle.kts @@ -6,13 +6,13 @@ dependencies { api(project(":jadx-core")) // TODO: finish own smali printer - implementation("com.android.tools.smali:smali-baksmali:3.0.3") { + implementation("com.android.tools.smali:smali-baksmali:3.0.4") { exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace } implementation("com.google.guava:guava:33.0.0-jre") // force the latest version for smali // compile smali files in tests - testImplementation("com.android.tools.smali:smali:3.0.3") { + testImplementation("com.android.tools.smali:smali:3.0.4") { exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace } } diff --git a/jadx-plugins/jadx-smali-input/build.gradle.kts b/jadx-plugins/jadx-smali-input/build.gradle.kts index e155b2077..7da62d6c6 100644 --- a/jadx-plugins/jadx-smali-input/build.gradle.kts +++ b/jadx-plugins/jadx-smali-input/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { implementation(project(":jadx-plugins:jadx-dex-input")) - implementation("com.android.tools.smali:smali:3.0.3") { + implementation("com.android.tools.smali:smali:3.0.4") { exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace } implementation("com.google.guava:guava:33.0.0-jre") // force the latest version for smali