diff --git a/build.gradle b/build.gradle
index 49bac002a..d060c7a30 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.29.0'
-	id "com.diffplug.gradle.spotless" version "4.5.1"
+	id 'com.github.ben-manes.versions' version '0.33.0'
+	id "com.diffplug.spotless" version "5.5.1"
 }
 
 ext.jadxVersion = System.getenv('JADX_VERSION') ?: "dev"
@@ -36,18 +36,18 @@ allprojects {
 
 	dependencies {
 		implementation 'org.slf4j:slf4j-api:1.7.30'
-		compileOnly 'org.jetbrains:annotations:19.0.0'
+		compileOnly 'org.jetbrains:annotations:20.1.0'
 
 		testImplementation 'ch.qos.logback:logback-classic:1.2.3'
 		testImplementation 'org.hamcrest:hamcrest-library:2.2'
-		testImplementation 'org.mockito:mockito-core:3.4.0'
-		testImplementation 'org.assertj:assertj-core:3.16.1'
+		testImplementation 'org.mockito:mockito-core:3.5.10'
+		testImplementation 'org.assertj:assertj-core:3.17.2'
 
-		testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.2'
-		testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.2'
+		testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
+		testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
 
 		testImplementation 'org.eclipse.jdt.core.compiler:ecj:4.6.1'
-		testCompileOnly 'org.jetbrains:annotations:19.0.0'
+		testCompileOnly 'org.jetbrains:annotations:20.1.0'
 	}
 
 	test {
@@ -62,7 +62,7 @@ allprojects {
 	}
 
 	jacoco {
-		toolVersion = "0.8.5"
+		toolVersion = "0.8.6"
 	}
 	jacocoTestReport {
 		reports {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 490fda857..e708b1c02 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 bb8b2fc26..12d38de6a 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.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 2fe81a7d9..4f906e0c8 100755
--- a/gradlew
+++ b/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/gradlew.bat b/gradlew.bat
index 9109989e3..ac1b06f93 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/jadx-cli/build.gradle b/jadx-cli/build.gradle
index e0e77ee50..291f6dcd3 100644
--- a/jadx-cli/build.gradle
+++ b/jadx-cli/build.gradle
@@ -9,7 +9,7 @@ dependencies {
 	runtimeOnly(project(':jadx-plugins:jadx-smali-input'))
 	runtimeOnly(project(':jadx-plugins:jadx-java-convert'))
 
-	implementation 'com.beust:jcommander:1.78'
+	implementation 'com.beust:jcommander:1.80'
 	implementation 'ch.qos.logback:logback-classic:1.2.3'
 }
 
diff --git a/jadx-core/build.gradle b/jadx-core/build.gradle
index 0d410aaee..da0793681 100644
--- a/jadx-core/build.gradle
+++ b/jadx-core/build.gradle
@@ -10,7 +10,7 @@ dependencies {
 
 	implementation 'com.google.code.gson:gson:2.8.6'
 
-	testImplementation 'org.apache.commons:commons-lang3:3.10'
+	testImplementation 'org.apache.commons:commons-lang3:3.11'
 
 	testRuntimeOnly(project(':jadx-plugins:jadx-dex-input'))
 	testRuntimeOnly(project(':jadx-plugins:jadx-smali-input'))
diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle
index 551a78868..11aa53856 100644
--- a/jadx-gui/build.gradle
+++ b/jadx-gui/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	id 'application'
-	id 'edu.sc.seis.launch4j' version '2.4.6'
+	id 'edu.sc.seis.launch4j' version '2.4.8'
 	id 'com.github.johnrengelman.shadow' version '6.0.0'
 }
 
@@ -8,7 +8,7 @@ dependencies {
 	implementation(project(':jadx-core'))
 
 	implementation(project(":jadx-cli"))
-	implementation 'com.beust:jcommander:1.78'
+	implementation 'com.beust:jcommander:1.80'
 	implementation 'ch.qos.logback:logback-classic:1.2.3'
 
 	implementation 'com.fifesoft:rsyntaxtextarea:3.1.1'
@@ -16,12 +16,12 @@ dependencies {
 	implementation 'hu.kazocsaba:image-viewer:1.2.3'
 
 	implementation 'com.google.code.gson:gson:2.8.6'
-	implementation 'org.apache.commons:commons-lang3:3.10'
-	implementation 'org.apache.commons:commons-text:1.8'
+	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 "com.github.akarnokd:rxjava2-swing:0.3.7"
-	implementation 'com.android.tools.build:apksig:4.0.0'
+	implementation 'com.android.tools.build:apksig:4.0.1'
 }
 
 application {