diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 7bb2df6..3c85cfe 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
index f2b64cf..e56d4a4 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.1.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.10" apply false
+    id "com.android.application" version "8.5.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.20" apply false
 }
 
 include ":app"
diff --git a/lib/features/discharge/data/models/discharge.dart b/lib/features/discharge/data/models/discharge.dart
index 7c887ef..f06bde4 100644
--- a/lib/features/discharge/data/models/discharge.dart
+++ b/lib/features/discharge/data/models/discharge.dart
@@ -15,11 +15,11 @@ class StudentDischarge {
 
   factory StudentDischarge.fromJson(Map<String, dynamic> json) {
     return StudentDischarge(
-      sitBc: (json['sitBc'] as int?) == 1,
-      sitBrs: (json['sitBrs'] as int?) == 1,
-      sitDep: (json['sitDep'] as int?) == 1,
-      sitBf: (json['sitBf'] as int?) == 1,
-      sitRu: (json['sitRu'] as int?) == 1,
+      sitDep: toBool((json['sitDep'])),
+      sitBf: toBool(json['sitBf']),
+      sitBc: toBool(json['sitBc']),
+      sitRu: toBool(json['sitRu']),
+      sitBrs: toBool(json['sitBrs']),
     );
   }
 
@@ -33,3 +33,10 @@ class StudentDischarge {
     };
   }
 }
+
+bool toBool(dynamic value) {
+  if (value is bool) return value;
+  if (value is int) return value == 1;
+  if (value is String) return value.toLowerCase() == 'true' || value == '1';
+  return false; // default fallback
+}
diff --git a/pubspec.lock b/pubspec.lock
index 47cf7ee..457fdfd 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -158,14 +158,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "9.1.0"
-  flutter_dotenv:
-    dependency: "direct dev"
-    description:
-      name: flutter_dotenv
-      sha256: b7c7be5cd9f6ef7a78429cabd2774d3c4af50e79cb2b7593e3d5d763ef95c61b
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.2.1"
   flutter_lints:
     dependency: "direct dev"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 778ebdc..cc99059 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -36,8 +36,6 @@ dev_dependencies:
 
   flutter_lints: ^5.0.0
 
-  flutter_dotenv: ^5.2.1
-
 flutter:
   uses-material-design: true
   generate: true