From 811b5d245a25f2ee3872e5722d3ed320abe83a9c Mon Sep 17 00:00:00 2001
From: Andrew Brogdon <RedBrogdon@users.noreply.github.com>
Date: Thu, 8 Nov 2018 09:59:43 -0800
Subject: [PATCH] Fixes Future<void> issue in Shrine. (#28)

---
 .../xcshareddata/WorkspaceSettings.xcsettings            | 8 ++++++++
 jsonexample/pubspec.yaml                                 | 9 ++++++---
 .../xcshareddata/WorkspaceSettings.xcsettings            | 8 ++++++++
 shrine/lib/expanding_bottom_sheet.dart                   | 3 ++-
 4 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 jsonexample/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
 create mode 100644 shrine/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

diff --git a/jsonexample/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/jsonexample/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 000000000..949b67898
--- /dev/null
+++ b/jsonexample/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildSystemType</key>
+	<string>Original</string>
+</dict>
+</plist>
diff --git a/jsonexample/pubspec.yaml b/jsonexample/pubspec.yaml
index 09e616e30..102b3c269 100644
--- a/jsonexample/pubspec.yaml
+++ b/jsonexample/pubspec.yaml
@@ -7,19 +7,22 @@ environment:
 dependencies:
   json_annotation: ^1.0.0
   built_collection: '>=2.0.0 <5.0.0'
-  built_value: ^6.1.0
+  built_value: ^6.1.5
 
   flutter:
     sdk: flutter
 
 dev_dependencies:
-  build_runner: '>=0.9.0 <0.11.0'
-  built_value_generator: ^6.1.0
+  build_runner: ^1.0.0
+  built_value_generator: ^6.1.5
   json_serializable: ^1.0.0
 
   flutter_test:
     sdk: flutter
 
+dependency_overrides:
+  analyzer: 0.33.0
+
 flutter:
 
   uses-material-design: true
diff --git a/shrine/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/shrine/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 000000000..949b67898
--- /dev/null
+++ b/shrine/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildSystemType</key>
+	<string>Original</string>
+</dict>
+</plist>
diff --git a/shrine/lib/expanding_bottom_sheet.dart b/shrine/lib/expanding_bottom_sheet.dart
index c909eaa45..ae0301bad 100644
--- a/shrine/lib/expanding_bottom_sheet.dart
+++ b/shrine/lib/expanding_bottom_sheet.dart
@@ -381,7 +381,8 @@ class _ExpandingBottomSheetState extends State<ExpandingBottomSheet> with Ticker
   // only be relevant for Android).
   Future<bool> _onWillPop() async {
     if (!_isOpen) {
-      return SystemNavigator.pop();
+      await SystemNavigator.pop();
+      return true;
     }
 
     close();