diff --git a/build.gradle b/build.gradle
index 5a7328618..358719c9f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-	id 'com.github.ben-manes.versions' version '0.41.0'
-	id 'com.diffplug.spotless' version '6.2.0'
+	id 'com.github.ben-manes.versions' version '0.42.0'
+	id 'com.diffplug.spotless' version '6.2.2'
 }
 
 ext.jadxVersion = System.getenv('JADX_VERSION') ?: "dev"
@@ -27,7 +27,7 @@ allprojects {
 	}
 
 	dependencies {
-		implementation 'org.slf4j:slf4j-api:1.7.35'
+		implementation 'org.slf4j:slf4j-api:1.7.36'
 		compileOnly 'org.jetbrains:annotations:23.0.0'
 
 		testImplementation 'ch.qos.logback:logback-classic:1.2.10'
@@ -67,8 +67,9 @@ spotless {
 		if (JavaVersion.current() < JavaVersion.VERSION_16) {
 			removeUnusedImports()
 		} else {
-			// google-format broken on java 16 (https://github.com/diffplug/spotless/issues/834)
-			println('Warning! Unused imports remove is disabled for Java 16')
+			// google-format on Java 16+ issue: https://github.com/diffplug/spotless/issues/834
+			println('Warning! Unused imports remove is disabled for Java 16+'
+					+ ' (use workaround from https://github.com/diffplug/spotless/tree/main/plugin-gradle#google-java-format)')
 		}
 
 		lineEndings(com.diffplug.spotless.LineEnding.UNIX)
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f2..41d9927a4 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 59250647c..1debed0d8 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=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionSha256Sum=8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/jadx-core/build.gradle b/jadx-core/build.gradle
index 4b05c2eb7..953229a64 100644
--- a/jadx-core/build.gradle
+++ b/jadx-core/build.gradle
@@ -5,7 +5,7 @@ plugins {
 dependencies {
 	api(project(':jadx-plugins:jadx-plugins-api'))
 
-	implementation 'com.google.code.gson:gson:2.8.9'
+	implementation 'com.google.code.gson:gson:2.9.0'
 	implementation 'com.android.tools.build:aapt2-proto:4.2.1-7147631'
 	constraints {
 		// Force protobuf version to prevent Java-7 issue
diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle
index ee6d5e0c8..718d24608 100644
--- a/jadx-gui/build.gradle
+++ b/jadx-gui/build.gradle
@@ -21,7 +21,7 @@ dependencies {
 	implementation 'com.formdev:flatlaf-extras:2.0.1'
 	implementation 'com.formdev:svgSalamander:1.1.3'
 
-	implementation 'com.google.code.gson:gson:2.8.9'
+	implementation 'com.google.code.gson:gson:2.9.0'
 	implementation 'org.apache.commons:commons-lang3:3.12.0'
 	implementation 'org.apache.commons:commons-text:1.9'
 
diff --git a/jadx-plugins/jadx-java-convert/build.gradle b/jadx-plugins/jadx-java-convert/build.gradle
index 6e8078b07..79250f510 100644
--- a/jadx-plugins/jadx-java-convert/build.gradle
+++ b/jadx-plugins/jadx-java-convert/build.gradle
@@ -7,7 +7,7 @@ dependencies {
 
 	implementation(project(":jadx-plugins:jadx-dex-input"))
 	implementation('com.jakewharton.android.repackaged:dalvik-dx:11.0.0_r3')
-	implementation('com.android.tools:r8:3.0.73')
+	implementation('com.android.tools:r8:3.1.51')
 
 	implementation 'org.ow2.asm:asm:9.2'
 }