From 4a88a32d3d94e7118eb522b08bccbf7fa9cc3602 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Thu, 14 Apr 2022 23:30:23 -0700 Subject: [PATCH 1/4] (Manual) Roll Flutter from 2b8333240d38 to df8d0eacd5bf (17 revisions) --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index 103b05611de2..5ed6264b7026 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -2b8333240d38cf72b8e13580e24d01f5a188e26c +df8d0eacd5bf1f50ec4595aa225c91d332a96882 From 02b8150b0566a30dfd0551811833502fca4e9183 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Thu, 14 Apr 2022 23:30:49 -0700 Subject: [PATCH 2/4] [tool] Bump minor version of all-plugins sample to 2.17 --- script/tool/CHANGELOG.md | 4 +++- script/tool/lib/src/create_all_plugins_app_command.dart | 2 +- script/tool/pubspec.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/script/tool/CHANGELOG.md b/script/tool/CHANGELOG.md index df76e4819e63..c6c91ebad9ab 100644 --- a/script/tool/CHANGELOG.md +++ b/script/tool/CHANGELOG.md @@ -1,7 +1,9 @@ -## NEXT +## 0.8.3 - Adds a new `readme-check` command. - Updates `publish-plugin` command documentation. +- Bumps pubspec of `all-plugins-app` to `>=2.17.0` so super parameters work in + the generated app. ## 0.8.2 diff --git a/script/tool/lib/src/create_all_plugins_app_command.dart b/script/tool/lib/src/create_all_plugins_app_command.dart index 82f29bd501f3..19a0c8b016ac 100644 --- a/script/tool/lib/src/create_all_plugins_app_command.dart +++ b/script/tool/lib/src/create_all_plugins_app_command.dart @@ -155,7 +155,7 @@ class CreateAllPluginsAppCommand extends PluginCommand { version: Version.parse('1.0.0+1'), environment: { 'sdk': VersionConstraint.compatibleWith( - Version.parse('2.12.0'), + Version.parse('2.17.0'), ), }, dependencies: { diff --git a/script/tool/pubspec.yaml b/script/tool/pubspec.yaml index f005c565be17..5f2cf6adb243 100644 --- a/script/tool/pubspec.yaml +++ b/script/tool/pubspec.yaml @@ -1,7 +1,7 @@ name: flutter_plugin_tools description: Productivity utils for flutter/plugins and flutter/packages repository: https://github.com/flutter/plugins/tree/main/script/tool -version: 0.8.2 +version: 0.8.3 dependencies: args: ^2.1.0 From 720382708e3cdb8e80c8de4f69257e3a645cf7e3 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Fri, 15 Apr 2022 00:10:26 -0700 Subject: [PATCH 3/4] [ci] Update dockerfile to 2.12.0-4.1.pre --- .ci/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/Dockerfile b/.ci/Dockerfile index 73efa3103922..f8dfe0fcb7ad 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile @@ -1,7 +1,7 @@ # The Flutter version is not important here, since the CI scripts update Flutter # before running. What matters is that the base image is pinned to minimize # unintended changes when modifying this file. -FROM cirrusci/flutter:2.8.0 +FROM cirrusci/flutter:2.12.0-4.1.pre RUN apt-get update -y From baec580061b8f2adb6cca2d8d684dc6c20e51610 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Fri, 15 Apr 2022 00:18:19 -0700 Subject: [PATCH 4/4] Fix test for minimum sdk version --- script/tool/test/create_all_plugins_app_command_test.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/tool/test/create_all_plugins_app_command_test.dart b/script/tool/test/create_all_plugins_app_command_test.dart index 0066cc53f61a..095c42caaac3 100644 --- a/script/tool/test/create_all_plugins_app_command_test.dart +++ b/script/tool/test/create_all_plugins_app_command_test.dart @@ -76,14 +76,14 @@ void main() { ])); }); - test('pubspec is compatible with null-safe app code', () async { + test('pubspec is compatible with super parameters in app code', () async { createFakePlugin('plugina', packagesDir); await runCapturingPrint(runner, ['all-plugins-app']); final String pubspec = command.appDirectory.childFile('pubspec.yaml').readAsStringSync(); - expect(pubspec, contains(RegExp('sdk:\\s*(?:["\']>=|[^])2\\.12\\.'))); + expect(pubspec, contains(RegExp('sdk:\\s*(?:["\']>=|[^])2\\.17\\.'))); }); test('handles --output-dir', () async {