diff --git a/build-logic/convention/src/main/kotlin/SpotlessConventionPlugin.kt b/build-logic/convention/src/main/kotlin/SpotlessConventionPlugin.kt
index 4fb2096e..491d13c7 100644
--- a/build-logic/convention/src/main/kotlin/SpotlessConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/SpotlessConventionPlugin.kt
@@ -28,9 +28,7 @@ class SpotlessConventionPlugin : Plugin<Project> {
         kotlin {
           target("**/*.kt")
           targetExclude("**/build/**/*.kt")
-          ktlint()
-            .setUseExperimental(true)
-            .editorConfigOverride(mapOf("indent_size" to 2, "continuation_indent_size" to 2))
+          ktlint().editorConfigOverride(mapOf("indent_size" to 2, "continuation_indent_size" to 2))
           licenseHeaderFile(rootProject.file("$rootDir/spotless/copyright.kt"))
         }
         format("kts") {
diff --git a/build-logic/convention/src/main/kotlin/com/skydoves/landscapist/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/skydoves/landscapist/AndroidCompose.kt
index 2f0a4a7a..9d9521f0 100644
--- a/build-logic/convention/src/main/kotlin/com/skydoves/landscapist/AndroidCompose.kt
+++ b/build-logic/convention/src/main/kotlin/com/skydoves/landscapist/AndroidCompose.kt
@@ -29,7 +29,7 @@ import org.gradle.kotlin.dsl.getByType
  * Configure Compose-specific options
  */
 internal fun Project.configureAndroidCompose(
-  commonExtension: CommonExtension<*, *, *, *>,
+  commonExtension: CommonExtension<*, *, *, *, *>,
 ) {
   val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
 
diff --git a/build-logic/convention/src/main/kotlin/com/skydoves/landscapist/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/skydoves/landscapist/KotlinAndroid.kt
index 7c30431b..4288aa08 100644
--- a/build-logic/convention/src/main/kotlin/com/skydoves/landscapist/KotlinAndroid.kt
+++ b/build-logic/convention/src/main/kotlin/com/skydoves/landscapist/KotlinAndroid.kt
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
  * Configure base Kotlin with Android options
  */
 internal fun Project.configureKotlinAndroid(
-  commonExtension: CommonExtension<*, *, *, *>,
+  commonExtension: CommonExtension<*, *, *, *, *>,
 ) {
   val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
 
@@ -62,6 +62,6 @@ internal fun Project.configureKotlinAndroid(
   }
 }
 
-fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
+fun CommonExtension<*, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
   (this as ExtensionAware).extensions.configure("kotlinOptions", block)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c4613698..fff374f2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,27 +3,27 @@ kotlin = "1.9.0"
 dokka = "1.8.20"
 jvmTarget = "17"
 nexusPlugin = "1.3.0"
-kotlinxCoroutines = "1.7.1"
-kotlinBinaryCompatibility = "0.13.1"
-androidGradlePlugin = "8.0.2"
+kotlinxCoroutines = "1.7.2"
+kotlinBinaryCompatibility = "0.13.2"
+androidGradlePlugin = "8.1.0"
 androidxActivity = "1.7.2"
 androidxMaterial = "1.9.0"
 androidxComposeBom = "2023.06.01"
-androidxComposeCompiler = "1.5.0"
+androidxComposeCompiler = "1.5.1"
 androidxComposeConstraintLayout = "1.0.1"
 androidxCore = "1.10.1"
 androidxTestRunner = "1.5.2"
 androidxTestRules = "1.5.0"
 androidxJunit = "1.1.5"
-androidxMacroBenchmark = "1.2.0-alpha13"
+androidxMacroBenchmark = "1.2.0-beta02"
 androidxProfileinstaller = "1.3.1"
-androidxUiAutomator = "2.3.0-alpha02"
+androidxUiAutomator = "2.3.0-alpha04"
 glide = "4.15.1"
 fresco = "2.6.0"
-coil = "2.2.2"
+coil = "2.3.0"
 palette = "1.0.0"
 hilt = "2.47"
-spotless = "6.19.0"
+spotless = "6.20.0"
 desugar="2.0.3"
 
 [libraries]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8707e8b5..9b0a13f0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists