Skip to content

Commit 36e0099

Browse files
authored
Bump flutter_template_images to remove TODO. (#160917)
Towards flutter/flutter#160692. Prior to `flutter_template_images: 4.3.0`, the `app_shared` directory was required. In 4.3.0 it was forked back out to `app` (https://pub.dev/packages/flutter_template_images/changelog), as the `skeleton` template has been removed, and the `skeleton` template was the (only) reason for `app_shared` (to share code between `app` and `skeleton`). This is a NOP change tested by existing tests.
1 parent b86154c commit 36e0099

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

packages/flutter_tools/lib/src/template.dart

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -173,22 +173,13 @@ class Template {
173173
required Logger logger,
174174
required TemplateRenderer templateRenderer,
175175
}) async {
176-
// TODO(matanl): Remove this once https://github.com/flutter/packages/pull/8336 is merged and published.
177-
// See https://github.com/flutter/flutter/issues/160692.
178-
final List<String> imageNames;
179-
if (names.contains('app')) {
180-
// Emulates what used to happen when app_shared existed. It still exist in package:flutter_template_images.
181-
imageNames = <String>[...names, 'app_shared'];
182-
} else {
183-
imageNames = names;
184-
}
185176
// All named templates are placed in the 'templates' directory
186177
return Template._(
187178
<Directory>[
188179
for (final String name in names) templatePathProvider.directoryInPackage(name, fileSystem),
189180
],
190181
<Directory>[
191-
for (final String name in imageNames)
182+
for (final String name in names)
192183
if ((await templatePathProvider.imageDirectory(name, fileSystem, logger)).existsSync())
193184
await templatePathProvider.imageDirectory(name, fileSystem, logger),
194185
],

packages/flutter_tools/lib/src/update_packages_pins.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const Map<String, String> kManuallyPinnedDependencies = <String, String>{
2222
// Add pinned packages here. Please leave a comment explaining why.
2323
'archive': '3.6.1', // https://github.com/flutter/flutter/issues/115660
2424
'flutter_gallery_assets': '1.0.2', // Tests depend on the exact version.
25-
'flutter_template_images': '4.2.0', // Must always exactly match flutter_tools template.
25+
'flutter_template_images': '4.3.0', // Must always exactly match flutter_tools template.
2626
'google_mobile_ads': '5.1.0', // https://github.com/flutter/flutter/issues/156912
2727
'intl':
2828
'0.19.0', // 0.20.0 introduces new transitive dependencies that are not (yet) cleared in Flutter's allow list.

packages/flutter_tools/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies:
2020
crypto: 3.0.6
2121
ffi: 2.1.3
2222
file: 7.0.1
23-
flutter_template_images: 4.2.0
23+
flutter_template_images: 4.3.0
2424
html: 0.15.5
2525
http: 1.2.2
2626
intl: 0.19.0
@@ -121,4 +121,4 @@ dartdoc:
121121
# Exclude this package from the hosted API docs.
122122
nodoc: true
123123

124-
# PUBSPEC CHECKSUM: fe3b
124+
# PUBSPEC CHECKSUM: 233c

0 commit comments

Comments
 (0)