From 778106c41b5935f5317532ad14553e64efcb68e7 Mon Sep 17 00:00:00 2001
From: Skylot <skylot@gmail.com>
Date: Fri, 8 Jan 2021 15:41:43 +0000
Subject: [PATCH] chore: update gradle and java dependencies

---
 build.gradle                                | 10 +++++-----
 gradle/wrapper/gradle-wrapper.properties    |  2 +-
 jadx-gui/build.gradle                       | 10 +++++-----
 jadx-plugins/jadx-dex-input/build.gradle    |  2 +-
 jadx-plugins/jadx-java-convert/build.gradle |  2 +-
 jadx-plugins/jadx-smali-input/build.gradle  |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index d060c7a30..3a25c8645 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-	id 'org.sonarqube' version '3.0'
-	id 'com.github.ben-manes.versions' version '0.33.0'
-	id "com.diffplug.spotless" version "5.5.1"
+	id 'org.sonarqube' version '3.1'
+	id 'com.github.ben-manes.versions' version '0.36.0'
+	id "com.diffplug.spotless" version "5.9.0"
 }
 
 ext.jadxVersion = System.getenv('JADX_VERSION') ?: "dev"
@@ -40,8 +40,8 @@ allprojects {
 
 		testImplementation 'ch.qos.logback:logback-classic:1.2.3'
 		testImplementation 'org.hamcrest:hamcrest-library:2.2'
-		testImplementation 'org.mockito:mockito-core:3.5.10'
-		testImplementation 'org.assertj:assertj-core:3.17.2'
+		testImplementation 'org.mockito:mockito-core:3.7.0'
+		testImplementation 'org.assertj:assertj-core:3.18.1'
 
 		testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
 		testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 12d38de6a..da9702f9e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle
index 11aa53856..2505cce48 100644
--- a/jadx-gui/build.gradle
+++ b/jadx-gui/build.gradle
@@ -1,7 +1,7 @@
 plugins {
 	id 'application'
-	id 'edu.sc.seis.launch4j' version '2.4.8'
-	id 'com.github.johnrengelman.shadow' version '6.0.0'
+	id 'edu.sc.seis.launch4j' version '2.4.9'
+	id 'com.github.johnrengelman.shadow' version '6.1.0'
 }
 
 dependencies {
@@ -11,7 +11,7 @@ dependencies {
 	implementation 'com.beust:jcommander:1.80'
 	implementation 'ch.qos.logback:logback-classic:1.2.3'
 
-	implementation 'com.fifesoft:rsyntaxtextarea:3.1.1'
+	implementation 'com.fifesoft:rsyntaxtextarea:3.1.2'
 	implementation files('libs/jfontchooser-1.0.5.jar')
 	implementation 'hu.kazocsaba:image-viewer:1.2.3'
 
@@ -19,9 +19,9 @@ dependencies {
 	implementation 'org.apache.commons:commons-lang3:3.11'
 	implementation 'org.apache.commons:commons-text:1.9'
 
-	implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
+	implementation 'io.reactivex.rxjava2:rxjava:2.2.20'
 	implementation "com.github.akarnokd:rxjava2-swing:0.3.7"
-	implementation 'com.android.tools.build:apksig:4.0.1'
+	implementation 'com.android.tools.build:apksig:4.1.1'
 }
 
 application {
diff --git a/jadx-plugins/jadx-dex-input/build.gradle b/jadx-plugins/jadx-dex-input/build.gradle
index b8db80a53..9890a5846 100644
--- a/jadx-plugins/jadx-dex-input/build.gradle
+++ b/jadx-plugins/jadx-dex-input/build.gradle
@@ -7,7 +7,7 @@ dependencies {
 
 	// TODO: finish own smali printer
 	implementation 'org.smali:baksmali:2.4.0'
-	implementation 'com.google.guava:guava:29.0-jre' // force latest version for smali
+	implementation 'com.google.guava:guava:30.1-jre' // force latest version for smali
 
 	testImplementation 'org.smali:smali:2.4.0' // compile smali files in tests
 }
diff --git a/jadx-plugins/jadx-java-convert/build.gradle b/jadx-plugins/jadx-java-convert/build.gradle
index 06c50318a..6f0ab6598 100644
--- a/jadx-plugins/jadx-java-convert/build.gradle
+++ b/jadx-plugins/jadx-java-convert/build.gradle
@@ -8,5 +8,5 @@ dependencies {
 	implementation(project(":jadx-plugins:jadx-dex-input"))
 	implementation(files('lib/dx-1.16.jar'))
 
-	implementation 'org.ow2.asm:asm:8.0.1'
+	implementation 'org.ow2.asm:asm:9.0'
 }
diff --git a/jadx-plugins/jadx-smali-input/build.gradle b/jadx-plugins/jadx-smali-input/build.gradle
index 707049069..6ac8a585f 100644
--- a/jadx-plugins/jadx-smali-input/build.gradle
+++ b/jadx-plugins/jadx-smali-input/build.gradle
@@ -8,5 +8,5 @@ dependencies {
 	implementation(project(":jadx-plugins:jadx-dex-input"))
 
 	implementation 'org.smali:smali:2.4.0'
-	implementation 'com.google.guava:guava:29.0-jre' // force latest version for smali
+	implementation 'com.google.guava:guava:30.1-jre' // force latest version for smali
 }