diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart index ba3703b86ef..efb6e9b4d26 100644 --- a/packages/flutter_tools/lib/src/artifacts.dart +++ b/packages/flutter_tools/lib/src/artifacts.dart @@ -578,7 +578,7 @@ class CachedArtifacts implements Artifacts { case TargetPlatform.linux_arm64: case TargetPlatform.windows_x64: case TargetPlatform.windows_arm64: - return _getDesktopArtifactPath(artifact, platform, mode); + return _getDesktopArtifactPath(artifact, platform!, mode); case TargetPlatform.fuchsia_arm64: case TargetPlatform.fuchsia_x64: return _getFuchsiaArtifactPath(artifact, platform!, mode!); @@ -594,18 +594,18 @@ class CachedArtifacts implements Artifacts { return _fileSystem.path.basename(_getEngineArtifactsPath(platform, mode)!); } - String _getDesktopArtifactPath(Artifact artifact, TargetPlatform? platform, BuildMode? mode) { + String _getDesktopArtifactPath(Artifact artifact, TargetPlatform platform, BuildMode? mode) { // When platform is null, a generic host platform artifact is being requested // and not the gen_snapshot for darwin as a target platform. - if (platform != null && artifact == Artifact.genSnapshot) { + if (artifact == Artifact.genSnapshot) { final String engineDir = _getEngineArtifactsPath(platform, mode)!; return _fileSystem.path.join(engineDir, _artifactToFileName(artifact, _platform)); } - if (platform != null && artifact == Artifact.flutterMacOSFramework) { + if (artifact == Artifact.flutterMacOSFramework) { final String engineDir = _getEngineArtifactsPath(platform, mode)!; return _getMacOSEngineArtifactPath(engineDir, _fileSystem, _platform); } - return _getHostArtifactPath(artifact, platform ?? _currentHostPlatform(_platform, _operatingSystemUtils), mode); + return _getHostArtifactPath(artifact, platform, mode); } String _getAndroidArtifactPath(Artifact artifact, TargetPlatform platform, BuildMode mode) { diff --git a/packages/flutter_tools/lib/src/base/build.dart b/packages/flutter_tools/lib/src/base/build.dart index 60be3c0e1d7..09e57962c62 100644 --- a/packages/flutter_tools/lib/src/base/build.dart +++ b/packages/flutter_tools/lib/src/base/build.dart @@ -16,7 +16,7 @@ import 'process.dart'; class SnapshotType { SnapshotType(this.platform, this.mode); - final TargetPlatform? platform; + final TargetPlatform platform; final BuildMode mode; @override diff --git a/packages/flutter_tools/test/general.shard/base/build_test.dart b/packages/flutter_tools/test/general.shard/base/build_test.dart index 20b85f4f0eb..f0509e7d027 100644 --- a/packages/flutter_tools/test/general.shard/base/build_test.dart +++ b/packages/flutter_tools/test/general.shard/base/build_test.dart @@ -49,12 +49,6 @@ const List kDefaultClang = [ ]; void main() { - group('SnapshotType', () { - test('does not throw, if target platform is null', () { - expect(() => SnapshotType(null, BuildMode.release), returnsNormally); - }); - }); - group('GenSnapshot', () { late GenSnapshot genSnapshot; late Artifacts artifacts;