From ddd618f92e6c6c5a563e227edd09ea5f6c8d9833 Mon Sep 17 00:00:00 2001
From: Brett Morgan <brettmorgan@google.com>
Date: Sat, 20 Nov 2021 02:21:53 +1000
Subject: [PATCH] Update charts_flutter to 0.12.0 (#951)

---
 experimental/web_dashboard/pubspec.lock | 12 +++++-------
 experimental/web_dashboard/pubspec.yaml |  8 +-------
 web/charts/pubspec.lock                 | 13 ++++++-------
 web/charts/pubspec.yaml                 |  5 +----
 4 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/experimental/web_dashboard/pubspec.lock b/experimental/web_dashboard/pubspec.lock
index d621c1b07..d46658b4a 100644
--- a/experimental/web_dashboard/pubspec.lock
+++ b/experimental/web_dashboard/pubspec.lock
@@ -112,16 +112,14 @@ packages:
       name: charts_common
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.11.0"
+    version: "0.12.0"
   charts_flutter:
     dependency: "direct main"
     description:
-      path: charts_flutter
-      ref: "03c2aa67d12952e7f3cbba1d87646d96a9a7cdc4"
-      resolved-ref: "03c2aa67d12952e7f3cbba1d87646d96a9a7cdc4"
-      url: "git://github.com/google/charts.git"
-    source: git
-    version: "0.11.0"
+      name: charts_flutter
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.12.0"
   checked_yaml:
     dependency: transitive
     description:
diff --git a/experimental/web_dashboard/pubspec.yaml b/experimental/web_dashboard/pubspec.yaml
index 3280a32a0..85537e1ce 100644
--- a/experimental/web_dashboard/pubspec.yaml
+++ b/experimental/web_dashboard/pubspec.yaml
@@ -15,13 +15,7 @@ dependencies:
   json_annotation: ^4.1.0
   provider: ^6.0.0
   uuid: ^3.0.0
-  # The published version of charts_flutter is not up to date with master:
-  # https://github.com/google/charts/issues/678
-  charts_flutter:
-    git:
-      url: git://github.com/google/charts.git
-      path: charts_flutter
-      ref: 03c2aa67d12952e7f3cbba1d87646d96a9a7cdc4
+  charts_flutter: ^0.12.0
 dev_dependencies:
   flutter_test:
     sdk: flutter
diff --git a/web/charts/pubspec.lock b/web/charts/pubspec.lock
index b78dec285..fba0df146 100644
--- a/web/charts/pubspec.lock
+++ b/web/charts/pubspec.lock
@@ -14,16 +14,14 @@ packages:
       name: charts_common
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.11.0"
+    version: "0.12.0"
   charts_flutter:
     dependency: "direct main"
     description:
-      path: charts_flutter
-      ref: HEAD
-      resolved-ref: "30477090290b348ed3101bc13017aae465f59017"
-      url: "https://github.com/google/charts"
-    source: git
-    version: "0.11.0"
+      name: charts_flutter
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.12.0"
   clock:
     dependency: transitive
     description:
@@ -106,3 +104,4 @@ packages:
     version: "2.1.0"
 sdks:
   dart: ">=2.12.0 <3.0.0"
+  flutter: ">=2.5.0"
diff --git a/web/charts/pubspec.yaml b/web/charts/pubspec.yaml
index bed5942d9..c2da983f4 100644
--- a/web/charts/pubspec.yaml
+++ b/web/charts/pubspec.yaml
@@ -8,10 +8,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  charts_flutter: 
-    git:
-      url: https://github.com/google/charts
-      path: charts_flutter
+  charts_flutter: ^0.12.0
   meta: ^1.1.1
   intl: ^0.17.0