diff --git a/build.gradle b/build.gradle
index be8662a2..59773853 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.13.2'
+        classpath 'com.android.tools.build:gradle:9.0.0'
         classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.4.8'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8"
diff --git a/gradle.properties b/gradle.properties
index f5677d94..71465430 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,3 +5,13 @@ android.useAndroidX=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 android.enableR8.fullMode=false
+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 159b556c..cdfbc778 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -52,6 +52,8 @@
          <trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework" name="checker-qual"/>
          <trusted-key id="1A55F091AD28C07F831FA44D7905DE25C78AD456" group="com.google.protobuf"/>
          <trusted-key id="1BE2DD4B1FCF252FE4F0A1D103281AA0289FF53A" group="com.soywiz.korlibs.korte" name="korte-jvm" version="2.0.7"/>
+          <trusted-key id="1D0A8B5E77C678A7C724445ABF984B4145EA13F7" group="com.squareup" name="javapoet"
+              version="1.13.0" />
          <trusted-key id="1D217F8475EEE9F19AB8DD6B793FD5751A0F0780">
             <trusting group="com.squareup.retrofit2" name="retrofit" version="2.12.0"/>
             <trusting group="com.squareup.retrofit2" name="retrofit" version="3.0.0"/>
@@ -210,6 +212,7 @@
             <trusting group="androidx.annotation"/>
             <trusting group="androidx.appcompat"/>
             <trusting group="androidx.collection"/>
+             <trusting group="androidx.concurrent" name="concurrent-futures" version="1.2.0" />
             <trusting group="androidx.concurrent" name="concurrent-futures-ktx" version="1.2.0"/>
             <trusting group="androidx.constraintlayout"/>
             <trusting group="androidx.core"/>
@@ -1093,6 +1096,12 @@
          <artifact name="legacy-support-core-utils-1.0.0.pom">
             <sha256 value="8fd093008b3ee7c06e52c78da2af980a7b47b69b967fa91dad7af466f7a00a38" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
+      </component>
+       <component group="androidx.lifecycle" name="lifecycle-common" version="2.3.1">
+           <artifact name="lifecycle-common-2.3.1.module">
+               <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.jar">
@@ -1543,6 +1552,12 @@
             <sha256 value="fc8b21ebe5fa3a7c96ee098bcdcd00f077ebce73f243fa858e2b0671615f75d8" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+       <component group="androidx.tracing" name="tracing" version="1.1.0">
+           <artifact name="tracing-1.1.0.module">
+               <sha256 value="b1fed4309623b6f20bc817d8fbd70e4ea7085e40647694cd399ae58d2f0049e3"
+                   origin="Generated by Gradle" reason="Artifact is not signed" />
+           </artifact>
+       </component>
       <component group="androidx.tracing" name="tracing" version="1.2.0">
          <artifact name="tracing-1.2.0.aar">
             <sha256 value="6faa90390d1fdbf0adb9a99bf99de67b94c6c6f35aea9510593a9d17973736a2" origin="Generated by Gradle"/>
@@ -4054,6 +4069,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"/>
@@ -13116,6 +13141,12 @@
          <artifact name="junit-bom-5.13.1.pom">
             <sha256 value="fa68451ea830572ed43ffe51d75b6a05f7a5e665a602a51f49d6be02063a65f3" origin="Generated by Gradle"/>
          </artifact>
+      </component>
+       <component group="org.junit" name="junit-bom" version="5.13.4">
+           <artifact name="junit-bom-5.13.4.pom">
+               <sha256 value="d7a08a99b2502f0bb68cd4e1f984f0bf69324aaa208bd0f73366c03fc3548a42"
+                   origin="Generated by Gradle" />
+         </artifact>
       </component>
       <component group="org.junit" name="junit-bom" version="5.9.1">
          <artifact name="junit-bom-5.9.1.pom">
diff --git a/lib/build.gradle b/lib/build.gradle
index cf4d6a22..e9f9e580 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -41,7 +41,6 @@ android {
 
     defaultConfig {
         minSdk 21
-        targetSdk = 36
         compileSdk = 36
         consumerProguardFiles 'consumer-proguard-rules.pro'
     }
@@ -53,7 +52,7 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 
@@ -83,6 +82,10 @@ android {
         disable 'MissingTranslation', 'ExtraTranslation', 'MissingQuantity', 'InconsistentArrays', 'TypographyEllipsis', 'GradleDependency', 'VectorPath', 'IconMissingDensityFolder', 'IconDensities'
         htmlOutput = file("$project.layout.buildDirectory/reports/lint/lint.html")
         htmlReport = true
+        targetSdk 36
+    }
+    testOptions {
+        targetSdk 36
     }
 }