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 @@ + + + + + BuildSystemType + Original + + 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 @@ + + + + + BuildSystemType + Original + + 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 with Ticker // only be relevant for Android). Future _onWillPop() async { if (!_isOpen) { - return SystemNavigator.pop(); + await SystemNavigator.pop(); + return true; } close();