diff --git a/app/build.gradle b/app/build.gradle
index 70266decd..f98feb1de 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ plugins {
 }
 android {
     compileSdk 34
-
+    namespace = "live.hms.app2"
     defaultConfig {
         applicationId "live.hms.app2"
         minSdkVersion 21
@@ -40,15 +40,14 @@ android {
     }
 
     buildFeatures {
-        viewBinding = true
+        viewBinding true
+        buildConfig true
     }
     compileOptions {
-        sourceCompatibility = "1.8"
-        targetCompatibility = "1.8"
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
+
 }
 
 dependencies {
diff --git a/build.gradle b/build.gradle
index 2a00ac93a..b31cfc239 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.4.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // Jetpack Navigation
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8c53f789a..d99b4cfbf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Feb 10 17:14:29 IST 2022
+#Wed May 29 15:31:08 IST 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/room-kit/build.gradle b/room-kit/build.gradle
index 52225b8cc..d88fe3c6b 100644
--- a/room-kit/build.gradle
+++ b/room-kit/build.gradle
@@ -19,8 +19,6 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdk 34
-        versionCode 1
-        versionName getVersionName()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -39,19 +37,14 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     buildFeatures {
         viewBinding true
-        dataBinding {
-            enabled true
-        }
         compose true
+        buildConfig true
     }
     composeOptions {
         kotlinCompilerExtensionVersion = "1.4.8"
diff --git a/room-kit/src/main/res/drawable/exo_edit_mode_logo.xml b/room-kit/src/main/res/drawable/exo_edit_mode_logo.xml
new file mode 100644
index 000000000..0d93afc7b
--- /dev/null
+++ b/room-kit/src/main/res/drawable/exo_edit_mode_logo.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="33dp"
+    android:height="32dp"
+    android:viewportWidth="33"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M14.939,0h3.122v32h-3.122z"
+      android:fillColor="#538DFF"/>
+  <path
+      android:pathData="M23.148,1.363l2.704,1.561l-16,27.713l-2.704,-1.561z"
+      android:fillColor="#538DFF"/>
+  <path
+      android:pathData="M32.5,14.439l-0,3.122l-32,0l-0,-3.122z"
+      android:fillColor="#538DFF"/>
+  <path
+      android:pathData="M31.137,22.648l-1.561,2.704l-27.713,-16l1.561,-2.704z"
+      android:fillColor="#538DFF"/>
+  <path
+      android:pathData="M25.852,29.076l-2.704,1.561l-16,-27.713l2.704,-1.561z"
+      android:fillColor="#538DFF"/>
+  <path
+      android:pathData="M29.576,6.648l1.561,2.704l-27.713,16l-1.561,-2.704z"
+      android:fillColor="#538DFF"/>
+</vector>