diff --git a/.github/workflows/versions.env b/.github/workflows/versions.env
index 16765a3a5..0ec87bb48 100644
--- a/.github/workflows/versions.env
+++ b/.github/workflows/versions.env
@@ -1,2 +1,2 @@
-FLUTTER_VERSION=3.27.4
+FLUTTER_VERSION=3.29.2
 JAVA_VERSION=17
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 86e9f5e5e..bb8e015cd 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -30,7 +30,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 34
+    compileSdk = 35
     namespace = "chat.fluffy.fluffychat"
 
     sourceSets {
@@ -44,7 +44,7 @@ android {
     defaultConfig {
         applicationId "chat.fluffy.fluffychat"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -67,6 +67,8 @@ android {
             versionNameSuffix "-debug"
         }
         release {
+            minifyEnabled false
+            shrinkResources false
             signingConfig signingConfigs.release
         }
     }
@@ -77,8 +79,19 @@ android {
         pickFirst 'lib/armeabi-v7a/libc++_shared.so'
         pickFirst 'lib/arm64-v8a/libc++_shared.so'
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+        coreLibraryDesugaringEnabled true
+    }
+
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 }
 
+
 flutter {
     source '../..'
 }
@@ -86,6 +99,7 @@ flutter {
 dependencies {
     //implementation 'com.google.firebase:firebase-messaging:19.0.1' // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698
     implementation 'androidx.multidex:multidex:2.0.1'
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
 }
 
 configurations.all {
diff --git a/android/gradle.properties b/android/gradle.properties
index 94adc3a3f..975e44b52 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,3 +1,4 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4608m
 android.useAndroidX=true
 android.enableJetifier=true
+kotlin.jvm.target.validation.mode=IGNORE
\ No newline at end of file
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index aeaff6f86..e33907ed2 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Mon Mar 17 08:36:03 CET 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
index 750c82f2c..dc540c56c 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.1" apply false
+    id "com.android.application" version "8.7.3" apply false
     id "org.jetbrains.kotlin.android" version "2.1.10" apply false
     // id "com.google.gms.google-services" version "4.3.8" apply false
 }
diff --git a/scripts/enable-android-google-services.patch b/scripts/enable-android-google-services.patch
index c56444146..14101ede0 100644
--- a/scripts/enable-android-google-services.patch
+++ b/scripts/enable-android-google-services.patch
@@ -1,5 +1,5 @@
 diff --git a/android/app/build.gradle b/android/app/build.gradle
-index f92f73f3..6d389efb 100644
+index bb8e015cd..3ff4a7579 100644
 --- a/android/app/build.gradle
 +++ b/android/app/build.gradle
 @@ -2,7 +2,7 @@ plugins {
@@ -11,13 +11,15 @@ index f92f73f3..6d389efb 100644
  }
  
  def localProperties = new Properties()
-@@ -83,10 +83,10 @@ flutter {
+@@ -97,11 +97,12 @@ flutter {
  }
  
  dependencies {
 -    //implementation 'com.google.firebase:firebase-messaging:19.0.1' // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698
-+    implementation 'com.google.firebase:firebase-messaging:19.0.1' // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698
++    implementation 'com.google.firebase:firebase-messaging:19.0.1'
++    // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698
      implementation 'androidx.multidex:multidex:2.0.1'
+     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
  }
  
  configurations.all {
@@ -97,7 +99,7 @@ index b2fd960a..fdb01a4d 100644
 +++ b/android/settings.gradle
 @@ -20,7 +20,7 @@ plugins {
      id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-     id "com.android.application" version "7.3.1" apply false
+     id "com.android.application" version "8.7.3" apply false
      id "org.jetbrains.kotlin.android" version "2.1.10" apply false
 -    // id "com.google.gms.google-services" version "4.3.8" apply false
 +    id "com.google.gms.google-services" version "4.3.8" apply false
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index baf96d923..7aa1d882c 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -63,7 +63,7 @@ parts:
 
   flutter-git:
     source: https://github.com/flutter/flutter.git
-    source-tag: 3.27.4
+    source-tag: 3.29.2
     plugin: nil
     override-build: |
       set -eux
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index aefa9bf6e..d2a3efb85 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -3,36 +3,37 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  app_links
-  desktop_drop
-  dynamic_color
-  emoji_picker_flutter
-  file_selector_windows
-  flutter_secure_storage_windows
-  flutter_webrtc
-  geolocator_windows
-  pasteboard
-  permission_handler_windows
-  record_windows
-  share_plus
-  sqlcipher_flutter_libs
-  url_launcher_windows
-  window_to_front
+        app_links
+        desktop_drop
+        dynamic_color
+        emoji_picker_flutter
+        file_selector_windows
+        flutter_secure_storage_windows
+        flutter_webrtc
+        geolocator_windows
+        pasteboard
+        permission_handler_windows
+        record_windows
+        share_plus
+        sqlcipher_flutter_libs
+        url_launcher_windows
+        window_to_front
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
+        flutter_local_notifications_windows
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)
 
-foreach(plugin ${FLUTTER_PLUGIN_LIST})
-  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin})
-  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
-  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
-  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
-endforeach(plugin)
+foreach (plugin ${FLUTTER_PLUGIN_LIST})
+    add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin})
+    target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
+    list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
+    list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
+endforeach (plugin)
 
-foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
-  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
-  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
-endforeach(ffi_plugin)
+foreach (ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+    add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
+    list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach (ffi_plugin)