diff --git a/build.gradle b/build.gradle
index d603a1eb6c..1806fa7253 100644
--- a/build.gradle
+++ b/build.gradle
@@ -57,7 +57,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.7'
 
diff --git a/gradle.properties b/gradle.properties
index 3b47fa6324..e024556425 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,3 +32,5 @@ android.nonTransitiveRClass=true
 # null: KtCallExpression
 # https://youtrack.jetbrains.com/issue/KT-58027
 kapt.use.jvm.ir=false
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 46ed4ffcad..e2968a868f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Sep 18 18:21:09 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/pump/combo/build.gradle b/pump/combo/build.gradle
index da935b557a..31d5153c42 100644
--- a/pump/combo/build.gradle
+++ b/pump/combo/build.gradle
@@ -11,6 +11,10 @@ apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
 apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
 android {
+
+    buildFeatures {
+        aidl true
+    }
     namespace 'info.nightscout.pump.combo'
 }