diff --git a/gradle.properties b/gradle.properties
index 959d1bc05c..f28522f5b0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -49,7 +49,7 @@ signing.element.nightly.keyPassword=Secret
 
 # Customise the Lint version to use a more recent version than the one bundled with AGP
 # https://googlesamples.github.io/android-custom-lint-rules/usage/newer-lint.md.html
-android.experimental.lint.version=8.3.0-alpha12
+android.experimental.lint.version=8.4.0-alpha13
 
 # Enable test fixture for all modules by default
 android.experimental.enableTestFixtures=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8301cb0d9a..9d35a1262c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
 
 [versions]
 # Project
-android_gradle_plugin = "8.2.2"
+android_gradle_plugin = "8.3.1"
 kotlin = "1.9.23"
 ksp = "1.9.23-1.0.19"
 firebaseAppDistribution = "4.2.0"
diff --git a/plugins/src/main/kotlin/extension/CommonExtension.kt b/plugins/src/main/kotlin/extension/CommonExtension.kt
index 4f7a097e0f..282a569d3f 100644
--- a/plugins/src/main/kotlin/extension/CommonExtension.kt
+++ b/plugins/src/main/kotlin/extension/CommonExtension.kt
@@ -23,7 +23,7 @@ import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import java.io.File
 
-fun CommonExtension<*, *, *, *, *>.androidConfig(project: Project) {
+fun CommonExtension<*, *, *, *, *, *>.androidConfig(project: Project) {
     defaultConfig {
         compileSdk = Versions.compileSdk
         minSdk = Versions.minSdk
@@ -53,7 +53,7 @@ fun CommonExtension<*, *, *, *, *>.androidConfig(project: Project) {
     }
 }
 
-fun CommonExtension<*, *, *, *, *>.composeConfig(libs: LibrariesForLibs) {
+fun CommonExtension<*, *, *, *, *, *>.composeConfig(libs: LibrariesForLibs) {
 
     buildFeatures {
         compose = true