diff --git a/app/build.gradle b/app/build.gradle
index e0f5637..436c91f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,12 +12,11 @@ def getGitHash = { ->
 }
 
 android {
-    compileSdkVersion 34
-
     defaultConfig {
         applicationId "deltazero.amarok"
         minSdkVersion 26
         targetSdkVersion 34
+        compileSdk 34
         versionCode 64
         versionName "0.8.5b3"
 
@@ -55,7 +54,7 @@ android {
     }
 
     productFlavors {
-        flavorDimensions "version"
+        flavorDimensions = ['version']
         appcenter {
             dimension 'version'
         }
@@ -74,14 +73,14 @@ android {
         }
     }
 
-    applicationVariants.all { variant ->
+    applicationVariants.configureEach { variant ->
         def flavorName = variant.productFlavors[0].name
         if (flavorName == "appcenter") {
-            variant.outputs.all { output ->
+            variant.outputs.configureEach { output ->
                 outputFileName = "Amarok-v${variant.versionName}.apk"
             }
         } else {
-            variant.outputs.all { output ->
+            variant.outputs.configureEach { output ->
                 outputFileName = "Amarok-v${variant.versionName}-${flavorName}.apk"
             }
         }
@@ -91,7 +90,11 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+
     namespace 'deltazero.amarok'
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 repositories {
diff --git a/build.gradle b/build.gradle
index a6718f4..d06ee50 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url 'https://jitpack.io' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.2'
+        classpath 'com.android.tools.build:gradle:8.2.0'
         classpath 'dev.rikka.tools.autoresconfig:gradle-plugin:1.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
index ebb7a44..db8e43c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,6 +14,5 @@
 org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx2048M" -Dfile.encoding\=UTF-8
 android.useAndroidX=true
 android.enableJetifier=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0da82a2..6e05265 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip