diff --git a/build.gradle b/build.gradle index 5baf2014a..fa16739e2 100644 --- a/build.gradle +++ b/build.gradle @@ -42,9 +42,9 @@ allprojects { implementation 'org.slf4j:slf4j-api:2.0.7' compileOnly 'org.jetbrains:annotations:24.0.1' - testImplementation 'ch.qos.logback:logback-classic:1.4.6' + testImplementation 'ch.qos.logback:logback-classic:1.4.7' testImplementation 'org.hamcrest:hamcrest-library:2.2' - testImplementation 'org.mockito:mockito-core:5.2.0' + testImplementation 'org.mockito:mockito-core:5.3.0' testImplementation 'org.assertj:assertj-core:3.24.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba771..c1962a79e 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 19acfb4ef..8196ca199 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=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionSha256Sum=a62c5f99585dd9e1f95dab7b9415a0e698fa9dd1e6c38537faa81ac078f4d23e +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 79a61d421..aeb74cbb4 100755 --- a/gradlew +++ b/gradlew @@ -85,9 +85,6 @@ done APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in diff --git a/jadx-cli/build.gradle b/jadx-cli/build.gradle index 839bed340..7863d756d 100644 --- a/jadx-cli/build.gradle +++ b/jadx-cli/build.gradle @@ -12,7 +12,7 @@ dependencies { runtimeOnly(project(':jadx-plugins:jadx-script:jadx-script-plugin')) implementation 'com.beust:jcommander:1.82' - implementation 'ch.qos.logback:logback-classic:1.4.6' + implementation 'ch.qos.logback:logback-classic:1.4.7' } application { diff --git a/jadx-core/build.gradle b/jadx-core/build.gradle index 6138db2ff..0bf65febe 100644 --- a/jadx-core/build.gradle +++ b/jadx-core/build.gradle @@ -8,8 +8,8 @@ dependencies { implementation 'com.google.code.gson:gson:2.10.1' // TODO: move resources decoding to separate plugin module - implementation 'com.android.tools.build:aapt2-proto:7.4.2-8841542' - implementation 'com.google.protobuf:protobuf-java:3.22.2' // forcing latest version + implementation 'com.android.tools.build:aapt2-proto:8.0.0-9289358' + implementation 'com.google.protobuf:protobuf-java:3.22.3' // forcing latest version testImplementation 'org.apache.commons:commons-lang3:3.12.0' diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle index b9c86c748..f58714752 100644 --- a/jadx-gui/build.gradle +++ b/jadx-gui/build.gradle @@ -23,16 +23,16 @@ dependencies { implementation 'com.pinterest.ktlint:ktlint-ruleset-standard:0.48.2' implementation 'com.beust:jcommander:1.82' - implementation 'ch.qos.logback:logback-classic:1.4.6' + implementation 'ch.qos.logback:logback-classic:1.4.7' implementation 'dev.dirs:directories:26' implementation 'com.fifesoft:rsyntaxtextarea:3.3.3' implementation files('libs/jfontchooser-1.0.5.jar') implementation 'hu.kazocsaba:image-viewer:1.2.3' - implementation 'com.formdev:flatlaf:3.1' - implementation 'com.formdev:flatlaf-intellij-themes:3.1' - implementation 'com.formdev:flatlaf-extras:3.1' + implementation 'com.formdev:flatlaf:3.1.1' + implementation 'com.formdev:flatlaf-intellij-themes:3.1.1' + implementation 'com.formdev:flatlaf-extras:3.1.1' implementation 'com.formdev:svgSalamander:1.1.4' implementation 'com.google.code.gson:gson:2.10.1' @@ -41,7 +41,7 @@ dependencies { implementation 'io.reactivex.rxjava2:rxjava:2.2.21' implementation "com.github.akarnokd:rxjava2-swing:0.3.7" - implementation 'com.android.tools.build:apksig:7.4.2' + implementation 'com.android.tools.build:apksig:8.0.0' implementation 'io.github.skylot:jdwp:2.0.0' testImplementation project(":jadx-core").sourceSets.test.output