diff --git a/.gitignore b/.gitignore
index e1e4e4ec7..3b77c9bd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,9 @@
 /.idea/AndroidProjectSystem.xml
 /.idea/deviceManager.xml
 /.idea/inspectionProfiles/
+/commons/.idea/gradle.xml
+/commons/.idea/misc.xml
+/commons/.idea/workspace.xml
 .DS_Store
 /build
 /captures
diff --git a/commons/build.gradle.kts b/commons/build.gradle.kts
index 07c10502a..40a31eb70 100644
--- a/commons/build.gradle.kts
+++ b/commons/build.gradle.kts
@@ -19,7 +19,7 @@ kotlin {
         }
     }
 
-    androidLibrary {
+    android {
         namespace = "com.vitorpamplona.amethyst.commons"
         compileSdk =
             libs.versions.android.compileSdk
@@ -34,6 +34,8 @@ kotlin {
             jvmTarget.set(JvmTarget.JVM_21)
         }
 
+        androidResources.enable = true
+
         withHostTest {}
 
         withDeviceTest {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ef46ff88d..47bb25794 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 accompanistAdaptive = "0.37.3"
 composeMultiplatform = "1.10.0"
 activityCompose = "1.12.4"
-agp = "9.0.1"
+agp = "9.1.0"
 android-compileSdk = "36"
 android-minSdk = "26"
 android-targetSdk = "36"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3a7c1c081..1bdd7b167 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jan 04 09:23:50 EST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/quartz/build.gradle.kts b/quartz/build.gradle.kts
index a3bbcdd59..befae0de9 100644
--- a/quartz/build.gradle.kts
+++ b/quartz/build.gradle.kts
@@ -18,7 +18,7 @@ kotlin {
         }
     }
 
-    androidLibrary {
+    android {
         namespace = "com.vitorpamplona.quartz"
         compileSdk =
             libs.versions.android.compileSdk