diff --git a/build-logic/convention/src/main/kotlin/com/niyaj/samples/apps/popos/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/niyaj/samples/apps/popos/AndroidCompose.kt
index ae531fac..5b587df6 100644
--- a/build-logic/convention/src/main/kotlin/com/niyaj/samples/apps/popos/AndroidCompose.kt
+++ b/build-logic/convention/src/main/kotlin/com/niyaj/samples/apps/popos/AndroidCompose.kt
@@ -9,7 +9,7 @@ import org.gradle.kotlin.dsl.dependencies
  * Configure Compose-specific options
  */
 internal fun Project.configureAndroidCompose(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         buildFeatures {
diff --git a/build-logic/convention/src/main/kotlin/com/niyaj/samples/apps/popos/GradleManagedDevices.kt b/build-logic/convention/src/main/kotlin/com/niyaj/samples/apps/popos/GradleManagedDevices.kt
index c42db0c7..c267c78b 100644
--- a/build-logic/convention/src/main/kotlin/com/niyaj/samples/apps/popos/GradleManagedDevices.kt
+++ b/build-logic/convention/src/main/kotlin/com/niyaj/samples/apps/popos/GradleManagedDevices.kt
@@ -10,7 +10,7 @@ import java.util.Locale
  * Configure project for Gradle managed devices
  */
 internal fun configureGradleManagedDevices(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     val deviceConfigs = listOf(
         DeviceConfig("Pixel 4", 30, "aosp-atd"),
diff --git a/build-logic/convention/src/main/kotlin/com/niyaj/samples/apps/popos/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/niyaj/samples/apps/popos/KotlinAndroid.kt
index 408c07f8..7e9bdaba 100644
--- a/build-logic/convention/src/main/kotlin/com/niyaj/samples/apps/popos/KotlinAndroid.kt
+++ b/build-logic/convention/src/main/kotlin/com/niyaj/samples/apps/popos/KotlinAndroid.kt
@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
  * Configure base Kotlin with Android options
  */
 internal fun Project.configureKotlinAndroid(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         compileSdk = 34
@@ -42,7 +42,7 @@ 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/build-logic/convention/src/main/kotlin/com/niyaj/samples/apps/popos/PoposFlavor.kt b/build-logic/convention/src/main/kotlin/com/niyaj/samples/apps/popos/PoposFlavor.kt
index d7d3c6d1..49e9b523 100644
--- a/build-logic/convention/src/main/kotlin/com/niyaj/samples/apps/popos/PoposFlavor.kt
+++ b/build-logic/convention/src/main/kotlin/com/niyaj/samples/apps/popos/PoposFlavor.kt
@@ -21,7 +21,7 @@ enum class PoposFlavor(val dimension: FlavorDimension, val applicationIdSuffix:
 }
 
 fun Project.configureFlavors(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
     flavorConfigurationBlock: ProductFlavor.(flavor: PoposFlavor) -> Unit = {}
 ) {
     commonExtension.apply {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a1257f16..7417d2c2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,24 +1,24 @@
 [versions]
-accompanist = "0.32.0"
+accompanist = "0.34.0"
 accompanistSwipeRefresh = '0.27.0'
 acraVersion = '5.9.7'
 appsweep = 'latest.release'
 androidDesugarJdkLibs = "2.0.4"
-androidGradlePlugin = "8.2.2"
-androidTools = "31.2.2"
+androidGradlePlugin = "8.3.0"
+androidTools = "31.3.1"
 androidxActivity = "1.8.2"
 androidxAppCompat = "1.6.1"
 androidxArchCore = '2.2.0'
-androidxComposeBom = "2024.02.00"
-androidxComposeCompiler = "1.5.8"
-androidxComposeUi = "1.6.1"
-androidxComposeRuntime = "1.6.1"
+androidxComposeBom = "2024.04.00"
+androidxComposeCompiler = "1.5.10"
+androidxComposeUi = "1.6.5"
+androidxComposeRuntime = "1.6.5"
 androidxComposeRuntimeTracing = "1.0.0-beta01"
-androidxComposeMaterial3 = "1.2.0"
+androidxComposeMaterial3 = "1.2.1"
 androidxCore = "1.12.0"
 androidxCoreSplashscreen = "1.0.1"
 androidxEspresso = "3.5.1"
-androidxHiltNavigationCompose = "1.1.0"
+androidxHiltNavigationCompose = "1.2.0"
 androidxLifecycle = "2.7.0"
 androidxLivedata = "1.4.3"
 androidxMacroBenchmark = "1.2.3"
@@ -28,60 +28,61 @@ androidxBenchmarkJunit4 = "1.1.1"
 androidxMetrics = "1.0.0-beta01"
 androidxNavigation = "2.7.7"
 androidxProfileinstaller = "1.3.1"
+androidxPaging = "3.3.0-beta01"
 androidxStartup = "1.1.1"
 androidxTestCore = "1.5.0"
 androidxTestExt = "1.1.5"
 androidxTestRules = "1.5.0"
 androidxTestRunner = "1.5.2"
 androidxTracing = "1.2.0"
-androidxUiAutomator = "2.2.0"
+androidxUiAutomator = "2.3.0"
 androidxWindowManager = "1.2.0"
 androidxWork = "2.9.0"
-coil = "2.5.0"
+coil = "2.6.0"
 detektVersion = "1.23.3"
 dependencyGuard = "0.4.3"
 exyte-navigation = '1.0.0'
-firebaseBom = "32.7.2"
+firebaseBom = "32.8.0"
 firebaseCrashlyticsPlugin = "2.9.9"
 firebasePerfPlugin = "1.4.2"
 gmsPlugin = "4.4.1"
 googleOss = "17.0.1"
 googleOssPlugin = "0.10.6"
-hilt = "2.50"
-hiltExt = "1.1.0"
+hilt = "2.51"
+hiltExt = "1.2.0"
 jacoco = "0.8.7"
 junit4 = "4.13.2"
 junit = "4.13.2"
 kotlin = "1.9.22"
-kotlinxCoroutines = "1.7.3"
+kotlinxCoroutines = "1.8.0"
 kotlinxDatetime = "0.5.0"
-kotlinxSerializationJson = "1.6.0"
+kotlinxSerializationJson = "1.6.3"
 kotlinxImmutable = "0.3.6"
-ksp = "1.9.22-1.0.17" # "1.9.10-1.0.13"
-lint = "31.2.2"
+ksp = "1.9.22-1.0.18" # "1.9.10-1.0.13"
+lint = "31.3.1"
 leakcanaryVersion = '2.10'
 moshiVersion = '1.15.0'
 mockkVersion = "1.13.5"
 okhttp = "4.10.0"
 posPrinterVersion = '3.4.0'
-protobuf = "3.24.4"
+protobuf = "3.25.2"
 protobufPlugin = "0.9.4"
 playIntegrity = '1.3.0'
 playUpdate = "2.1.0"
 playScanner = "16.1.0"
 playService = "18.3.0"
 revealswipeVersion = '1.1.0'
-raamcostaVersion = "1.9.56"
+raamcostaVersion = "1.9.56" #2.1.0-beta01
 realmVersion = "1.13.0"
 robolectric = "4.11.1"
-roborazzi = "1.6.0"
+roborazzi = "1.7.0"
 room = "2.6.1"
 secrets = "2.0.1"
 sentryVersion = '3.14.0'
 sentryAndroidVersion = '6.33.0'
-turbine = "1.0.0"
+turbine = "1.1.0"
 timberVersion = '5.0.1'
-truthVersion = '1.1.5'
+truthVersion = '1.4.2'
 vanpraComposeVersion = '0.9.0'
 zxing = "3.5.1"
 saketSwipe = "1.2.0"
@@ -142,6 +143,11 @@ androidx-compose-ui-util = { group = "androidx.compose.ui", name = "ui-util", ve
 androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics", version.ref = "androidxComposeUi" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" }
 
+# AndroidX Paging 3
+androidx-paging-runtime = {group = "androidx.paging", name="paging-runtime", version.ref= "androidxPaging" }
+androidx-paging-common = {group = "androidx.paging", name="paging-common", version.ref= "androidxPaging" }
+androidx-paging-compose = {group = "androidx.paging", name="paging-compose", version.ref= "androidxPaging" }
+
 # Androidx Startup and Splash Screen
 androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "androidxCoreSplashscreen" }
 androidx-core-startup = { group = "androidx.startup", name = "startup-runtime", version.ref = "androidxStartup" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7ae099b4..a9438fb2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Jan 29 01:07:06 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists