chore: update gradle and dependencies

skylot · Aug 31, 2023 · f83ee45 · f83ee45
1 parent f695faf
commit f83ee45
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,6 +22,7 @@ classes/
 idea/
 .gradle/
 node_modules/
+.vscode/
 
 jadx-output/
 *-tmp/

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ import java.util.Locale
 plugins {
 	id("com.github.ben-manes.versions") version "0.47.0"
 	id("se.patrikerdes.use-latest-versions") version "0.2.18"
-	id("com.diffplug.spotless") version "6.20.0"
+	id("com.diffplug.spotless") version "6.21.0"
 }
 
 val jadxVersion by extra { System.getenv("JADX_VERSION") ?: "dev" }

diff --git a/buildSrc/src/main/kotlin/jadx-java.gradle.kts b/buildSrc/src/main/kotlin/jadx-java.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 
 	testImplementation("ch.qos.logback:logback-classic:1.4.11")
 	testImplementation("org.hamcrest:hamcrest-library:2.2")
-	testImplementation("org.mockito:mockito-core:5.4.0")
+	testImplementation("org.mockito:mockito-core:5.5.0")
 	testImplementation("org.assertj:assertj-core:3.24.2")
 
 	testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/jadx-core/build.gradle.kts b/jadx-core/build.gradle.kts
@@ -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:8.1.0-10154469")
-	implementation("com.google.protobuf:protobuf-java:3.24.0") // forcing latest version
+	implementation("com.android.tools.build:aapt2-proto:8.1.1-10154469")
+	implementation("com.google.protobuf:protobuf-java:3.24.2") // forcing latest version
 
 	testImplementation("org.apache.commons:commons-lang3:3.13.0")
 

diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
 	// jadx-script autocomplete support
 	implementation(project(":jadx-plugins:jadx-script:jadx-script-ide"))
 	implementation(project(":jadx-plugins:jadx-script:jadx-script-runtime"))
-	implementation("org.jetbrains.kotlin:kotlin-scripting-common:1.9.0")
+	implementation("org.jetbrains.kotlin:kotlin-scripting-common:1.9.10")
 	implementation("com.fifesoft:autocomplete:3.3.1")
 
 	// use KtLint for format and check jadx scripts
@@ -44,7 +44,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:8.1.0")
+	implementation("com.android.tools.build:apksig:8.1.1")
 	implementation("io.github.skylot:jdwp:2.0.0")
 
 	testImplementation(project(":jadx-core").dependencyProject.sourceSets.getByName("test").output)