Unverified Commit 195a1cc4 authored by Michael Goderbauer's avatar Michael Goderbauer Committed by GitHub

Prepare `dev` (minus `flutter_gallery`) for `use_super_parameters` (#100516)

parent 43029beb
name: flutter_automated_tests name: flutter_automated_tests
environment: environment:
sdk: ">=2.12.0-0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -2,7 +2,7 @@ name: complex_layout ...@@ -2,7 +2,7 @@ name: complex_layout
description: A benchmark of a relatively complex layout. description: A benchmark of a relatively complex layout.
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -2,7 +2,7 @@ name: macrobenchmarks ...@@ -2,7 +2,7 @@ name: macrobenchmarks
description: Performance benchmarks using flutter drive. description: Performance benchmarks using flutter drive.
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -2,7 +2,7 @@ name: microbenchmarks ...@@ -2,7 +2,7 @@ name: microbenchmarks
description: Small benchmarks for very specific parts of the Flutter framework. description: Small benchmarks for very specific parts of the Flutter framework.
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
meta: 1.7.0 meta: 1.7.0
......
...@@ -4,7 +4,7 @@ description: A module that is embedded in the multiple_flutters benchmark test. ...@@ -4,7 +4,7 @@ description: A module that is embedded in the multiple_flutters benchmark test.
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -5,7 +5,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev ...@@ -5,7 +5,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -15,8 +15,8 @@ void main() { ...@@ -15,8 +15,8 @@ void main() {
class PlatformViewApp extends StatefulWidget { class PlatformViewApp extends StatefulWidget {
const PlatformViewApp({ const PlatformViewApp({
Key? key, super.key,
}) : super(key: key); });
@override @override
PlatformViewAppState createState() => PlatformViewAppState(); PlatformViewAppState createState() => PlatformViewAppState();
...@@ -40,7 +40,7 @@ class PlatformViewAppState extends State<PlatformViewApp> { ...@@ -40,7 +40,7 @@ class PlatformViewAppState extends State<PlatformViewApp> {
} }
class PlatformViewLayout extends StatelessWidget { class PlatformViewLayout extends StatelessWidget {
const PlatformViewLayout({ Key? key }) : super(key: key); const PlatformViewLayout({ super.key });
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
...@@ -70,7 +70,7 @@ class PlatformViewLayout extends StatelessWidget { ...@@ -70,7 +70,7 @@ class PlatformViewLayout extends StatelessWidget {
} }
class DummyPlatformView extends StatelessWidget { class DummyPlatformView extends StatelessWidget {
const DummyPlatformView({Key? key}) : super(key: key); const DummyPlatformView({super.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
...@@ -96,7 +96,7 @@ class DummyPlatformView extends StatelessWidget { ...@@ -96,7 +96,7 @@ class DummyPlatformView extends StatelessWidget {
} }
class RotationContainer extends StatefulWidget { class RotationContainer extends StatefulWidget {
const RotationContainer({Key? key}) : super(key: key); const RotationContainer({super.key});
@override @override
State<RotationContainer> createState() => _RotationContainerState(); State<RotationContainer> createState() => _RotationContainerState();
......
...@@ -2,7 +2,7 @@ name: platform_views_layout ...@@ -2,7 +2,7 @@ name: platform_views_layout
description: A benchmark for platform views. description: A benchmark for platform views.
environment: environment:
sdk: ">=2.12.0-0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -12,9 +12,9 @@ class AndroidPlatformView extends StatelessWidget { ...@@ -12,9 +12,9 @@ class AndroidPlatformView extends StatelessWidget {
/// Creates a platform view for Android, which is rendered as a /// Creates a platform view for Android, which is rendered as a
/// native view. /// native view.
const AndroidPlatformView({ const AndroidPlatformView({
Key? key, super.key,
required this.viewType, required this.viewType,
}) : super(key: key); });
/// The unique identifier for the view type to be embedded by this widget. /// The unique identifier for the view type to be embedded by this widget.
/// ///
......
...@@ -19,8 +19,8 @@ void main() { ...@@ -19,8 +19,8 @@ void main() {
class PlatformViewApp extends StatefulWidget { class PlatformViewApp extends StatefulWidget {
const PlatformViewApp({ const PlatformViewApp({
Key? key super.key
}) : super(key: key); });
@override @override
PlatformViewAppState createState() => PlatformViewAppState(); PlatformViewAppState createState() => PlatformViewAppState();
...@@ -44,7 +44,7 @@ class PlatformViewAppState extends State<PlatformViewApp> { ...@@ -44,7 +44,7 @@ class PlatformViewAppState extends State<PlatformViewApp> {
} }
class PlatformViewLayout extends StatelessWidget { class PlatformViewLayout extends StatelessWidget {
const PlatformViewLayout({ Key? key }) : super(key: key); const PlatformViewLayout({ super.key });
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
...@@ -74,7 +74,7 @@ class PlatformViewLayout extends StatelessWidget { ...@@ -74,7 +74,7 @@ class PlatformViewLayout extends StatelessWidget {
} }
class DummyPlatformView extends StatelessWidget { class DummyPlatformView extends StatelessWidget {
const DummyPlatformView({Key? key}) : super(key: key); const DummyPlatformView({super.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
...@@ -101,7 +101,7 @@ class DummyPlatformView extends StatelessWidget { ...@@ -101,7 +101,7 @@ class DummyPlatformView extends StatelessWidget {
} }
class RotationContainer extends StatefulWidget { class RotationContainer extends StatefulWidget {
const RotationContainer({Key? key}) : super(key: key); const RotationContainer({super.key});
@override @override
State<RotationContainer> createState() => _RotationContainerState(); State<RotationContainer> createState() => _RotationContainerState();
......
...@@ -2,7 +2,7 @@ name: platform_views_layout_hybrid_composition ...@@ -2,7 +2,7 @@ name: platform_views_layout_hybrid_composition
description: A benchmark for platform views, using hybrid composition on android. description: A benchmark for platform views, using hybrid composition on android.
environment: environment:
sdk: ">=2.12.0-0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
name: stocks name: stocks
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -16,6 +16,7 @@ import 'package:analyzer/dart/ast/visitor.dart'; ...@@ -16,6 +16,7 @@ import 'package:analyzer/dart/ast/visitor.dart';
import 'package:crypto/crypto.dart'; import 'package:crypto/crypto.dart';
import 'package:meta/meta.dart'; import 'package:meta/meta.dart';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
import 'package:pub_semver/pub_semver.dart';
import 'allowlist.dart'; import 'allowlist.dart';
import 'run_command.dart'; import 'run_command.dart';
...@@ -523,7 +524,7 @@ class _TestSkip { ...@@ -523,7 +524,7 @@ class _TestSkip {
Iterable<_TestSkip> _getTestSkips(File file) { Iterable<_TestSkip> _getTestSkips(File file) {
final ParseStringResult parseResult = parseFile( final ParseStringResult parseResult = parseFile(
featureSet: FeatureSet.latestLanguageVersion(), featureSet: FeatureSet.fromEnableFlags2(sdkLanguageVersion: Version.parse('2.17.0-0'), flags: <String>['super-parameters']),
path: file.absolute.path, path: file.absolute.path,
); );
final _TestSkipLinesVisitor<CompilationUnit> visitor = _TestSkipLinesVisitor<CompilationUnit>(parseResult); final _TestSkipLinesVisitor<CompilationUnit> visitor = _TestSkipLinesVisitor<CompilationUnit>(parseResult);
......
...@@ -2,7 +2,7 @@ name: tests_on_bots ...@@ -2,7 +2,7 @@ name: tests_on_bots
description: Scripts which run on bots. description: Scripts which run on bots.
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
args: 2.3.0 args: 2.3.0
......
...@@ -4,7 +4,7 @@ description: Flutter Automated Release Tool ...@@ -4,7 +4,7 @@ description: Flutter Automated Release Tool
publish_to: none publish_to: none
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
archive: 3.1.11 archive: 3.1.11
......
...@@ -14,7 +14,7 @@ Future<void> main(List<String> args) async { ...@@ -14,7 +14,7 @@ Future<void> main(List<String> args) async {
} }
class FakeBuildTestTask extends BuildTestTask { class FakeBuildTestTask extends BuildTestTask {
FakeBuildTestTask(List<String> args) : super(args, runFlutterClean: false) { FakeBuildTestTask(super.args) : super(runFlutterClean: false) {
deviceOperatingSystem = DeviceOperatingSystem.fake; deviceOperatingSystem = DeviceOperatingSystem.fake;
} }
......
...@@ -84,7 +84,7 @@ abstract class _Benchmark { ...@@ -84,7 +84,7 @@ abstract class _Benchmark {
/// Times how long it takes to analyze the Flutter repository. /// Times how long it takes to analyze the Flutter repository.
class _FlutterRepoBenchmark extends _Benchmark { class _FlutterRepoBenchmark extends _Benchmark {
_FlutterRepoBenchmark({bool watch = false}) : super(watch: watch); _FlutterRepoBenchmark({super.watch});
@override @override
String get title => 'Flutter repo'; String get title => 'Flutter repo';
...@@ -100,7 +100,7 @@ class _FlutterRepoBenchmark extends _Benchmark { ...@@ -100,7 +100,7 @@ class _FlutterRepoBenchmark extends _Benchmark {
/// Times how long it takes to analyze the generated "mega_gallery" app. /// Times how long it takes to analyze the generated "mega_gallery" app.
class _MegaGalleryBenchmark extends _Benchmark { class _MegaGalleryBenchmark extends _Benchmark {
_MegaGalleryBenchmark({bool watch = false}) : super(watch: watch); _MegaGalleryBenchmark({super.watch});
@override @override
String get title => 'mega gallery'; String get title => 'mega gallery';
......
...@@ -1029,35 +1029,23 @@ const List<String> _kCommonScoreKeys = <String>[ ...@@ -1029,35 +1029,23 @@ const List<String> _kCommonScoreKeys = <String>[
class PerfTestWithSkSL extends PerfTest { class PerfTestWithSkSL extends PerfTest {
PerfTestWithSkSL( PerfTestWithSkSL(
String testDirectory, super.testDirectory,
String testTarget, super.testTarget,
String timelineFileName, { String super.timelineFileName, {
bool measureCpuGpu = false, super.measureCpuGpu = false,
String? testDriver, super.testDriver,
bool needsFullTimeline = true, super.needsFullTimeline,
List<String>? benchmarkScoreKeys, super.benchmarkScoreKeys,
}) : super( });
testDirectory,
testTarget,
timelineFileName,
measureCpuGpu: measureCpuGpu,
testDriver: testDriver,
needsFullTimeline: needsFullTimeline,
benchmarkScoreKeys: benchmarkScoreKeys,
);
PerfTestWithSkSL.e2e( PerfTestWithSkSL.e2e(
String testDirectory, super.testDirectory,
String testTarget, { super.testTarget, {
String testDriver = 'test_driver/e2e_test.dart', String super.testDriver,
String resultFilename = 'e2e_perf_summary', super.resultFilename,
}) : super.e2e( }) : super.e2e(
testDirectory,
testTarget,
testDriver: testDriver,
needsFullTimeline: false, needsFullTimeline: false,
resultFilename: resultFilename,
); );
@override @override
......
...@@ -3,7 +3,7 @@ description: Flutter continuous integration performance and correctness tests. ...@@ -3,7 +3,7 @@ description: Flutter continuous integration performance and correctness tests.
homepage: https://github.com/flutter/flutter homepage: https://github.com/flutter/flutter
environment: environment:
sdk: ">=2.12.0-0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
archive: 3.1.11 archive: 3.1.11
......
...@@ -180,7 +180,7 @@ class CommandArgs { ...@@ -180,7 +180,7 @@ class CommandArgs {
} }
class FakeDevice extends AndroidDevice { class FakeDevice extends AndroidDevice {
FakeDevice({required String deviceId}) : super(deviceId: deviceId); FakeDevice({required super.deviceId});
static String output = ''; static String output = '';
......
name: platform_integration name: platform_integration
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
...@@ -4,7 +4,7 @@ description: A new Flutter project. ...@@ -4,7 +4,7 @@ description: A new Flutter project.
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -14,7 +14,7 @@ description: A new Flutter project. ...@@ -14,7 +14,7 @@ description: A new Flutter project.
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -2,7 +2,7 @@ name: channels ...@@ -2,7 +2,7 @@ name: channels
description: Integration test for platform channels. description: Integration test for platform channels.
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -2,7 +2,7 @@ name: external_ui ...@@ -2,7 +2,7 @@ name: external_ui
description: A test of Flutter integrating external UIs. description: A test of Flutter integrating external UIs.
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -2,7 +2,7 @@ name: flavors ...@@ -2,7 +2,7 @@ name: flavors
description: Integration test for build flavors. description: Integration test for build flavors.
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -2,7 +2,7 @@ name: gradle_deprecated_settings ...@@ -2,7 +2,7 @@ name: gradle_deprecated_settings
description: Integration test for the current settings.gradle. description: Integration test for the current settings.gradle.
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -14,7 +14,7 @@ description: A new flutter module project. ...@@ -14,7 +14,7 @@ description: A new flutter module project.
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -13,7 +13,7 @@ name: ios_app_with_extensions ...@@ -13,7 +13,7 @@ name: ios_app_with_extensions
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -3,7 +3,7 @@ name: ios_platform_view_tests ...@@ -3,7 +3,7 @@ name: ios_platform_view_tests
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -11,7 +11,7 @@ void main() { ...@@ -11,7 +11,7 @@ void main() {
} }
class MyApp extends StatelessWidget { class MyApp extends StatelessWidget {
const MyApp({Key? key}) : super(key: key); const MyApp({super.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
......
...@@ -5,7 +5,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev ...@@ -5,7 +5,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ">=2.12.0-0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -2,7 +2,7 @@ name: platform_interaction ...@@ -2,7 +2,7 @@ name: platform_interaction
description: Integration test for platform interactions. description: Integration test for platform interactions.
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
name: release_smoke_test name: release_smoke_test
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -2,7 +2,7 @@ name: integration_ui ...@@ -2,7 +2,7 @@ name: integration_ui
description: Flutter non-plugin UI integration tests. description: Flutter non-plugin UI integration tests.
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
# The "image" dependency below seems to only be needed for test_driver/screenshot_test.dart # The "image" dependency below seems to only be needed for test_driver/screenshot_test.dart
# It can probably be removed, see the comment in that file. # It can probably be removed, see the comment in that file.
......
...@@ -2,7 +2,7 @@ name: web_integration ...@@ -2,7 +2,7 @@ name: web_integration
description: Integration test for web compilation. description: Integration test for web compilation.
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
flutter: flutter:
assets: assets:
......
...@@ -2,7 +2,7 @@ name: web_e2e_tests ...@@ -2,7 +2,7 @@ name: web_e2e_tests
publish_to: none publish_to: none
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
flutter: flutter:
assets: assets:
......
name: manual_tests name: manual_tests
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
name: missing_dependency_tests name: missing_dependency_tests
environment: environment:
sdk: ">=2.12.0-0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
import 'template.dart'; import 'template.dart';
class SurfaceTintTemplate extends TokenTemplate { class SurfaceTintTemplate extends TokenTemplate {
const SurfaceTintTemplate(String fileName, Map<String, dynamic> tokens) : super(fileName, tokens); const SurfaceTintTemplate(super.fileName, super.tokens);
@override @override
String generate() => ''' String generate() => '''
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
import 'template.dart'; import 'template.dart';
class TypographyTemplate extends TokenTemplate { class TypographyTemplate extends TokenTemplate {
const TypographyTemplate(String fileName, Map<String, dynamic> tokens) : super(fileName, tokens); const TypographyTemplate(super.fileName, super.tokens);
@override @override
String generate() => ''' String generate() => '''
......
...@@ -3,7 +3,7 @@ description: A command line script to generate Material component defaults from ...@@ -3,7 +3,7 @@ description: A command line script to generate Material component defaults from
version: 1.0.0 version: 1.0.0
environment: environment:
sdk: ">=2.12.0-0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
......
...@@ -120,7 +120,7 @@ static final String tokenBar = 'bar'; ...@@ -120,7 +120,7 @@ static final String tokenBar = 'bar';
} }
class TestTemplate extends TokenTemplate { class TestTemplate extends TokenTemplate {
TestTemplate(String fileName, Map<String, dynamic> tokens) : super(fileName, tokens); TestTemplate(super.fileName, super.tokens);
@override @override
String generate() => ''' String generate() => '''
......
...@@ -13,8 +13,7 @@ import 'utils.dart'; ...@@ -13,8 +13,7 @@ import 'utils.dart';
/// Generates the key mapping for Android, based on the information in the key /// Generates the key mapping for Android, based on the information in the key
/// data structure given to it. /// data structure given to it.
class AndroidCodeGenerator extends PlatformCodeGenerator { class AndroidCodeGenerator extends PlatformCodeGenerator {
AndroidCodeGenerator(PhysicalKeyData physicalData, LogicalKeyData logicalData) AndroidCodeGenerator(super.physicalData, super.logicalData);
: super(physicalData, logicalData);
/// This generates the map of Android key codes to logical keys. /// This generates the map of Android key codes to logical keys.
String get _androidKeyCodeMap { String get _androidKeyCodeMap {
......
...@@ -48,8 +48,7 @@ abstract class BaseCodeGenerator { ...@@ -48,8 +48,7 @@ abstract class BaseCodeGenerator {
/// A code generator which also defines platform-based behavior. /// A code generator which also defines platform-based behavior.
abstract class PlatformCodeGenerator extends BaseCodeGenerator { abstract class PlatformCodeGenerator extends BaseCodeGenerator {
PlatformCodeGenerator(PhysicalKeyData keyData, LogicalKeyData logicalData) PlatformCodeGenerator(super.keyData, super.logicalData);
: super(keyData, logicalData);
/// Absolute path to the output file. /// Absolute path to the output file.
/// ///
......
...@@ -15,13 +15,12 @@ import 'utils.dart'; ...@@ -15,13 +15,12 @@ import 'utils.dart';
/// data structure given to it. /// data structure given to it.
class GtkCodeGenerator extends PlatformCodeGenerator { class GtkCodeGenerator extends PlatformCodeGenerator {
GtkCodeGenerator( GtkCodeGenerator(
PhysicalKeyData keyData, super.keyData,
LogicalKeyData logicalData, super.logicalData,
String modifierBitMapping, String modifierBitMapping,
String lockBitMapping, String lockBitMapping,
) : _modifierBitMapping = parseMapOfListOfString(modifierBitMapping), ) : _modifierBitMapping = parseMapOfListOfString(modifierBitMapping),
_lockBitMapping = parseMapOfListOfString(lockBitMapping), _lockBitMapping = parseMapOfListOfString(lockBitMapping);
super(keyData, logicalData);
/// This generates the map of XKB scan codes to Flutter physical keys. /// This generates the map of XKB scan codes to Flutter physical keys.
String get _xkbScanCodeMap { String get _xkbScanCodeMap {
......
...@@ -28,8 +28,7 @@ const List<String> kSpecialLogicalKeys = <String>['CapsLock']; ...@@ -28,8 +28,7 @@ const List<String> kSpecialLogicalKeys = <String>['CapsLock'];
/// Generates the key mapping for iOS, based on the information in the key /// Generates the key mapping for iOS, based on the information in the key
/// data structure given to it. /// data structure given to it.
class IOSCodeGenerator extends PlatformCodeGenerator { class IOSCodeGenerator extends PlatformCodeGenerator {
IOSCodeGenerator(PhysicalKeyData keyData, LogicalKeyData logicalData) IOSCodeGenerator(super.keyData, super.logicalData);
: super(keyData, logicalData);
/// This generates the map of iOS key codes to physical keys. /// This generates the map of iOS key codes to physical keys.
String get _scanCodeMap { String get _scanCodeMap {
......
...@@ -49,7 +49,7 @@ class SynonymKeyInfo { ...@@ -49,7 +49,7 @@ class SynonymKeyInfo {
/// Generates the keyboard_key.dart based on the information in the key data /// Generates the keyboard_key.dart based on the information in the key data
/// structure given to it. /// structure given to it.
class KeyboardKeysCodeGenerator extends BaseCodeGenerator { class KeyboardKeysCodeGenerator extends BaseCodeGenerator {
KeyboardKeysCodeGenerator(PhysicalKeyData keyData, LogicalKeyData logicalData) : super(keyData, logicalData); KeyboardKeysCodeGenerator(super.keyData, super.logicalData);
/// Gets the generated definitions of PhysicalKeyboardKeys. /// Gets the generated definitions of PhysicalKeyboardKeys.
String get _physicalDefinitions { String get _physicalDefinitions {
......
...@@ -37,8 +37,7 @@ bool _isDigit(String? char) { ...@@ -37,8 +37,7 @@ bool _isDigit(String? char) {
/// Generates the keyboard_maps.dart files, based on the information in the key /// Generates the keyboard_maps.dart files, based on the information in the key
/// data structure given to it. /// data structure given to it.
class KeyboardMapsCodeGenerator extends BaseCodeGenerator { class KeyboardMapsCodeGenerator extends BaseCodeGenerator {
KeyboardMapsCodeGenerator(PhysicalKeyData keyData, LogicalKeyData logicalData) KeyboardMapsCodeGenerator(super.keyData, super.logicalData);
: super(keyData, logicalData);
List<PhysicalKeyEntry> get _numpadKeyData { List<PhysicalKeyEntry> get _numpadKeyData {
return keyData.entries.where((PhysicalKeyEntry entry) { return keyData.entries.where((PhysicalKeyEntry entry) {
......
...@@ -28,8 +28,7 @@ const List<String> kSpecialLogicalKeys = <String>['CapsLock']; ...@@ -28,8 +28,7 @@ const List<String> kSpecialLogicalKeys = <String>['CapsLock'];
/// Generates the key mapping for macOS, based on the information in the key /// Generates the key mapping for macOS, based on the information in the key
/// data structure given to it. /// data structure given to it.
class MacOSCodeGenerator extends PlatformCodeGenerator { class MacOSCodeGenerator extends PlatformCodeGenerator {
MacOSCodeGenerator(PhysicalKeyData keyData, LogicalKeyData logicalData) MacOSCodeGenerator(super.keyData, super.logicalData);
: super(keyData, logicalData);
/// This generates the map of macOS key codes to physical keys. /// This generates the map of macOS key codes to physical keys.
String get _scanCodeMap { String get _scanCodeMap {
......
...@@ -16,7 +16,7 @@ String _toUpperCammel(String lowerCammel) { ...@@ -16,7 +16,7 @@ String _toUpperCammel(String lowerCammel) {
/// Generates the common/testing/key_codes.h based on the information in the key /// Generates the common/testing/key_codes.h based on the information in the key
/// data structure given to it. /// data structure given to it.
class KeyCodesCcGenerator extends BaseCodeGenerator { class KeyCodesCcGenerator extends BaseCodeGenerator {
KeyCodesCcGenerator(PhysicalKeyData keyData, LogicalKeyData logicalData) : super(keyData, logicalData); KeyCodesCcGenerator(super.keyData, super.logicalData);
/// Gets the generated definitions of PhysicalKeyboardKeys. /// Gets the generated definitions of PhysicalKeyboardKeys.
String get _physicalDefinitions { String get _physicalDefinitions {
......
...@@ -14,11 +14,10 @@ import 'utils.dart'; ...@@ -14,11 +14,10 @@ import 'utils.dart';
/// data structure given to it. /// data structure given to it.
class WebCodeGenerator extends PlatformCodeGenerator { class WebCodeGenerator extends PlatformCodeGenerator {
WebCodeGenerator( WebCodeGenerator(
PhysicalKeyData keyData, super.keyData,
LogicalKeyData logicalData, super.logicalData,
String logicalLocationMap, String logicalLocationMap,
) : _logicalLocationMap = parseMapOfListOfNullableString(logicalLocationMap), ) : _logicalLocationMap = parseMapOfListOfNullableString(logicalLocationMap);
super(keyData, logicalData);
/// This generates the map of Web KeyboardEvent codes to logical key ids. /// This generates the map of Web KeyboardEvent codes to logical key ids.
String get _webLogicalKeyCodeMap { String get _webLogicalKeyCodeMap {
......
...@@ -14,11 +14,10 @@ import 'utils.dart'; ...@@ -14,11 +14,10 @@ import 'utils.dart';
/// data structure given to it. /// data structure given to it.
class WindowsCodeGenerator extends PlatformCodeGenerator { class WindowsCodeGenerator extends PlatformCodeGenerator {
WindowsCodeGenerator( WindowsCodeGenerator(
PhysicalKeyData keyData, super.keyData,
LogicalKeyData logicalData, super.logicalData,
String scancodeToLogical, String scancodeToLogical,
) : _scancodeToLogical = parseMapOfString(scancodeToLogical), ) : _scancodeToLogical = parseMapOfString(scancodeToLogical);
super(keyData, logicalData);
/// This generates the map of Windows scan codes to physical keys. /// This generates the map of Windows scan codes to physical keys.
String get _windowsScanCodeMap { String get _windowsScanCodeMap {
......
...@@ -2,7 +2,7 @@ name: gen_keycodes ...@@ -2,7 +2,7 @@ name: gen_keycodes
description: Generates keycode source files from various resources. description: Generates keycode source files from various resources.
environment: environment:
sdk: ">=2.12.0-0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
args: 2.3.0 args: 2.3.0
......
...@@ -4,7 +4,7 @@ version: 0.0.1 ...@@ -4,7 +4,7 @@ version: 0.0.1
homepage: https://flutter.dev homepage: https://flutter.dev
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -10,8 +10,8 @@ import 'package:flutter/widgets.dart'; ...@@ -10,8 +10,8 @@ import 'package:flutter/widgets.dart';
class TestWidget extends LeafRenderObjectWidget { class TestWidget extends LeafRenderObjectWidget {
const TestWidget({ const TestWidget({
Key? key, super.key,
}) : super(key: key); });
@override @override
RenderObject createRenderObject(BuildContext context) => RenderTest(); RenderObject createRenderObject(BuildContext context) => RenderTest();
......
...@@ -2,7 +2,7 @@ name: tracing_tests ...@@ -2,7 +2,7 @@ name: tracing_tests
description: Various tests for tracing in flutter/flutter description: Various tests for tracing in flutter/flutter
environment: environment:
sdk: ">=2.12.0-0 <3.0.0" sdk: ">=2.17.0-0 <3.0.0"
dependencies: dependencies:
flutter: flutter:
......
...@@ -40,7 +40,7 @@ void main() { ...@@ -40,7 +40,7 @@ void main() {
} }
class TestRoot extends StatefulWidget { class TestRoot extends StatefulWidget {
const TestRoot({Key? key}) : super(key: key); const TestRoot({super.key});
static late TestRootState state; static late TestRootState state;
...@@ -76,7 +76,7 @@ class TestRootState extends State<TestRoot> { ...@@ -76,7 +76,7 @@ class TestRootState extends State<TestRoot> {
} }
class TestChildWidget extends StatelessWidget { class TestChildWidget extends StatelessWidget {
const TestChildWidget({Key? key}) : super(key: key); const TestChildWidget({super.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
......
...@@ -22,7 +22,7 @@ final Set<String> interestingLabels = <String>{ ...@@ -22,7 +22,7 @@ final Set<String> interestingLabels = <String>{
}; };
class TestRoot extends StatefulWidget { class TestRoot extends StatefulWidget {
const TestRoot({ Key? key }) : super(key: key); const TestRoot({ super.key });
static late final TestRootState state; static late final TestRootState state;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment