Skip to content

Commit 907d8d3

Browse files
Fix the build-all exclusion list (flutter#3552)
build_all_plugins_app.sh contains an exclusion list, which currently contains almost all of the non-app-facing plugins. However, the script those exclusions are passed to expects federated plugin exclusions to be of the form plugin_name/plugin_name_subplugin_name, not just plugin_name_subplugin_name, so in practice almost nothing on that list has actually been doing anything. This fixes the script to allow either mode of exclusion (since clearly people expect using just the name to work), and scrubs everything from the list that clearly wasn't actually needed.
1 parent 7e9c79b commit 907d8d3

File tree

3 files changed

+16
-37
lines changed

3 files changed

+16
-37
lines changed

script/build_all_plugins_app.sh

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,19 @@ source "$SCRIPT_DIR/nnbd_plugins.sh"
1818

1919
check_changed_packages > /dev/null
2020

21+
# This list should be kept as short as possible, and things should remain here
22+
# only as long as necessary, since in general the goal is for all of the latest
23+
# versions of plugins to be mutually compatible.
24+
#
25+
# An example use case for this list would be to temporarily add plugins while
26+
# updating multiple plugins for a breaking change in a common dependency in
27+
# cases where using a relaxed version constraint isn't possible.
2128
readonly EXCLUDED_PLUGINS_LIST=(
22-
"connectivity_macos"
23-
"connectivity_platform_interface"
24-
"connectivity_web"
25-
"extension_google_sign_in_as_googleapis_auth"
26-
"file_selector" # currently out of sync with camera
27-
"flutter_plugin_android_lifecycle"
28-
"google_maps_flutter_platform_interface"
29-
"google_maps_flutter_web"
30-
"google_sign_in_platform_interface"
31-
"google_sign_in_web"
32-
"image_picker_platform_interface"
33-
"image_picker"
34-
"instrumentation_adapter"
35-
"local_auth" # flutter_plugin_android_lifecycle conflict
36-
"path_provider_linux"
37-
"path_provider_macos"
38-
"path_provider_platform_interface"
39-
"path_provider_web"
40-
"plugin_platform_interface"
41-
"shared_preferences_linux"
42-
"shared_preferences_macos"
43-
"shared_preferences_platform_interface"
44-
"shared_preferences_web"
45-
"shared_preferences_windows"
46-
"url_launcher_linux"
47-
"url_launcher_macos"
48-
"url_launcher_platform_interface"
49-
"url_launcher_web"
50-
"video_player_platform_interface"
51-
"video_player_web"
29+
# "file_selector" # currently out of sync with camera
30+
# "flutter_plugin_android_lifecycle"
31+
# "image_picker"
32+
# "local_auth" # flutter_plugin_android_lifecycle conflict
33+
"plugin_platform_interface" # This should never be a direct app dependency.
5234
)
5335
# Comma-separated string of the list above
5436
readonly EXCLUDED=$(IFS=, ; echo "${EXCLUDED_PLUGINS_LIST[*]}")

script/nnbd_plugins.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,8 @@ readonly NNBD_PLUGINS_LIST=(
3939
# building the all plugins app. This list should be kept empty.
4040

4141
readonly NON_NNBD_PLUGINS_LIST=(
42-
#"camera"
43-
"google_maps_flutter"
44-
# "image_picker"
45-
# "in_app_purchase"
46-
# "quick_actions"
47-
# "sensors"
48-
# "wifi_info_flutter"
42+
"extension_google_sign_in_as_googleapis_auth"
43+
"google_maps_flutter" # partially migrated
4944
)
5045

5146
export EXCLUDED_PLUGINS_FROM_STABLE=$(IFS=, ; echo "${NNBD_PLUGINS_LIST[*]}")

script/tool/lib/src/common.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,10 @@ abstract class PluginCommand extends Command<Null> {
294294
// passed.
295295
final String relativePath =
296296
p.relative(subdir.path, from: packagesDir.path);
297+
final String packageName = p.basename(subdir.path);
297298
final String basenamePath = p.basename(entity.path);
298299
if (!excludedPlugins.contains(basenamePath) &&
300+
!excludedPlugins.contains(packageName) &&
299301
!excludedPlugins.contains(relativePath) &&
300302
(plugins.isEmpty ||
301303
plugins.contains(relativePath) ||

0 commit comments

Comments
 (0)