From 080dfb5eb3bca59430f6dc2d8db25ef988511b9a Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Thu, 27 Feb 2020 11:23:41 -0800 Subject: [PATCH] [flutter_tools] swap mustache dependency for mustache_template (#51578) --- packages/_flutter_web_build_script/pubspec.yaml | 4 ++-- packages/flutter_tools/BUILD.gn | 2 +- .../lib/src/build_runner/mustache_template.dart | 2 +- .../flutter_tools/lib/src/commands/update_packages.dart | 1 + packages/flutter_tools/pubspec.yaml | 8 ++++---- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/_flutter_web_build_script/pubspec.yaml b/packages/_flutter_web_build_script/pubspec.yaml index ccb17db1a6f..0bb9035ffa9 100644 --- a/packages/_flutter_web_build_script/pubspec.yaml +++ b/packages/_flutter_web_build_script/pubspec.yaml @@ -79,7 +79,7 @@ dependencies: source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - stream_transform: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + stream_transform: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test: 1.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -95,4 +95,4 @@ dartdoc: # Exclude this package from the hosted API docs. nodoc: true -# PUBSPEC CHECKSUM: 5b8f +# PUBSPEC CHECKSUM: 1490 diff --git a/packages/flutter_tools/BUILD.gn b/packages/flutter_tools/BUILD.gn index 652035e7043..ab51f886afe 100644 --- a/packages/flutter_tools/BUILD.gn +++ b/packages/flutter_tools/BUILD.gn @@ -32,7 +32,7 @@ dart_library("flutter_tools") { "//third_party/dart-pkg/pub/mime", "//third_party/dart-pkg/pub/multi_server_socket", "//third_party/dart-pkg/pub/multicast_dns", - "//third_party/dart-pkg/pub/mustache", + "//third_party/dart-pkg/pub/mustache_template", "//third_party/dart-pkg/pub/native_stack_traces", "//third_party/dart-pkg/pub/node_preamble", "//third_party/dart-pkg/pub/package_config", diff --git a/packages/flutter_tools/lib/src/build_runner/mustache_template.dart b/packages/flutter_tools/lib/src/build_runner/mustache_template.dart index 7610b649cdb..8e21ec7efd9 100644 --- a/packages/flutter_tools/lib/src/build_runner/mustache_template.dart +++ b/packages/flutter_tools/lib/src/build_runner/mustache_template.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:mustache/mustache.dart'; +import 'package:mustache_template/mustache_template.dart'; import '../base/template.dart'; diff --git a/packages/flutter_tools/lib/src/commands/update_packages.dart b/packages/flutter_tools/lib/src/commands/update_packages.dart index 8f6c03ec312..01986bc5310 100644 --- a/packages/flutter_tools/lib/src/commands/update_packages.dart +++ b/packages/flutter_tools/lib/src/commands/update_packages.dart @@ -26,6 +26,7 @@ const Map _kManuallyPinnedDependencies = { 'mockito': '^4.1.0', // Prevent mockito from downgrading to 4.0.0 'vm_service_client': '0.2.6+2', // Final version before being marked deprecated. 'video_player': '0.10.6', // 0.10.7 fails a gallery smoke test for toString. + 'package_config': '1.1.0' }; class UpdatePackagesCommand extends FlutterCommand { diff --git a/packages/flutter_tools/pubspec.yaml b/packages/flutter_tools/pubspec.yaml index dfcb6c0908a..0e88d1f637d 100644 --- a/packages/flutter_tools/pubspec.yaml +++ b/packages/flutter_tools/pubspec.yaml @@ -21,7 +21,7 @@ dependencies: json_rpc_2: 2.1.0 meta: 1.1.8 multicast_dns: 0.2.2 - mustache: 1.1.1 + mustache_template: 1.0.0+1 package_config: 1.1.0 platform: 2.2.1 process: 3.0.12 @@ -83,8 +83,8 @@ dependencies: source_map_stack_trace: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_maps: 0.10.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - sse: 3.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - stream_transform: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + sse: 3.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + stream_transform: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" sync_http: 0.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -124,4 +124,4 @@ dartdoc: # Exclude this package from the hosted API docs. nodoc: true -# PUBSPEC CHECKSUM: 3cb8 +# PUBSPEC CHECKSUM: 91d1