diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..8c596cd
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,189 @@
+name: Android CI/CD - Play Store Release
+
+permissions:
+  contents: write
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+    inputs:
+      track:
+        description: 'Play Store track (internal, alpha, beta, production)'
+        required: false
+        default: 'internal'
+        type: choice
+        options:
+          - internal
+          - alpha
+          - beta
+          - production
+
+env:
+  JAVA_VERSION: '17'
+  JAVA_DISTRIBUTION: 'temurin'
+
+jobs:
+  build-and-deploy:
+    if: "!contains(github.event.head_commit.message, '[skip release]')"
+    runs-on: ubuntu-latest
+    env:
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: ${{ env.JAVA_DISTRIBUTION }}
+          java-version: ${{ env.JAVA_VERSION }}
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Bump version
+        id: version
+        run: |
+          CURRENT_VERSION=$(grep -oP 'versionName\s*=\s*"\K[^"]+' app/build.gradle.kts)
+          CURRENT_VERSION_CODE=$(grep -oP 'versionCode\s*=\s*\K\d+' app/build.gradle.kts)
+
+          if [ -z "$CURRENT_VERSION" ]; then
+            CURRENT_VERSION="1.0.0"
+          fi
+          if [ -z "$CURRENT_VERSION_CODE" ]; then
+            CURRENT_VERSION_CODE=0
+          fi
+
+          IFS='.' read -r MAJOR MINOR PATCH <<< "$CURRENT_VERSION"
+          if [ -z "$PATCH" ]; then PATCH=0; fi
+          NEW_PATCH=$((PATCH + 1))
+          NEW_VERSION="${MAJOR}.${MINOR}.${NEW_PATCH}"
+
+          NEW_VERSION_CODE=$((CURRENT_VERSION_CODE + 1))
+
+          echo "Updating version from $CURRENT_VERSION ($CURRENT_VERSION_CODE) to $NEW_VERSION ($NEW_VERSION_CODE)"
+
+          sed -i "s/versionCode = $CURRENT_VERSION_CODE/versionCode = $NEW_VERSION_CODE/" app/build.gradle.kts
+          sed -i "s/versionName = \"$CURRENT_VERSION\"/versionName = \"$NEW_VERSION\"/" app/build.gradle.kts
+
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          git add app/build.gradle.kts
+          git commit -m "chore: bump version to $NEW_VERSION ($NEW_VERSION_CODE) [skip ci]"
+          git push
+
+          echo "VERSION_CODE=$NEW_VERSION_CODE" >> $GITHUB_OUTPUT
+          echo "VERSION_NAME=$NEW_VERSION" >> $GITHUB_OUTPUT
+
+      - name: Decode Keystore
+        env:
+          KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
+        run: |
+          printf '%s' "$KEYSTORE_BASE64" | base64 -d > keystore.jks
+          echo "Keystore decoded to keystore.jks"
+
+      - name: Verify Keystore Integrity
+        run: |
+          echo "Keystore file size: $(wc -c < keystore.jks) bytes"
+          if [ ! -s keystore.jks ]; then
+            echo "❌ ERROR: Keystore file is empty or missing!"
+            exit 1
+          fi
+          echo "Keystore file exists and is non-empty"
+
+      - name: Cache Gradle packages
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Create local.properties
+        run: |
+          echo "sdk.dir=/usr/local/lib/android/sdk" > local.properties
+
+      - name: Build AAB
+        env:
+          KEYSTORE_PATH: ${{ github.workspace }}/keystore.jks
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+        run: |
+          ./gradlew bundleRelease --stacktrace
+
+      - name: Verify AAB exists
+        run: |
+          AAB_PATH="app/build/outputs/bundle/release/app-release.aab"
+          if [ ! -f "$AAB_PATH" ]; then
+            echo "AAB not found!"
+            exit 1
+          fi
+          echo "AAB found at $AAB_PATH"
+
+      - name: Upload AAB as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: app-release-${{ steps.version.outputs.VERSION_CODE }}
+          path: app/build/outputs/bundle/release/app-release.aab
+          retention-days: 30
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: v${{ steps.version.outputs.VERSION_NAME }}-${{ steps.version.outputs.VERSION_CODE }}
+          name: Release v${{ steps.version.outputs.VERSION_NAME }} (Code ${{ steps.version.outputs.VERSION_CODE }})
+          files: app/build/outputs/bundle/release/app-release.aab
+          generate_release_notes: true
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.2'
+          bundler-cache: true
+
+      - name: Install Fastlane
+        run: |
+          gem install fastlane -NV
+
+      - name: Deploy to Play Store
+        continue-on-error: true
+        env:
+          PLAY_JSON_KEY_DATA: ${{ secrets.PLAY_JSON_KEY_DATA }}
+        run: |
+          if [ -z "$PLAY_JSON_KEY_DATA" ]; then
+            echo "Skipping Play Store deployment: PLAY_JSON_KEY_DATA secret is not set."
+            exit 0
+          fi
+
+          if [ "${{ github.event_name }}" == "push" ]; then
+            TRACK="production"
+          else
+            TRACK="${{ github.event.inputs.track || 'internal' }}"
+          fi
+          echo "Deploying to track: $TRACK"
+
+          case $TRACK in
+            internal) fastlane deploy_internal ;;
+            alpha) fastlane deploy_alpha ;;
+            beta) fastlane deploy_beta ;;
+            production) fastlane deploy_production ;;
+            *) fastlane deploy_internal ;;
+          esac
+
+      - name: Build Summary
+        run: |
+          echo "## Release Summary" >> $GITHUB_STEP_SUMMARY
+          echo "- **Version Code**: ${{ steps.version.outputs.VERSION_CODE }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Version Name**: ${{ steps.version.outputs.VERSION_NAME }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Status**: ✅ Release built and GitHub Release created" >> $GITHUB_STEP_SUMMARY
\ No newline at end of file
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
new file mode 100644
index 0000000..eda14d5
--- /dev/null
+++ b/.github/workflows/test-build.yml
@@ -0,0 +1,159 @@
+name: Android CI/CD - Build Only
+
+permissions:
+  contents: write
+
+on:
+  push:
+    branches:
+      - main
+      - feature/ci-cd
+  workflow_dispatch:
+
+env:
+  JAVA_VERSION: '17'
+  JAVA_DISTRIBUTION: 'temurin'
+
+jobs:
+  build-test:
+    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    runs-on: ubuntu-latest
+    env:
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: ${{ env.JAVA_DISTRIBUTION }}
+          java-version: ${{ env.JAVA_VERSION }}
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Decode Keystore
+        env:
+          KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
+        run: |
+          printf '%s' "$KEYSTORE_BASE64" | base64 -d > keystore.jks
+          echo "Keystore decoded to keystore.jks"
+
+      - name: Verify Keystore Integrity
+        run: |
+          echo "Keystore file size: $(wc -c < keystore.jks) bytes"
+          echo "SHA256: $(sha256sum keystore.jks | cut -d' ' -f1)"
+          if [ ! -s keystore.jks ]; then
+            echo "ERROR: Keystore file is empty or missing!"
+            exit 1
+          fi
+          echo "Keystore file exists and is non-empty"
+
+      - name: Read current version
+        id: version
+        run: |
+          CURRENT_VERSION=$(grep -oP 'versionName\s*=\s*"\K[^"]+' app/build.gradle.kts)
+          CURRENT_VERSION_CODE=$(grep -oP 'versionCode\s*=\s*\K\d+' app/build.gradle.kts)
+
+          if [ -z "$CURRENT_VERSION" ]; then
+            CURRENT_VERSION="1.0.0"
+            echo "Fallback version: $CURRENT_VERSION"
+          fi
+
+          if [ -z "$CURRENT_VERSION_CODE" ]; then
+            CURRENT_VERSION_CODE=0
+            echo "Fallback version code: $CURRENT_VERSION_CODE"
+          fi
+
+          echo "VERSION_CODE=$CURRENT_VERSION_CODE" >> $GITHUB_OUTPUT
+          echo "VERSION_NAME=$CURRENT_VERSION" >> $GITHUB_OUTPUT
+          echo "Using version code: $CURRENT_VERSION_CODE"
+          echo "Using version name: $CURRENT_VERSION"
+
+      - name: Cache Gradle packages
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Create local.properties
+        run: |
+          echo "sdk.dir=/usr/local/lib/android/sdk" > local.properties
+
+      - name: Verify Keystore Credentials
+        env:
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+        run: |
+          echo "Testing keystore with provided credentials..."
+          echo "KEY_ALIAS value: $KEY_ALIAS"
+          echo "KEYSTORE_PASSWORD length: ${#KEYSTORE_PASSWORD}"
+          echo "KEY_PASSWORD length: ${#KEY_PASSWORD}"
+          keytool -list -keystore keystore.jks -storepass "$KEYSTORE_PASSWORD" -v 2>&1 | head -20 || echo "❌ Store password is WRONG"
+          echo "---"
+          keytool -keypasswd -keystore keystore.jks -storepass "$KEYSTORE_PASSWORD" -alias "$KEY_ALIAS" -keypass "$KEY_PASSWORD" -new "$KEY_PASSWORD" 2>&1 || echo "❌ Key password or alias is WRONG"
+
+      - name: Build AAB
+        env:
+          KEYSTORE_PATH: ${{ github.workspace }}/keystore.jks
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+          VERSION_CODE: ${{ steps.version.outputs.VERSION_CODE }}
+          VERSION_NAME: ${{ steps.version.outputs.VERSION_NAME }}
+        run: |
+          ./gradlew bundleRelease --stacktrace
+
+      - name: Verify AAB exists
+        run: |
+          AAB_PATH="app/build/outputs/bundle/release/app-release.aab"
+          if [ ! -f "$AAB_PATH" ]; then
+            echo "AAB not found!"
+            find app/build/outputs -name "*.aab" || true
+            exit 1
+          fi
+          echo "AAB found: $AAB_PATH"
+          ls -lh "$AAB_PATH"
+
+      - name: Upload AAB as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: app-release-${{ steps.version.outputs.VERSION_CODE }}
+          path: |
+            app/build/outputs/bundle/release/app-release.aab
+          retention-days: 30
+
+      - name: Build Summary
+        run: |
+          echo "## Build Summary" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "- **Version Code**: ${{ steps.version.outputs.VERSION_CODE }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Version Name**: ${{ steps.version.outputs.VERSION_NAME }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Status**: ✅ Build successful" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "The AAB artifact has been uploaded and can be downloaded from the workflow run." >> $GITHUB_STEP_SUMMARY
+
+      - name: Notify build status
+        if: always()
+        run: |
+          if [ ${{ job.status }} == 'success' ]; then
+            echo "Build successful"
+            echo "Version: ${{ steps.version.outputs.VERSION_NAME }}"
+            echo "Download AAB from workflow artifacts"
+          else
+            echo "Build failed"
+            echo "Check workflow logs for details"
+            exit 1
+          fi
\ No newline at end of file
diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
index e90109e..371f2e2 100644
--- a/.idea/appInsightsSettings.xml
+++ b/.idea/appInsightsSettings.xml
@@ -1,37 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="AppInsightsSettings">
-    <option name="selectedTabId" value="Firebase Crashlytics" />
     <option name="tabSettings">
       <map>
-        <entry key="Android Vitals">
-          <value>
-            <InsightsFilterSettings>
-              <option name="connection">
-                <ConnectionSetting>
-                  <option name="appId" value="com.brews.cafeorderingapp" />
-                </ConnectionSetting>
-              </option>
-              <option name="signal" value="SIGNAL_UNSPECIFIED" />
-              <option name="timeIntervalDays" value="SEVEN_DAYS" />
-              <option name="visibilityType" value="ALL" />
-            </InsightsFilterSettings>
-          </value>
-        </entry>
-        <entry key="Android vitals">
-          <value>
-            <InsightsFilterSettings>
-              <option name="connection">
-                <ConnectionSetting>
-                  <option name="appId" value="com.aarav.notesapp" />
-                </ConnectionSetting>
-              </option>
-              <option name="signal" value="SIGNAL_UNSPECIFIED" />
-              <option name="timeIntervalDays" value="SEVEN_DAYS" />
-              <option name="visibilityType" value="ALL" />
-            </InsightsFilterSettings>
-          </value>
-        </entry>
         <entry key="Firebase Crashlytics">
           <value>
             <InsightsFilterSettings>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7c8159d..4153f18 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.gradle.api.JavaVersion.VERSION_11
+import org.gradle.api.JavaVersion.VERSION_17
 import org.gradle.kotlin.dsl.implementation
 
 plugins {
@@ -6,23 +6,35 @@ plugins {
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
 
-    id("kotlin-kapt") apply true
+    kotlin("kapt")
 }
 
 android {
     namespace = "com.aarav.notesapp"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.aarav.notesapp"
         minSdk = 24
-        targetSdk = 35
+        targetSdk = 36
         versionCode = 1
-        versionName = "1.1"
+        versionName = "1.9.99"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    signingConfigs {
+        create("release") {
+            val keystorePath = System.getenv("KEYSTORE_PATH")
+            if (keystorePath != null) {
+                storeFile = file(keystorePath)
+                storePassword = System.getenv("KEYSTORE_PASSWORD")
+                keyAlias = System.getenv("KEY_ALIAS")
+                keyPassword = System.getenv("KEY_PASSWORD")
+            }
+        }
+    }
+
     buildTypes {
         release {
             isMinifyEnabled = false
@@ -30,18 +42,26 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
+            val keystorePath = System.getenv("KEYSTORE_PATH")
+            if (keystorePath != null) {
+                signingConfig = signingConfigs.getByName("release")
+            }
         }
     }
     compileOptions {
-        sourceCompatibility = VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
     buildFeatures {
         compose = true
     }
+    kapt {
+        correctErrorTypes = true
+    }
+
 }
 
 dependencies {
@@ -49,7 +69,7 @@ dependencies {
 
     implementation("androidx.navigation:navigation-compose:2.8.9")
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.8.7")
-    val room_version = "2.6.1"
+    val room_version = "2.7.2"
     implementation("androidx.compose.runtime:runtime-livedata:1.7.8")
     implementation("androidx.room:room-runtime:$room_version")
     kapt("androidx.room:room-compiler:$room_version")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1d74bc9..2e80a8f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,16 +6,15 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/logo"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@drawable/logo"
         android:supportsRtl="true"
         android:theme="@style/Theme.NotesApp"
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
             android:theme="@style/Theme.NotesApp">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/res/drawable/logo.png b/app/src/main/res/drawable/logo.png
new file mode 100644
index 0000000..03e2687
Binary files /dev/null and b/app/src/main/res/drawable/logo.png differ
diff --git a/app/src/main/res/drawable/logo_512.jpg b/app/src/main/res/drawable/logo_512.jpg
new file mode 100644
index 0000000..47a1616
Binary files /dev/null and b/app/src/main/res/drawable/logo_512.jpg differ
diff --git a/fastlane/Appfile b/fastlane/Appfile
new file mode 100644
index 0000000..43a7034
--- /dev/null
+++ b/fastlane/Appfile
@@ -0,0 +1 @@
+package_name("com.aarav.notesapp")
\ No newline at end of file
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
new file mode 100644
index 0000000..1f3651f
--- /dev/null
+++ b/fastlane/Fastfile
@@ -0,0 +1,97 @@
+default_platform(:android)
+
+platform :android do
+  desc "Build and deploy to Play Store - Internal Testing"
+  lane :deploy_internal do
+    upload_to_play_store(
+      aab: "app/build/outputs/bundle/release/app-release.aab",
+      track: "internal",
+      json_key_data: ENV["PLAY_JSON_KEY_DATA"],
+      package_name: "com.aarav.notesapp",
+      skip_upload_metadata: true,
+      skip_upload_images: true,
+      skip_upload_screenshots: true,
+      skip_upload_changelogs: true,
+      release_status: "completed"
+    )
+  end
+
+  desc "Build and deploy to Play Store - Alpha Testing"
+  lane :deploy_alpha do
+    upload_to_play_store(
+      aab: "app/build/outputs/bundle/release/app-release.aab",
+      track: "alpha",
+      json_key_data: ENV["PLAY_JSON_KEY_DATA"],
+      package_name: "com.aarav.notesapp",
+      skip_upload_metadata: true,
+      skip_upload_images: true,
+      skip_upload_screenshots: true,
+      skip_upload_changelogs: true,
+      release_status: "completed"
+    )
+  end
+
+  desc "Build and deploy to Play Store - Beta Testing"
+  lane :deploy_beta do
+    upload_to_play_store(
+      aab: "app/build/outputs/bundle/release/app-release.aab",
+      track: "beta",
+      json_key_data: ENV["PLAY_JSON_KEY_DATA"],
+      package_name: "com.aarav.notesapp",
+      skip_upload_metadata: true,
+      skip_upload_images: true,
+      skip_upload_screenshots: true,
+      skip_upload_changelogs: true,
+      release_status: "completed"
+    )
+  end
+
+  desc "Build and deploy to Play Store - Production"
+  lane :deploy_production do
+    rollout_percent = ENV["ROLLOUT_PERCENT"] ? ENV["ROLLOUT_PERCENT"].to_f : 1.0
+
+    upload_to_play_store(
+      aab: "app/build/outputs/bundle/release/app-release.aab",
+      track: "production",
+      json_key_data: ENV["PLAY_JSON_KEY_DATA"],
+      package_name: "com.aarav.notesapp",
+      skip_upload_metadata: true,
+      skip_upload_images: true,
+      skip_upload_screenshots: true,
+      skip_upload_changelogs: true,
+      release_status: "completed",
+      rollout: rollout_percent
+    )
+  end
+
+  desc "Build AAB for release"
+  lane :build_release do
+    gradle(
+      task: "bundle",
+      build_type: "Release"
+    )
+  end
+
+  desc "Build and deploy to Play Store (default: internal)"
+  lane :deploy do
+    build_release
+    deploy_internal
+  end
+
+  desc "Supply metadata to Play Store"
+  lane :supply_metadata do
+    upload_to_play_store(
+      skip_upload_apk: true,
+      skip_upload_aab: true,
+      skip_upload_metadata: false,
+      skip_upload_images: false,
+      skip_upload_screenshots: false,
+      json_key_data: ENV["PLAY_JSON_KEY_DATA"],
+      package_name: "com.aarav.notesapp"
+    )
+  end
+
+  error do |lane, exception|
+    UI.error("Lane #{lane} failed with exception: #{exception.message}")
+  end
+end
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 20e2a01..4540b75 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,14 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.resvalues=true
+android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
+android.enableAppCompileTimeRClass=false
+android.usesSdkInManifest.disallowed=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.r8.optimizedResourceShrinking=false
+android.builtInKotlin=false
+android.newDsl=false
\ No newline at end of file
diff --git a/gradle/.version b/gradle/.version
new file mode 100644
index 0000000..82e58f3
--- /dev/null
+++ b/gradle/.version
@@ -0,0 +1 @@
+1.9.99
\ No newline at end of file
diff --git a/gradle/.versioncode b/gradle/.versioncode
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/gradle/.versioncode
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 411f538..c747102 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-agp = "8.9.0-rc01"
-kotlin = "2.0.21"
+agp = "9.2.0"
+kotlin = "2.2.10"
 coreKtx = "1.15.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c8ff42c..e365d2b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Mar 27 15:56:36 IST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists