diff --git a/app/build.gradle b/app/build.gradle
index be5563bb1..3760d1373 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -68,16 +68,20 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'com.google.android.material:material:1.2.1'
-    implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'
 
 // Third-party
     implementation 'com.journeyapps:zxing-android-embedded:4.1.0@aar'
-    implementation 'com.google.zxing:core:3.3.3' // Do not upgrade past 3.3.3! Causes a crash on versions before Android 7
+    // Do not upgrade past 3.3.3! Causes a crash on versions before Android Nougat
+    //noinspection GradleDependency
+    implementation 'com.google.zxing:core:3.3.3'
     implementation 'org.apache.commons:commons-csv:1.8'
     implementation 'com.jaredrummler:colorpicker:1.1.0'
     implementation 'com.google.guava:guava:30.1-jre'
     implementation 'com.github.invissvenska:NumberPickerPreference:1.0.1'
 
+// SpotBugs
+    implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'
+
 // Testing
     testImplementation 'androidx.test:core:1.0.0'
     testImplementation 'junit:junit:4.13.1'
diff --git a/build.gradle b/build.gradle
index 90a00d30e..5dac49ae5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,12 +5,12 @@ buildscript {
         google()
         jcenter()
         maven { url "https://jitpack.io" }
-        maven { url "https://plugins.gradle.org/m2/" }
+        gradlePluginPortal()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
-        classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.6.0'
+        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -22,7 +22,7 @@ allprojects {
         google()
         jcenter()
         maven { url "https://jitpack.io" }
-        maven { url "https://plugins.gradle.org/m2/" }
+        gradlePluginPortal()
     }
 }