From 8b20b55e5ae8f10794f7ce6ae6bf88d2857271bb Mon Sep 17 00:00:00 2001
From: Jonathan Resnick <3383923+resnickj@users.noreply.github.com>
Date: Tue, 28 Oct 2025 06:36:01 -0400
Subject: [PATCH] Fix compass_app build issues (#2729) (#2731)

Fix build issues that prevent compass_app from building and running out
of the box.

* add compass_app folders to list of workspaces in root pubspec
* align dependency versions to resolve conflicts

## Pre-launch Checklist

- [ ] I read the [Flutter Style Guide] _recently_, and have followed its
advice.
- [ x] I signed the [CLA].
- [ x] I read the [Contributors Guide].
- [ ] I have added sample code updates to the [changelog].
- [ ] I updated/added relevant documentation (doc comments with `///`).


If you need help, consider asking for advice on the #hackers-devrel
channel on [Discord].

<!-- Links -->
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Style-guide-for-Flutter-repo.md
[CLA]: https://cla.developers.google.com/
[Discord]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md
[Contributors Guide]:
https://github.com/flutter/samples/blob/main/CONTRIBUTING.md
[changelog]: ../CHANGELOG.md
---
 .../app/android/gradle/wrapper/gradle-wrapper.properties      | 2 +-
 compass_app/app/android/settings.gradle                       | 4 ++--
 compass_app/app/pubspec.yaml                                  | 2 +-
 compass_app/server/pubspec.yaml                               | 4 ++--
 pubspec.yaml                                                  | 2 ++
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/compass_app/app/android/gradle/wrapper/gradle-wrapper.properties b/compass_app/app/android/gradle/wrapper/gradle-wrapper.properties
index 5e6b54271..3c85cfe05 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 b9e43bd37..4f520718d 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 58b078d07..cbdd3ff05 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 07087f8a3..f26d031a3 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 4331ab134..e0fa3c813 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