diff --git a/compass_app/app/android/gradle/wrapper/gradle-wrapper.properties b/compass_app/app/android/gradle/wrapper/gradle-wrapper.properties
index 5e6b5427113..3c85cfe057a 100644
--- a/compass_app/app/android/gradle/wrapper/gradle-wrapper.properties
+++ b/compass_app/app/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.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
diff --git a/compass_app/app/android/settings.gradle b/compass_app/app/android/settings.gradle
index b9e43bd3761..4f520718dcc 100644
--- a/compass_app/app/android/settings.gradle
+++ b/compass_app/app/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.22" apply false
+    id "com.android.application" version "8.6.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"
diff --git a/compass_app/app/pubspec.yaml b/compass_app/app/pubspec.yaml
index 58b078d071b..cbdd3ff056f 100644
--- a/compass_app/app/pubspec.yaml
+++ b/compass_app/app/pubspec.yaml
@@ -15,7 +15,7 @@ dependencies:
   flutter_localizations:
     sdk: flutter
   flutter_svg: ^2.0.16
-  freezed_annotation: ^2.4.4
+  freezed_annotation: ^3.0.0
   go_router: ^16.0.0
   google_fonts: ^6.2.1
   intl: any
diff --git a/compass_app/server/pubspec.yaml b/compass_app/server/pubspec.yaml
index 07087f8a3c8..f26d031a359 100644
--- a/compass_app/server/pubspec.yaml
+++ b/compass_app/server/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
   args: ^2.4.0
   shelf: ^1.4.0
   shelf_router: ^1.1.0
-  freezed_annotation: ^2.4.4
+  freezed_annotation: ^3.0.0
   json_annotation: ^4.9.0
 
 dev_dependencies:
@@ -20,5 +20,5 @@ dev_dependencies:
     path: ../../analysis_defaults
   test: ^1.24.0
   build_runner: ^2.4.11
-  freezed: ^2.5.7
+  freezed: ^3.0.0
   json_serializable: ^6.8.0
diff --git a/pubspec.yaml b/pubspec.yaml
index 4331ab13431..e0fa3c813ff 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -19,6 +19,8 @@ workspace:
   - code_sharing/client
   - code_sharing/server
   - code_sharing/shared
+  - compass_app/app
+  - compass_app/server
   - context_menus
   - date_planner
   - deeplink_store_example