From 93a74ca9f2a658bbdb69fa90c69c6aa394ac1f80 Mon Sep 17 00:00:00 2001 From: Alexandre Ardhuin Date: Tue, 12 Jul 2022 23:41:08 +0200 Subject: [PATCH] remove unused members in executable libs (#107464) --- .../stocks/test/icon_color_test.dart | 2 - dev/bots/analyze.dart | 2 - dev/bots/test.dart | 38 ------------------- dev/bots/unpublish_package.dart | 3 -- .../bin/tasks/build_aar_module_test.dart | 4 -- .../fast_scroll_heavy_gridview__memory.dart | 1 - .../fast_scroll_large_images__memory.dart | 1 - .../flutter_gallery_v2_chrome_run_test.dart | 3 -- dev/devicelab/test/adb_test.dart | 2 - .../bin/main.dart | 2 - .../web_e2e_tests/lib/image_loading_main.dart | 2 + dev/manual_tests/lib/color_testing_demo.dart | 9 ----- dev/manual_tests/lib/hover.dart | 18 --------- dev/tools/dartdoc.dart | 1 - dev/tools/examples_smoke_test.dart | 1 - 15 files changed, 2 insertions(+), 87 deletions(-) diff --git a/dev/benchmarks/test_apps/stocks/test/icon_color_test.dart b/dev/benchmarks/test_apps/stocks/test/icon_color_test.dart index 408926eaff..9bcc5a5799 100644 --- a/dev/benchmarks/test_apps/stocks/test/icon_color_test.dart +++ b/dev/benchmarks/test_apps/stocks/test/icon_color_test.dart @@ -34,8 +34,6 @@ Element? findElementOfExactWidgetTypeGoingUp(Element node, Type targetType) { return result; } -final RegExp materialIconAssetNameColorExtractor = RegExp(r'[^/]+/ic_.+_(white|black)_[0-9]+dp\.png'); - void checkIconColor(WidgetTester tester, String label, Color color) { final Element listTile = findElementOfExactWidgetTypeGoingUp(tester.element(find.text(label)), ListTile)!; final Element asset = findElementOfExactWidgetTypeGoingDown(listTile, RichText)!; diff --git a/dev/bots/analyze.dart b/dev/bots/analyze.dart index 9298339d47..c8eb6cf26d 100644 --- a/dev/bots/analyze.dart +++ b/dev/bots/analyze.dart @@ -32,8 +32,6 @@ late final String dart; /// The path to the `pub` executable; set at the top of `main` late final String pub; -final String pubCache = path.join(flutterRoot, '.pub-cache'); - /// When you call this, you can pass additional arguments to pass custom /// arguments to flutter analyze. For example, you might want to call this /// script with the parameter --dart-sdk to use custom dart sdk. diff --git a/dev/bots/test.dart b/dev/bots/test.dart index 224d835010..7564a29161 100644 --- a/dev/bots/test.dart +++ b/dev/bots/test.dart @@ -35,7 +35,6 @@ final String flutterRoot = path.dirname(path.dirname(path.dirname(path.fromUri(P final String flutter = path.join(flutterRoot, 'bin', 'flutter$bat'); final String dart = path.join(flutterRoot, 'bin', 'cache', 'dart-sdk', 'bin', 'dart$exe'); final String pubCache = path.join(flutterRoot, '.pub-cache'); -final String toolRoot = path.join(flutterRoot, 'packages', 'flutter_tools'); final String engineVersionFile = path.join(flutterRoot, 'bin', 'internal', 'engine.version'); final String flutterPluginsVersionFile = path.join(flutterRoot, 'bin', 'internal', 'flutter_plugins.version'); @@ -1812,31 +1811,6 @@ void adjustEnvironmentToEnableFlutterAsserts(Map environment) { environment['FLUTTER_TOOL_ARGS'] = toolsArgs.trim(); } -Map _initGradleEnvironment() { - final String? androidSdkRoot = (Platform.environment['ANDROID_HOME']?.isEmpty ?? true) - ? Platform.environment['ANDROID_SDK_ROOT'] - : Platform.environment['ANDROID_HOME']; - if (androidSdkRoot == null || androidSdkRoot.isEmpty) { - print('${red}Could not find Android SDK; set ANDROID_SDK_ROOT.$reset'); - exit(1); - } - return { - 'ANDROID_HOME': androidSdkRoot!, - 'ANDROID_SDK_ROOT': androidSdkRoot, - }; -} - -final Map gradleEnvironment = _initGradleEnvironment(); - -void deleteFile(String path) { - // This is technically a race condition but nobody else should be running - // while this script runs, so we should be ok. (Sadly recursive:true does not - // obviate the need for existsSync, at least on Windows.) - final File file = File(path); - if (file.existsSync()) - file.deleteSync(); -} - enum CiProviders { cirrus, luci, @@ -1865,18 +1839,6 @@ CiProviders? get ciProvider { return null; } -/// Returns the name of the branch being tested. -String get branchName { - switch(ciProvider) { - case CiProviders.cirrus: - return Platform.environment['CIRRUS_BRANCH']!; - case CiProviders.luci: - return Platform.environment['LUCI_BRANCH']!; - case null: - return ''; - } -} - /// Checks the given file's contents to determine if they match the allowed /// pattern for version strings. /// diff --git a/dev/bots/unpublish_package.dart b/dev/bots/unpublish_package.dart index 9cc2520178..92ecf11716 100644 --- a/dev/bots/unpublish_package.dart +++ b/dev/bots/unpublish_package.dart @@ -14,7 +14,6 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io' hide Platform; -import 'dart:typed_data'; import 'package:args/args.dart'; import 'package:path/path.dart' as path; @@ -210,8 +209,6 @@ class ProcessRunner { } } -typedef HttpReader = Future Function(Uri url, {Map headers}); - class ArchiveUnpublisher { ArchiveUnpublisher( this.tempDir, diff --git a/dev/devicelab/bin/tasks/build_aar_module_test.dart b/dev/devicelab/bin/tasks/build_aar_module_test.dart index ad8b9bb630..dfafb1041b 100644 --- a/dev/devicelab/bin/tasks/build_aar_module_test.dart +++ b/dev/devicelab/bin/tasks/build_aar_module_test.dart @@ -12,10 +12,6 @@ import 'package:path/path.dart' as path; final String platformLineSep = Platform.isWindows ? '\r\n': '\n'; - -final String gradlew = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; -final String gradlewExecutable = Platform.isWindows ? '.\\$gradlew' : './$gradlew'; - /// Tests that AARs can be built on module projects. Future main() async { await task(() async { diff --git a/dev/devicelab/bin/tasks/fast_scroll_heavy_gridview__memory.dart b/dev/devicelab/bin/tasks/fast_scroll_heavy_gridview__memory.dart index 9c8c38bada..c172631b00 100644 --- a/dev/devicelab/bin/tasks/fast_scroll_heavy_gridview__memory.dart +++ b/dev/devicelab/bin/tasks/fast_scroll_heavy_gridview__memory.dart @@ -8,7 +8,6 @@ import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; const String kPackageName = 'com.example.macrobenchmarks'; -const String kActivityName = 'com.example.macrobenchmarks.MainActivity'; class FastScrollHeavyGridViewMemoryTest extends MemoryTest { FastScrollHeavyGridViewMemoryTest() diff --git a/dev/devicelab/bin/tasks/fast_scroll_large_images__memory.dart b/dev/devicelab/bin/tasks/fast_scroll_large_images__memory.dart index 26b76c2a41..96a2ba7a7e 100644 --- a/dev/devicelab/bin/tasks/fast_scroll_large_images__memory.dart +++ b/dev/devicelab/bin/tasks/fast_scroll_large_images__memory.dart @@ -8,7 +8,6 @@ import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; const String kPackageName = 'com.example.macrobenchmarks'; -const String kActivityName = 'com.example.macrobenchmarks.MainActivity'; class FastScrollLargeImagesMemoryTest extends MemoryTest { FastScrollLargeImagesMemoryTest() diff --git a/dev/devicelab/bin/tasks/flutter_gallery_v2_chrome_run_test.dart b/dev/devicelab/bin/tasks/flutter_gallery_v2_chrome_run_test.dart index 266c672d72..d159eb2228 100644 --- a/dev/devicelab/bin/tasks/flutter_gallery_v2_chrome_run_test.dart +++ b/dev/devicelab/bin/tasks/flutter_gallery_v2_chrome_run_test.dart @@ -16,9 +16,6 @@ Future main() async { await task(const NewGalleryChromeRunTest().run); } -/// URI for the New Flutter Gallery repository. -const String galleryRepo = 'https://github.com/flutter/gallery.git'; - /// After the gallery loads, a duration of [durationToWaitForError] /// is waited, allowing any possible exceptions to be thrown. const Duration durationToWaitForError = Duration(seconds: 5); diff --git a/dev/devicelab/test/adb_test.dart b/dev/devicelab/test/adb_test.dart index d76b2706fc..063c645535 100644 --- a/dev/devicelab/test/adb_test.dart +++ b/dev/devicelab/test/adb_test.dart @@ -145,8 +145,6 @@ CommandArgs cmd({ ); } -typedef ExitErrorFactory = dynamic Function(); - @immutable class CommandArgs { const CommandArgs({ required this.command, this.arguments, this.environment }); diff --git a/dev/forbidden_from_release_tests/bin/main.dart b/dev/forbidden_from_release_tests/bin/main.dart index 25e236a6f4..78bba644f5 100644 --- a/dev/forbidden_from_release_tests/bin/main.dart +++ b/dev/forbidden_from_release_tests/bin/main.dart @@ -10,11 +10,9 @@ import 'package:file/file.dart'; import 'package:file/local.dart'; import 'package:package_config/package_config.dart'; import 'package:path/path.dart' as path; -import 'package:process/process.dart'; import 'package:vm_snapshot_analysis/program_info.dart'; import 'package:vm_snapshot_analysis/v8_profile.dart'; -const ProcessManager processManager = LocalProcessManager(); const FileSystem fs = LocalFileSystem(); Future main(List args) async { diff --git a/dev/integration_tests/web_e2e_tests/lib/image_loading_main.dart b/dev/integration_tests/web_e2e_tests/lib/image_loading_main.dart index 81a35d216c..3e515e855d 100644 --- a/dev/integration_tests/web_e2e_tests/lib/image_loading_main.dart +++ b/dev/integration_tests/web_e2e_tests/lib/image_loading_main.dart @@ -11,9 +11,11 @@ final Completer _assetImageCompleter = Completer(); final Completer _networkImageCompleter = Completer(); /// Notifies that Image.asset used in the test app loaded the image. +@visibleForTesting Future get whenAssetImageLoads => _assetImageCompleter.future; /// Notifies that Image.network used in the test app loaded the image. +@visibleForTesting Future get whenNetworkImageLoads => _networkImageCompleter.future; Future main() async { diff --git a/dev/manual_tests/lib/color_testing_demo.dart b/dev/manual_tests/lib/color_testing_demo.dart index 267b5f4a19..05c71e3c08 100644 --- a/dev/manual_tests/lib/color_testing_demo.dart +++ b/dev/manual_tests/lib/color_testing_demo.dart @@ -4,15 +4,6 @@ import 'package:flutter/material.dart'; -class ColorTestingDemo extends StatelessWidget { - const ColorTestingDemo({ super.key }); - - static const String routeName = '/color_demo'; - - @override - Widget build(BuildContext context) => const ColorDemoHome(); -} - class ColorDemoHome extends StatelessWidget { const ColorDemoHome({super.key}); diff --git a/dev/manual_tests/lib/hover.dart b/dev/manual_tests/lib/hover.dart index e062e4dfc1..d88c42fc88 100644 --- a/dev/manual_tests/lib/hover.dart +++ b/dev/manual_tests/lib/hover.dart @@ -11,24 +11,6 @@ void main() { )); } -class DemoButton extends StatelessWidget { - const DemoButton({super.key, required this.name}); - - final String name; - - void _handleOnPressed() { - print('Button $name pressed.'); - } - - @override - Widget build(BuildContext context) { - return TextButton( - onPressed: () => _handleOnPressed(), - child: Text(name), - ); - } -} - class HoverDemo extends StatefulWidget { const HoverDemo({super.key}); diff --git a/dev/tools/dartdoc.dart b/dev/tools/dartdoc.dart index 6a0b128e16..4a070cb040 100644 --- a/dev/tools/dartdoc.dart +++ b/dev/tools/dartdoc.dart @@ -16,7 +16,6 @@ import 'dartdoc_checker.dart'; const String kDocsRoot = 'dev/docs'; const String kPublishRoot = '$kDocsRoot/doc'; -const String kSnippetsRoot = 'dev/snippets'; const String kDummyPackageName = 'Flutter'; const String kPlatformIntegrationPackageName = 'platform_integration'; diff --git a/dev/tools/examples_smoke_test.dart b/dev/tools/examples_smoke_test.dart index 7b1f019b36..bf974e8550 100644 --- a/dev/tools/examples_smoke_test.dart +++ b/dev/tools/examples_smoke_test.dart @@ -17,7 +17,6 @@ import 'package:path/path.dart' as path; import 'package:platform/platform.dart'; import 'package:process/process.dart'; -const bool kIsWeb = identical(0, 0.0); FileSystem filesystem = const LocalFileSystem(); ProcessManager processManager = const LocalProcessManager(); Platform platform = const LocalPlatform();