diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 0afd20567c..cf4f5bbee5 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -7,10 +7,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: set up JDK 11
-        uses: actions/setup-java@v3
+      - uses: actions/setup-java@v3
         with:
-          java-version: "11"
+          java-version: "17"
           distribution: "temurin"
           cache: gradle
       - name: Build with Gradle
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9b0628b84e..62280ea589 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -45,6 +45,7 @@ android {
 
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 
     compileOptions {
diff --git a/build.gradle.kts b/build.gradle.kts
index 74906499ff..4a650c7d26 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build", "gradle", "7.3.0")
+        classpath("com.android.tools.build", "gradle", "8.2.2")
         classpath(kotlin("gradle-plugin", libs.versions.kotlin.get()))
     }
 }
diff --git a/compose-persist/build.gradle.kts b/compose-persist/build.gradle.kts
index ac8ccf69f7..40c7263029 100644
--- a/compose-persist/build.gradle.kts
+++ b/compose-persist/build.gradle.kts
@@ -25,6 +25,7 @@ android {
 
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 
     compileOptions {
diff --git a/compose-reordering/build.gradle.kts b/compose-reordering/build.gradle.kts
index f2ae44b125..5c2994b169 100644
--- a/compose-reordering/build.gradle.kts
+++ b/compose-reordering/build.gradle.kts
@@ -25,6 +25,7 @@ android {
 
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 
     compileOptions {
diff --git a/compose-routing/build.gradle.kts b/compose-routing/build.gradle.kts
index b33472c20d..bc8b2dd9b6 100644
--- a/compose-routing/build.gradle.kts
+++ b/compose-routing/build.gradle.kts
@@ -25,6 +25,7 @@ android {
 
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 
     compileOptions {
diff --git a/gradle.properties b/gradle.properties
index a0153bd91d..c3c05220a3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,3 +3,5 @@ android.useAndroidX=true
 android.enableJetifier=false
 kotlin.code.style=official
 android.enableR8.fullMode=true
+android.nonTransitiveRClass=true
+android.nonFinalRClass=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fada09560b..420dc77fb4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jul 06 23:33:16 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME