From 01ba5f624f6cd822e6027aae69bccea3e9fc82a8 Mon Sep 17 00:00:00 2001
From: Shawn <shawn@gskinner.com>
Date: Tue, 13 Feb 2024 10:33:22 -0700
Subject: [PATCH] Remove `web` pkg, was not in use and causing dependency
 conflicts

---
 .../ephemeral/Flutter-Generated.xcconfig       |  8 ++++----
 .../ephemeral/flutter_export_environment.sh    |  8 ++++----
 pubspec.lock                                   | 18 +++++++++---------
 pubspec.yaml                                   |  4 +++-
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/macos/Flutter/ephemeral/Flutter-Generated.xcconfig b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig
index 858a4206..6023dc70 100644
--- a/macos/Flutter/ephemeral/Flutter-Generated.xcconfig
+++ b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig
@@ -1,10 +1,10 @@
 // This is a generated file; do not edit or check into version control.
-FLUTTER_ROOT=/Users/shawn/Dev/flutter
-FLUTTER_APPLICATION_PATH=/Users/shawn/Dev/gskinner/flutter-wonders-app
+FLUTTER_ROOT=C:\_dev\sdks\flutter
+FLUTTER_APPLICATION_PATH=C:\_dev\gskinner\flutter_wonders_app
 COCOAPODS_PARALLEL_CODE_SIGN=true
 FLUTTER_BUILD_DIR=build
-FLUTTER_BUILD_NAME=2.0.19
-FLUTTER_BUILD_NUMBER=8
+FLUTTER_BUILD_NAME=2.2.1
+FLUTTER_BUILD_NUMBER=2.2.1
 DART_OBFUSCATION=false
 TRACK_WIDGET_CREATION=true
 TREE_SHAKE_ICONS=false
diff --git a/macos/Flutter/ephemeral/flutter_export_environment.sh b/macos/Flutter/ephemeral/flutter_export_environment.sh
index 5468a0a4..438217e3 100755
--- a/macos/Flutter/ephemeral/flutter_export_environment.sh
+++ b/macos/Flutter/ephemeral/flutter_export_environment.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/Users/shawn/Dev/flutter"
-export "FLUTTER_APPLICATION_PATH=/Users/shawn/Dev/gskinner/flutter-wonders-app"
+export "FLUTTER_ROOT=C:\_dev\sdks\flutter"
+export "FLUTTER_APPLICATION_PATH=C:\_dev\gskinner\flutter_wonders_app"
 export "COCOAPODS_PARALLEL_CODE_SIGN=true"
 export "FLUTTER_BUILD_DIR=build"
-export "FLUTTER_BUILD_NAME=2.0.19"
-export "FLUTTER_BUILD_NUMBER=8"
+export "FLUTTER_BUILD_NAME=2.2.1"
+export "FLUTTER_BUILD_NUMBER=2.2.1"
 export "DART_OBFUSCATION=false"
 export "TRACK_WIDGET_CREATION=true"
 export "TREE_SHAKE_ICONS=false"
diff --git a/pubspec.lock b/pubspec.lock
index 6e7c5045..e843490a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -348,10 +348,10 @@ packages:
     dependency: "direct main"
     description:
       name: home_widget
-      sha256: a6483ac9817a6170c84032340421758c6424a48565cdefc651795ba7049769fc
+      sha256: c58a9e6d3b94490f1a8d5ddcbeeeeebc79abd0befe5889c26b0713fb09be6857
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.1"
+    version: "0.4.1"
   html:
     dependency: transitive
     description:
@@ -476,18 +476,18 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.12.0"
   nested:
     dependency: transitive
     description:
@@ -532,10 +532,10 @@ packages:
     dependency: transitive
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   path_parsing:
     dependency: transitive
     description:
@@ -998,5 +998,5 @@ packages:
     source: hosted
     version: "2.0.2"
 sdks:
-  dart: ">=3.2.3 <4.0.0"
+  dart: ">=3.3.0-0 <4.0.0"
   flutter: ">=3.16.6"
diff --git a/pubspec.yaml b/pubspec.yaml
index 5ea91820..60377eb3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -32,7 +32,9 @@ dependencies:
   google_maps_flutter: ^2.5.3
   google_maps_flutter_web: ^0.5.4+3
   go_router: ^13.0.1
-  home_widget: ^0.3.0
+  home_widget: ^0.4.1 # use the forked version when on `main` flutter branch
+#    git:
+#      url: https://github.com/gskinnerTeam/flutter_home_widget_fork.git
   http: ^1.1.0
   image: ^4.1.3
   image_fade: ^0.6.2