diff --git a/build.gradle b/build.gradle
index 56def4b5e..162b23d7e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	id 'com.github.ben-manes.versions' version '0.38.0'
-	id "com.diffplug.spotless" version "5.12.4"
+	id "com.diffplug.spotless" version "5.12.5"
 }
 
 ext.jadxVersion = System.getenv('JADX_VERSION') ?: "dev"
@@ -38,11 +38,11 @@ allprojects {
 
 		testImplementation 'ch.qos.logback:logback-classic:1.2.3'
 		testImplementation 'org.hamcrest:hamcrest-library:2.2'
-		testImplementation 'org.mockito:mockito-core:3.9.0'
+		testImplementation 'org.mockito:mockito-core:3.10.0'
 		testImplementation 'org.assertj:assertj-core:3.19.0'
 
-		testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
-		testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.1'
+		testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
+		testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
 
 		testImplementation 'org.eclipse.jdt.core.compiler:ecj:4.6.1'
 		testCompileOnly 'org.jetbrains:annotations:20.1.0'
@@ -142,13 +142,7 @@ task dist {
 	description = 'Build jadx distribution zip'
 
 	dependsOn(pack)
-	if (JavaVersion.current() < JavaVersion.VERSION_16) {
-		dependsOn('copyExe')
-	} else {
-		// shadow jar plugin broken on java 16 (https://github.com/johnrengelman/shadow/issues/658)
-		tasks.getByPath(':jadx-gui:shadowJar').enabled = false
-		println('Warning! Build of jadx-gui.exe disabled for Java 16')
-	}
+	dependsOn('copyExe')
 }
 
 task samples(dependsOn: 'jadx-samples:samples') {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d6aa5ac22..4e77d0c20 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=eb8b89184261025b0430f5b2233701ff1377f96da1ef5e278af6ae8bac5cc305
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionSha256Sum=0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/jadx-core/build.gradle b/jadx-core/build.gradle
index 2be78f25a..cbcc34db1 100644
--- a/jadx-core/build.gradle
+++ b/jadx-core/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 	api(project(':jadx-plugins:jadx-plugins-api'))
 
 	implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'com.android.tools.build:aapt2-proto:4.1.3-6503028'
+    implementation 'com.android.tools.build:aapt2-proto:4.2.1-7147631'
 
 	testImplementation 'org.apache.commons:commons-lang3:3.12.0'
 
diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle
index b75b38423..aad4a329b 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.5.0'
-	id 'com.github.johnrengelman.shadow' version '6.1.0'
+	id 'com.github.johnrengelman.shadow' version '7.0.0'
 }
 
 dependencies {
@@ -21,7 +21,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:4.1.3'
+	implementation 'com.android.tools.build:apksig:4.2.1'
 	implementation 'io.github.hqktech:jdwp:1.0'
 }