From 81d810f2d065229444700fd8fed89458db20ff02 Mon Sep 17 00:00:00 2001 From: Michael Lamers Date: Wed, 16 Feb 2022 02:20:37 +0100 Subject: [PATCH] Flutter version 2.10.1 (#76) bumps engine and flutter commit ids adapts tool API changes adds my name to the AUTHORS file as requested by the contribution guide --- AUTHORS | 1 + bin/internal/engine.version | 2 +- bin/internal/flutter.version | 2 +- lib/commands/build.dart | 3 ++- lib/commands/create.dart | 2 ++ lib/commands/upgrade.dart | 2 +- lib/elinux_cache.dart | 2 +- lib/elinux_package.dart | 2 +- 8 files changed, 10 insertions(+), 6 deletions(-) diff --git a/AUTHORS b/AUTHORS index 33562e8..d8fed62 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,3 +5,4 @@ # Name/Organization Sony Group Corporation +Michael Lamers (info@devmil.de) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index e4d51ed..0271767 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -890a5fca2e34db413be624fc83aeea8e61d42ce6 +ab46186b246f5a36bd1f3f295d14a43abb1e2f38 diff --git a/bin/internal/flutter.version b/bin/internal/flutter.version index 175239a..3e6c09e 100644 --- a/bin/internal/flutter.version +++ b/bin/internal/flutter.version @@ -1 +1 @@ -77d935af4db863f6abd0b9c31c7e6df2a13de57b +db747aa1331bd95bc9b3874c842261ca2d302cd5 diff --git a/lib/commands/build.dart b/lib/commands/build.dart index e22986e..b91aa8d 100644 --- a/lib/commands/build.dart +++ b/lib/commands/build.dart @@ -29,7 +29,8 @@ class ELinuxBuildCommand extends BuildCommand { class BuildPackageCommand extends BuildSubCommand with ELinuxExtension { /// See: [BuildApkCommand] in `build_apk.dart` - BuildPackageCommand({bool verboseHelp = false}) { + BuildPackageCommand({bool verboseHelp = false}) + : super(verboseHelp: verboseHelp) { addCommonDesktopBuildOptions(verboseHelp: verboseHelp); usesBuildNameOption(); argParser.addOption( diff --git a/lib/commands/create.dart b/lib/commands/create.dart index 4d6d589..b2a45d1 100644 --- a/lib/commands/create.dart +++ b/lib/commands/create.dart @@ -49,6 +49,7 @@ class ELinuxCreateCommand extends CreateCommand { Directory directory, Map context, { bool overwrite = false, + bool printStatusWhenWriting = true, }) async { // Disables https://github.com/flutter/flutter/pull/59706 by setting // templateManifest to null. @@ -68,6 +69,7 @@ class ELinuxCreateCommand extends CreateCommand { Directory directory, Map context, { bool overwrite = false, + bool printStatusWhenWriting = true, }) async { // Disables https://github.com/flutter/flutter/pull/59706 by setting // templateManifest to null. diff --git a/lib/commands/upgrade.dart b/lib/commands/upgrade.dart index 8ffc075..f243d12 100644 --- a/lib/commands/upgrade.dart +++ b/lib/commands/upgrade.dart @@ -15,7 +15,7 @@ import 'package:flutter_tools/src/base/process.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/upgrade.dart'; import 'package:flutter_tools/src/dart/pub.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/runner/flutter_command.dart'; import 'package:meta/meta.dart'; diff --git a/lib/elinux_cache.dart b/lib/elinux_cache.dart index 6fdc614..2c2cb5b 100644 --- a/lib/elinux_cache.dart +++ b/lib/elinux_cache.dart @@ -11,7 +11,7 @@ import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/features.dart'; import 'package:flutter_tools/src/flutter_cache.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; /// See: [DevelopmentArtifact] in `cache.dart` class ELinuxDevelopmentArtifact implements DevelopmentArtifact { diff --git a/lib/elinux_package.dart b/lib/elinux_package.dart index 0c7b164..e299af0 100644 --- a/lib/elinux_package.dart +++ b/lib/elinux_package.dart @@ -12,7 +12,7 @@ import 'package:flutter_tools/src/build_info.dart'; import 'package:flutter_tools/src/cmake.dart'; import 'package:flutter_tools/src/flutter_application_package.dart'; import 'package:flutter_tools/src/globals.dart' as globals; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/project.dart'; import 'package:meta/meta.dart';