firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump flutter_template_images to remove TODO. (#160917)

Browse Source 
Towards https://github.com/flutter/flutter/issues/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.
This commit is contained in:
Matan Lurey 2024-12-27 14:15:54 -08:00 committed by GitHub
parent b86154c44e
commit 36e0099c4a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/flutter_tools/lib/src/template.dart
View File

@ -173,22 +173,13 @@ class Template {
required Logger logger, required Logger logger,
required TemplateRenderer templateRenderer, required TemplateRenderer templateRenderer,
}) async { }) async {
// TODO(matanl): Remove this once https://github.com/flutter/packages/pull/8336 is merged and published.
// See https://github.com/flutter/flutter/issues/160692.
final List<String> imageNames;
if (names.contains('app')) {
// Emulates what used to happen when app_shared existed. It still exist in package:flutter_template_images.
imageNames = <String>[...names, 'app_shared'];
} else {
imageNames = names;
}
// All named templates are placed in the 'templates' directory // All named templates are placed in the 'templates' directory
return Template._( return Template._(
<Directory>[ <Directory>[
for (final String name in names) templatePathProvider.directoryInPackage(name, fileSystem), for (final String name in names) templatePathProvider.directoryInPackage(name, fileSystem),
], ],
<Directory>[ <Directory>[
for (final String name in imageNames) for (final String name in names)
if ((await templatePathProvider.imageDirectory(name, fileSystem, logger)).existsSync()) if ((await templatePathProvider.imageDirectory(name, fileSystem, logger)).existsSync())
await templatePathProvider.imageDirectory(name, fileSystem, logger), await templatePathProvider.imageDirectory(name, fileSystem, logger),
], ],

2
packages/flutter_tools/lib/src/update_packages_pins.dart
View File

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

4
packages/flutter_tools/pubspec.yaml
View File

@ -20,7 +20,7 @@ dependencies:
crypto: 3.0.6 crypto: 3.0.6
ffi: 2.1.3 ffi: 2.1.3
file: 7.0.1 file: 7.0.1
flutter_template_images: 4.2.0 flutter_template_images: 4.3.0
html: 0.15.5 html: 0.15.5
http: 1.2.2 http: 1.2.2
intl: 0.19.0 intl: 0.19.0
@ -121,4 +121,4 @@ dartdoc:
# Exclude this package from the hosted API docs. # Exclude this package from the hosted API docs.
nodoc: true nodoc: true
# PUBSPEC CHECKSUM: fe3b # PUBSPEC CHECKSUM: 233c