diff --git a/android/app/build.gradle b/android/app/build.gradle
index 3d19cb4..ea4764a 100755
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -19,12 +19,12 @@ if (project.hasProperty('google-services.json')) {
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
-    flutterVersionCode = '32'
+    flutterVersionCode = '39'
 }
 
 def flutterVersionName = localProperties.getProperty('flutter.versionName')
 if (flutterVersionName == null) {
-    flutterVersionName = '1.0.32'
+    flutterVersionName = '2.0.1'
 }
 
 def keystoreProperties = new Properties()
@@ -47,12 +47,12 @@ android {
         jvmTarget = '21'
     }
 
-    // In android/app/build.gradle or android/build.gradle:
-    configurations.all {
-        resolutionStrategy {
-            force 'org.bouncycastle:bcprov-jdk18on:1.76'
-        }
-    }
+//    // In android/app/build.gradle or android/build.gradle:
+//    configurations.all {
+//        resolutionStrategy {
+//            force 'org.bouncycastle:bcprov-jdk18on:1.76'
+//        }
+//    }
 
 
     sourceSets {
@@ -93,7 +93,15 @@ android {
     // ✅ Add this block (required for 16KB support)
     packagingOptions {
         jniLibs {
-            useLegacyPackaging = false
+            useLegacyPackaging = true
+        }
+    }
+
+    // OR sometimes necessary in newer AGP versions:
+    // This is often the default, but explicitly setting it can help.
+    bundle {
+        abi {
+            enableSplit = true // Ensures a proper split per architecture
         }
     }
 }
diff --git a/android/gradle.properties b/android/gradle.properties
index 6d999e0..2b54f2e 100755
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -9,4 +9,4 @@ org.gradle.daemon=true
 org.gradle.parallel=true
 
 android.useAndroidX=true
-android.enableJetifier=true
\ No newline at end of file
+android.enableJetifier=false
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index 33c8e89..7f19508 100755
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,8 +16,9 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.32+32
+#version: 1.0.32+32
 #version: 1.0.20+21
+version: 2.0.1+39
 
 environment:
   sdk: '>=3.3.3 <4.0.0'
@@ -40,24 +41,24 @@ dependencies:
   pinput: ^5.0.0
   http: ^1.2.1
   shared_preferences: ^2.2.3
-  flutter_dotenv: ^5.1.0
+  flutter_dotenv: ^6.0.0
   adaptive_navbar: ^0.0.3
   jwt_decode: ^0.3.1
   google_fonts: ^6.2.1
-  toastification: ^2.0.0
+  toastification: ^3.0.3
   flutter_image_slideshow: ^0.1.6
   intl: ^0.19.0
   url_launcher: ^6.2.6
   flutter_svg: ^2.0.10+1
   dash_chat_2: ^0.0.21
-  firebase_messaging: ^15.2.7
-  local_auth: ^2.2.0
-  google_sign_in: ^6.2.1
+  firebase_messaging: ^16.0.3
+  local_auth: ^3.0.0
+  google_sign_in: ^7.2.0
   dio: ^5.7.0
-  firebase_core: ^3.14.0
-  firebase_auth: ^5.6.0
-  firebase_app_check: ^0.3.2+7
-  package_info_plus: ^8.3.0
+  firebase_core: ^4.2.0
+  firebase_auth: ^6.1.1
+  firebase_app_check: ^0.4.1+1
+  package_info_plus: ^9.0.0
   webview_flutter: ^4.13.0
   webview_flutter_android: ^4.7.0
   flutter_inappwebview: ^6.1.5
@@ -76,7 +77,7 @@ dev_dependencies:
   # activated in the `analysis_options.yaml` file located at the root of your
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec