Skip to content

Commit

Permalink
remove unused members in executable libs (#107464)
Browse files Browse the repository at this point in the history
  • Loading branch information
a14n authored Jul 12, 2022
1 parent cfff88b commit 93a74ca
Show file tree
Hide file tree
Showing 15 changed files with 2 additions and 87 deletions.
2 changes: 0 additions & 2 deletions dev/benchmarks/test_apps/stocks/test/icon_color_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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)!;
Expand Down
2 changes: 0 additions & 2 deletions dev/bots/analyze.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
38 changes: 0 additions & 38 deletions dev/bots/test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down Expand Up @@ -1812,31 +1811,6 @@ void adjustEnvironmentToEnableFlutterAsserts(Map<String, String> environment) {
environment['FLUTTER_TOOL_ARGS'] = toolsArgs.trim();
}

Map<String, String> _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 <String, String>{
'ANDROID_HOME': androidSdkRoot!,
'ANDROID_SDK_ROOT': androidSdkRoot,
};
}

final Map<String, String> 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,
Expand Down Expand Up @@ -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.
///
Expand Down
3 changes: 0 additions & 3 deletions dev/bots/unpublish_package.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -210,8 +209,6 @@ class ProcessRunner {
}
}

typedef HttpReader = Future<Uint8List> Function(Uri url, {Map<String, String> headers});

class ArchiveUnpublisher {
ArchiveUnpublisher(
this.tempDir,
Expand Down
4 changes: 0 additions & 4 deletions dev/devicelab/bin/tasks/build_aar_module_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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<void> main() async {
await task(() async {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ Future<void> 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);
Expand Down
2 changes: 0 additions & 2 deletions dev/devicelab/test/adb_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,6 @@ CommandArgs cmd({
);
}

typedef ExitErrorFactory = dynamic Function();

@immutable
class CommandArgs {
const CommandArgs({ required this.command, this.arguments, this.environment });
Expand Down
2 changes: 0 additions & 2 deletions dev/forbidden_from_release_tests/bin/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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<void> main(List<String> args) async {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ final Completer<void> _assetImageCompleter = Completer<void>();
final Completer<void> _networkImageCompleter = Completer<void>();

/// Notifies that Image.asset used in the test app loaded the image.
@visibleForTesting
Future<void> get whenAssetImageLoads => _assetImageCompleter.future;

/// Notifies that Image.network used in the test app loaded the image.
@visibleForTesting
Future<void> get whenNetworkImageLoads => _networkImageCompleter.future;

Future<void> main() async {
Expand Down
9 changes: 0 additions & 9 deletions dev/manual_tests/lib/color_testing_demo.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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});

Expand Down
18 changes: 0 additions & 18 deletions dev/manual_tests/lib/hover.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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});

Expand Down
1 change: 0 additions & 1 deletion dev/tools/dartdoc.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
1 change: 0 additions & 1 deletion dev/tools/examples_smoke_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 93a74ca

Please sign in to comment.