diff --git a/app/build.gradle b/app/build.gradle
index 36aae6022..39f230615 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,13 +44,14 @@ android {
     }
 
     buildTypes {
-        debug {
-            testCoverageEnabled = true
-        }
 
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            enableUnitTestCoverage true
+            enableAndroidTestCoverage true
         }
     }
 
@@ -83,10 +84,6 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError = false
-        disable 'MissingTranslation'
-    }
 
     androidResources {
         generateLocaleConfig = true
@@ -99,6 +96,10 @@ android {
             pickFirst "MANIFEST.MF" // workaround for duplicated manifest on some dependencies
         }
     }
+    lint {
+        abortOnError false
+        disable 'MissingTranslation'
+    }
 }
 
 ext {
diff --git a/build.gradle b/build.gradle
index 7142dd7f4..e8419d526 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.13.2'
+        classpath 'com.android.tools.build:gradle:9.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
index 01a5d516e..45a1a2d43 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,4 +12,14 @@ org.gradle.configureondemand=true
 kapt.incremental.apt=true
 org.gradle.daemon=true
 org.gradle.configuration-cache=true
+android.defaults.buildfeatures.resvalues=true
+android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
+android.enableAppCompileTimeRClass=false
+android.usesSdkInManifest.disallowed=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.r8.optimizedResourceShrinking=false
+android.builtInKotlin=false
+android.newDsl=false
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 1ad09525e..6bf387b6f 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -3332,6 +3332,12 @@
             <sha256 value="5fb7c8514d8c56cada5e29ef89dc0289e71942ab4cb0b2e6dca137b9dcb8fdd4" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+       <component group="androidx.lifecycle" name="lifecycle-common" version="2.6.1">
+           <artifact name="lifecycle-common-2.6.1.module">
+               <sha256 value="93747a9145cb36bc71005f598ede32e2b1149ade5a16e62b0e4969345bc62d85"
+                   origin="Generated by Gradle" reason="Artifact is not signed" />
+           </artifact>
+       </component>
       <component group="androidx.lifecycle" name="lifecycle-common" version="2.8.7">
          <artifact name="lifecycle-common-2.8.7.module">
             <sha256 value="0de78fc06ee5045d68fc7e81c313a2a3d53ac7d127f79f9bc95abf7be49e5764" origin="Generated by Gradle"/>
@@ -8367,6 +8373,16 @@
             <sha256 value="5c4df7b2e31f17f20e4b8dbd62a2b7865a09a49a1fd2931a359fd394ecb9b5a5" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+       <component group="com.android.tools.build" name="bundletool" version="1.18.3">
+           <artifact name="bundletool-1.18.3.jar">
+               <sha256 value="ccad18514fd97db010856b2bbed40f481f8ba9349368c97ae54d72e3567d0171"
+                   origin="Generated by Gradle" reason="Artifact is not signed" />
+           </artifact>
+           <artifact name="bundletool-1.18.3.pom">
+               <sha256 value="fa674b39b96cae98015f3850f366cfeb00fe6c7aea2d90b20c017b90e0996dae"
+                   origin="Generated by Gradle" reason="Artifact is not signed" />
+           </artifact>
+       </component>
       <component group="com.android.tools.build" name="gradle" version="8.10.1">
          <artifact name="gradle-8.10.1.jar">
             <sha256 value="a0fe22ce029c548335a75913f7ad517c827c567b8abb84047102034255ae1173" origin="Generated by Gradle"/>