diff --git a/packages/flutter_tools/lib/src/android/android_studio.dart b/packages/flutter_tools/lib/src/android/android_studio.dart index 0ad239389c..29eee2d1af 100644 --- a/packages/flutter_tools/lib/src/android/android_studio.dart +++ b/packages/flutter_tools/lib/src/android/android_studio.dart @@ -49,7 +49,7 @@ class AndroidStudio implements Comparable { return null; } - final String versionString = plistValues[PlistParser.kCFBundleShortVersionStringKey] as String; + final String? versionString = plistValues[PlistParser.kCFBundleShortVersionStringKey] as String?; Version? version; if (versionString != null) { diff --git a/packages/flutter_tools/test/general.shard/analytics_test.dart b/packages/flutter_tools/test/general.shard/analytics_test.dart index 6afe65dd16..32f5996567 100644 --- a/packages/flutter_tools/test/general.shard/analytics_test.dart +++ b/packages/flutter_tools/test/general.shard/analytics_test.dart @@ -4,6 +4,7 @@ import 'package:args/command_runner.dart'; import 'package:file/memory.dart'; +import 'package:flutter_tools/src/android/android_studio.dart'; import 'package:flutter_tools/src/android/android_workflow.dart'; import 'package:flutter_tools/src/base/config.dart'; import 'package:flutter_tools/src/base/file_system.dart'; @@ -153,6 +154,7 @@ void main() { late TestUsage testUsage; late FakeClock fakeClock; late FakeDoctor doctor; + late FakeAndroidStudio androidStudio; setUp(() { memoryFileSystem = MemoryFileSystem.test(); @@ -160,6 +162,7 @@ void main() { testUsage = TestUsage(); fakeClock = FakeClock(); doctor = FakeDoctor(); + androidStudio = FakeAndroidStudio(); }); testUsingContext('flutter commands send timing events', () async { @@ -175,6 +178,7 @@ void main() { ), )); }, overrides: { + AndroidStudio: () => androidStudio, SystemClock: () => fakeClock, Doctor: () => doctor, Usage: () => testUsage, @@ -194,6 +198,7 @@ void main() { ), )); }, overrides: { + AndroidStudio: () => androidStudio, SystemClock: () => fakeClock, Doctor: () => doctor, Usage: () => testUsage, @@ -375,6 +380,8 @@ class FakeDoctor extends Fake implements Doctor { } } +class FakeAndroidStudio extends Fake implements AndroidStudio {} + class FakeClock extends Fake implements SystemClock { List times = [];