Skip to content

Commit 8ef7b93

Browse files
authored
remove usage of Usage from build system (#160663)
Towards flutter/flutter#150575 This effectively just removes `Usage` as a dependency of `Environment` (in build_system.dart). All other changes are a direct result of that. <details> <summary> Pre-launch checklist </summary> - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. </details> <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
1 parent 5a3541c commit 8ef7b93

File tree

14 files changed

+0
-52
lines changed

14 files changed

+0
-52
lines changed

packages/flutter_tools/lib/src/build_system/build_system.dart

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import '../base/utils.dart';
1919
import '../build_info.dart';
2020
import '../cache.dart';
2121
import '../convert.dart';
22-
import '../reporting/reporting.dart';
2322
import 'depfile.dart';
2423
import 'exceptions.dart';
2524
import 'file_store.dart';
@@ -334,7 +333,6 @@ class Environment {
334333
required Artifacts artifacts,
335334
required ProcessManager processManager,
336335
required Platform platform,
337-
required Usage usage,
338336
required Analytics analytics,
339337
String? engineVersion,
340338
required bool generateDartPluginRegistry,
@@ -377,7 +375,6 @@ class Environment {
377375
artifacts: artifacts,
378376
processManager: processManager,
379377
platform: platform,
380-
usage: usage,
381378
analytics: analytics,
382379
engineVersion: engineVersion,
383380
inputs: inputs,
@@ -401,7 +398,6 @@ class Environment {
401398
Map<String, String> inputs = const <String, String>{},
402399
String? engineVersion,
403400
Platform? platform,
404-
Usage? usage,
405401
Analytics? analytics,
406402
bool generateDartPluginRegistry = false,
407403
required FileSystem fileSystem,
@@ -423,7 +419,6 @@ class Environment {
423419
artifacts: artifacts,
424420
processManager: processManager,
425421
platform: platform ?? FakePlatform(),
426-
usage: usage ?? TestUsage(),
427422
analytics: analytics ?? const NoOpAnalytics(),
428423
engineVersion: engineVersion,
429424
generateDartPluginRegistry: generateDartPluginRegistry,
@@ -444,7 +439,6 @@ class Environment {
444439
required this.logger,
445440
required this.fileSystem,
446441
required this.artifacts,
447-
required this.usage,
448442
required this.analytics,
449443
this.engineVersion,
450444
required this.inputs,
@@ -537,8 +531,6 @@ class Environment {
537531

538532
final FileSystem fileSystem;
539533

540-
final Usage usage;
541-
542534
final Analytics analytics;
543535

544536
/// The version of the current engine, or `null` if built with a local engine.

packages/flutter_tools/lib/src/build_system/targets/ios.dart

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import '../../globals.dart' as globals;
1717
import '../../ios/mac.dart';
1818
import '../../macos/xcode.dart';
1919
import '../../project.dart';
20-
import '../../reporting/reporting.dart';
2120
import '../build_system.dart';
2221
import '../depfile.dart';
2322
import '../exceptions.dart';
@@ -639,12 +638,6 @@ class ReleaseIosApplicationBundle extends _IosAssetBundleWithDSYM {
639638
// archive command from Xcode, this is a more accurate count than `flutter build ipa` alone.
640639
if (environment.defines[kXcodeAction]?.toLowerCase() == 'install') {
641640
environment.logger.printTrace('Sending archive event if usage enabled.');
642-
UsageEvent(
643-
'assemble',
644-
'ios-archive',
645-
label: buildSuccess ? 'success' : 'fail',
646-
flutterUsage: environment.usage,
647-
).send();
648641
environment.analytics.send(
649642
Event.appleUsageEvent(
650643
workflow: 'assemble',

packages/flutter_tools/lib/src/build_system/targets/macos.dart

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import '../../base/process.dart';
1212
import '../../build_info.dart';
1313
import '../../devfs.dart';
1414
import '../../globals.dart' as globals show xcode;
15-
import '../../reporting/reporting.dart';
1615
import '../build_system.dart';
1716
import '../depfile.dart';
1817
import '../exceptions.dart';
@@ -714,12 +713,6 @@ class ReleaseMacOSBundleFlutterAssets extends MacOSBundleFlutterAssets {
714713
// Send a usage event when the app is being archived from Xcode.
715714
if (environment.defines[kXcodeAction]?.toLowerCase() == 'install') {
716715
environment.logger.printTrace('Sending archive event if usage enabled.');
717-
UsageEvent(
718-
'assemble',
719-
'macos-archive',
720-
label: buildSuccess ? 'success' : 'fail',
721-
flutterUsage: environment.usage,
722-
).send();
723716
environment.analytics.send(
724717
Event.appleUsageEvent(
725718
workflow: 'assemble',

packages/flutter_tools/lib/src/bundle_builder.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ class BundleBuilder {
7474
fileSystem: globals.fs,
7575
logger: globals.logger,
7676
processManager: globals.processManager,
77-
usage: globals.flutterUsage,
7877
analytics: globals.analytics,
7978
platform: globals.platform,
8079
generateDartPluginRegistry: true,

packages/flutter_tools/lib/src/commands/assemble.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ class AssembleCommand extends FlutterCommand {
258258
fileSystem: globals.fs,
259259
logger: globals.logger,
260260
processManager: globals.processManager,
261-
usage: globals.flutterUsage,
262261
analytics: globals.analytics,
263262
platform: globals.platform,
264263
engineVersion: artifacts.usesLocalArtifacts ? null : globals.flutterVersion.engineRevision,

packages/flutter_tools/lib/src/commands/build_ios_framework.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,6 @@ end
483483
logger: globals.logger,
484484
processManager: globals.processManager,
485485
platform: globals.platform,
486-
usage: globals.flutterUsage,
487486
analytics: globals.analytics,
488487
engineVersion:
489488
globals.artifacts!.usesLocalArtifacts ? null : globals.flutterVersion.engineRevision,

packages/flutter_tools/lib/src/commands/build_macos_framework.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@ end
240240
logger: globals.logger,
241241
processManager: globals.processManager,
242242
platform: globals.platform,
243-
usage: globals.flutterUsage,
244243
analytics: globals.analytics,
245244
engineVersion:
246245
globals.artifacts!.usesLocalArtifacts ? null : globals.flutterVersion.engineRevision,

packages/flutter_tools/lib/src/commands/create_base.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,6 @@ mixin CreateBase on FlutterCommand {
505505
outputDir: globals.fs.directory(getBuildDirectory()),
506506
processManager: globals.processManager,
507507
platform: globals.platform,
508-
usage: globals.flutterUsage,
509508
analytics: globals.analytics,
510509
projectDir: project.directory,
511510
packageConfigPath: packageConfigPath(),

packages/flutter_tools/lib/src/commands/packages.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ class PackagesGetCommand extends FlutterCommand {
301301
outputDir: globals.fs.directory(getBuildDirectory()),
302302
processManager: globals.processManager,
303303
platform: globals.platform,
304-
usage: globals.flutterUsage,
305304
analytics: analytics,
306305
projectDir: rootProject.directory,
307306
packageConfigPath: packageConfigPath(),

packages/flutter_tools/lib/src/resident_runner.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1193,7 +1193,6 @@ abstract class ResidentRunner extends ResidentHandlers {
11931193
outputDir: globals.fs.directory(getBuildDirectory()),
11941194
processManager: globals.processManager,
11951195
platform: globals.platform,
1196-
usage: globals.flutterUsage,
11971196
analytics: globals.analytics,
11981197
projectDir: globals.fs.currentDirectory,
11991198
packageConfigPath: debuggingOptions.buildInfo.packageConfigPath,

0 commit comments

Comments
 (0)