build: update dependencies and gradle

build.gradle

@@ -1,7 +1,7 @@
 plugins {
 	id 'org.sonarqube' version '2.8'
-	id 'com.github.ben-manes.versions' version '0.22.0'
-	id "com.diffplug.gradle.spotless" version "3.24.0"
+	id 'com.github.ben-manes.versions' version '0.27.0'
+	id "com.diffplug.gradle.spotless" version "3.26.0"
 }
 
 ext.jadxVersion = System.getenv('JADX_VERSION') ?: "dev"
@@ -33,15 +33,15 @@ allprojects {
 	}
 
 	dependencies {
-		compile 'org.slf4j:slf4j-api:1.7.28'
+		compile 'org.slf4j:slf4j-api:1.7.29'
 
 		testCompile 'ch.qos.logback:logback-classic:1.2.3'
-		testCompile 'org.hamcrest:hamcrest-library:2.1'
-		testCompile 'org.mockito:mockito-core:3.0.0'
+		testCompile 'org.hamcrest:hamcrest-library:2.2'
+		testCompile 'org.mockito:mockito-core:3.1.0'
 		testCompile 'org.assertj:assertj-core:3.14.0'
 
-		testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1'
-		testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1'
+		testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2'
+		testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
 
 		testCompile 'org.eclipse.jdt.core.compiler:ecj:4.6.1'
 	}

config/checkstyle/checkstyle.xml

@@ -78,7 +78,9 @@
 
 		<!-- annotations -->
 		<module name="AnnotationLocation"/>
-		<module name="AnnotationUseStyle"/>
+		<module name="AnnotationUseStyle">
+			<property name="elementStyle" value="compact"/>
+		</module>
 		<module name="MissingOverride"/>
 		<!-- <module name="MissingDeprecated"/> -->
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -154,19 +154,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -5,7 +5,7 @@
 @rem you may not use this file except in compliance with the License.
 @rem You may obtain a copy of the License at
 @rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem Unless required by applicable law or agreed to in writing, software
 @rem distributed under the License is distributed on an "AS IS" BASIS,

jadx-cli/build.gradle

@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
 	compile(project(':jadx-core'))
-	compile 'com.beust:jcommander:1.74'
+	compile 'com.beust:jcommander:1.78'
 	compile 'ch.qos.logback:logback-classic:1.2.3'
 }
 

jadx-core/build.gradle

@@ -4,15 +4,15 @@ dependencies {
 
 	compile files('lib/dx-1.16.jar') // TODO: dx don't support java version > 9 (53)
 
-	compile 'org.ow2.asm:asm:7.1'
-	compile 'org.jetbrains:annotations:17.0.0'
-	compile 'com.google.code.gson:gson:2.8.5'
+	compile 'org.ow2.asm:asm:7.2'
+	compile 'org.jetbrains:annotations:18.0.0'
+	compile 'com.google.code.gson:gson:2.8.6'
 
-	compile 'org.smali:baksmali:2.3'
-	compile('org.smali:smali:2.3') {
+	compile 'org.smali:baksmali:2.3.4'
+	compile('org.smali:smali:2.3.4') {
 		exclude group: 'com.google.guava'
 	}
-	compile 'com.google.guava:guava:28.0-jre'
+	compile 'com.google.guava:guava:28.1-jre'
 
 	testCompile 'org.apache.commons:commons-lang3:3.9'
 }

jadx-gui/build.gradle

@@ -1,23 +1,23 @@
 plugins {
 	id 'application'
 	id 'edu.sc.seis.launch4j' version '2.4.6'
-	id 'com.github.johnrengelman.shadow' version '5.1.0'
+	id 'com.github.johnrengelman.shadow' version '5.2.0'
 }
 
 dependencies {
 	compile(project(":jadx-core"))
 	compile(project(":jadx-cli"))
 
-	compile 'com.fifesoft:rsyntaxtextarea:3.0.3'
+	compile 'com.fifesoft:rsyntaxtextarea:3.0.4'
 	compile files('libs/jfontchooser-1.0.5.jar')
 	compile 'hu.kazocsaba:image-viewer:1.2.3'
 
 	compile 'org.apache.commons:commons-lang3:3.9'
-	compile 'org.apache.commons:commons-text:1.7'
+	compile 'org.apache.commons:commons-text:1.8'
 
-	compile 'io.reactivex.rxjava2:rxjava:2.2.11'
+	compile 'io.reactivex.rxjava2:rxjava:2.2.15'
 	compile "com.github.akarnokd:rxjava2-swing:0.3.7"
-	compile 'com.android.tools.build:apksig:3.5.1'
+	compile 'com.android.tools.build:apksig:3.5.2'
 }
 
 application {