diff --git a/packages/flutter_tools/lib/src/context_runner.dart b/packages/flutter_tools/lib/src/context_runner.dart index 7322a2d8f6..08cefe5169 100644 --- a/packages/flutter_tools/lib/src/context_runner.dart +++ b/packages/flutter_tools/lib/src/context_runner.dart @@ -7,6 +7,7 @@ import 'dart:async'; import 'package:process/process.dart'; +import 'package:unified_analytics/unified_analytics.dart'; import 'android/android_builder.dart'; import 'android/android_sdk.dart'; @@ -87,6 +88,12 @@ Future runInContext( body: runnerWrapper, overrides: overrides, fallbacks: { + Analytics: () => Analytics( + tool: DashTool.flutterTool, + flutterChannel: globals.flutterVersion.channel, + flutterVersion: globals.flutterVersion.frameworkVersion, + dartVersion: globals.flutterVersion.dartSdkVersion, + ), AndroidBuilder: () => AndroidGradleBuilder( java: globals.java, logger: globals.logger, diff --git a/packages/flutter_tools/lib/src/globals.dart b/packages/flutter_tools/lib/src/globals.dart index 0f239393c7..59045aa442 100644 --- a/packages/flutter_tools/lib/src/globals.dart +++ b/packages/flutter_tools/lib/src/globals.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:intl/date_symbol_data_local.dart'; import 'package:process/process.dart'; import 'package:unified_analytics/unified_analytics.dart'; @@ -91,19 +90,7 @@ Future get isRunningOnBot => botDetector.isRunningOnBot; // Analytics instance for package:unified_analytics for telemetry // reporting for all Flutter and Dart related tooling -Analytics get analytics => context.get() ?? getDefaultAnalytics(); -Analytics getDefaultAnalytics() { - - initializeDateFormatting(); - final Analytics defaultAnalytics = Analytics( - tool: DashTool.flutterTool, - flutterChannel: flutterVersion.channel, - flutterVersion: flutterVersion.frameworkVersion, - dartVersion: flutterVersion.dartSdkVersion, - ); - - return defaultAnalytics; -} +Analytics get analytics => context.get()!; /// Currently active implementation of the file system. ///