From 911aa7547ed732052f98b79f7b1584bd137bda43 Mon Sep 17 00:00:00 2001 From: Brandon DeRosier Date: Fri, 21 Feb 2025 09:41:02 -0800 Subject: [PATCH] Remove legacy scenec stuff from flutter_tool (#163569) o7 Removes the legacy scenec logic from flutter_tool. We removed scenec from the engine/shipped artifacts long ago. Originally added in https://github.com/flutter/flutter/pull/118157. This has since been replaced by [flutter_scene_importer](https://pub.dev/packages/flutter_scene_importer/versions)! --- packages/flutter_tools/lib/src/artifacts.dart | 7 - packages/flutter_tools/lib/src/asset.dart | 18 +-- .../lib/src/build_system/targets/assets.dart | 13 -- .../build_system/tools/scene_importer.dart | 151 ------------------ .../flutter_tools/lib/src/bundle_builder.dart | 10 -- .../lib/src/commands/widget_preview.dart | 3 - packages/flutter_tools/lib/src/devfs.dart | 20 --- .../lib/src/flutter_manifest.dart | 24 --- .../lib/src/isolated/devfs_web.dart | 5 - .../lib/src/resident_runner.dart | 15 -- packages/flutter_tools/lib/src/run_hot.dart | 11 +- packages/flutter_tools/lib/src/vmservice.dart | 8 - .../widget_preview/widget_preview_test.dart | 3 - .../general.shard/flutter_manifest_test.dart | 3 - .../test/general.shard/hot_shared.dart | 3 - .../resident_runner_helpers.dart | 5 - .../resident_web_runner_test.dart | 2 - .../widget_preview/preview_manifest_test.dart | 2 +- 18 files changed, 3 insertions(+), 300 deletions(-) delete mode 100644 packages/flutter_tools/lib/src/build_system/tools/scene_importer.dart diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart index b7422ab75d..ab4dd17578 100644 --- a/packages/flutter_tools/lib/src/artifacts.dart +++ b/packages/flutter_tools/lib/src/artifacts.dart @@ -122,8 +122,6 @@ enum HostArtifact { // The Impeller shader compiler. impellerc, - // The Impeller Scene 3D model importer. - scenec, // Impeller's tessellation library. libtessellator, } @@ -264,8 +262,6 @@ String _hostArtifactToFileName(HostArtifact artifact, Platform platform) { return 'dart_sdk.js.map'; case HostArtifact.impellerc: return 'impellerc$exe'; - case HostArtifact.scenec: - return 'scenec$exe'; case HostArtifact.libtessellator: return 'libtessellator$dll'; } @@ -480,7 +476,6 @@ class CachedArtifacts implements Artifacts { final String artifactFileName = _hostArtifactToFileName(artifact, _platform); return _cache.getArtifactDirectory('usbmuxd').childFile(artifactFileName); case HostArtifact.impellerc: - case HostArtifact.scenec: case HostArtifact.libtessellator: final String artifactFileName = _hostArtifactToFileName(artifact, _platform); final String engineDir = @@ -1147,7 +1142,6 @@ class CachedLocalEngineArtifacts implements Artifacts { final String artifactFileName = _hostArtifactToFileName(artifact, _platform); return _cache.getArtifactDirectory('usbmuxd').childFile(artifactFileName); case HostArtifact.impellerc: - case HostArtifact.scenec: case HostArtifact.libtessellator: final String artifactFileName = _hostArtifactToFileName(artifact, _platform); final File file = _fileSystem.file( @@ -1506,7 +1500,6 @@ class CachedLocalWebSdkArtifacts implements Artifacts { case HostArtifact.iproxy: case HostArtifact.skyEnginePath: case HostArtifact.impellerc: - case HostArtifact.scenec: case HostArtifact.libtessellator: return _parent.getHostArtifact(artifact); } diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart index 4379759f5f..138eb2725a 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart @@ -72,7 +72,7 @@ abstract class AssetBundleFactory { AssetBundle createBundle(); } -enum AssetKind { regular, font, shader, model } +enum AssetKind { regular, font, shader } /// Contains all information about an asset needed by tool the to prepare and /// copy an asset file to the build output. @@ -959,22 +959,6 @@ class ManifestAssetBundle implements AssetBundle { ); } - for (final Uri modelUri in flutterManifest.models) { - _parseAssetFromFile( - packageConfig, - flutterManifest, - assetBase, - cache, - result, - modelUri, - packageName: packageName, - attributedPackage: attributedPackage, - assetKind: AssetKind.model, - flavors: {}, - transformers: [], - ); - } - // Add assets referenced in the fonts section of the manifest. for (final Font font in flutterManifest.fonts) { for (final FontAsset fontAsset in font.fontAssets) { diff --git a/packages/flutter_tools/lib/src/build_system/targets/assets.dart b/packages/flutter_tools/lib/src/build_system/targets/assets.dart index ebc0c668c3..5072f10ef5 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/assets.dart +++ b/packages/flutter_tools/lib/src/build_system/targets/assets.dart @@ -16,7 +16,6 @@ import '../build_system.dart'; import '../depfile.dart'; import '../exceptions.dart'; import '../tools/asset_transformer.dart'; -import '../tools/scene_importer.dart'; import '../tools/shader_compiler.dart'; import 'common.dart'; import 'icon_tree_shaker.dart'; @@ -83,12 +82,6 @@ Future copyAssets( fileSystem: environment.fileSystem, artifacts: environment.artifacts, ); - final SceneImporter sceneImporter = SceneImporter( - processManager: environment.processManager, - logger: environment.logger, - fileSystem: environment.fileSystem, - artifacts: environment.artifacts, - ); final AssetTransformer assetTransformer = AssetTransformer( processManager: environment.processManager, fileSystem: environment.fileSystem, @@ -160,12 +153,6 @@ Future copyAssets( outputPath: file.path, targetPlatform: targetPlatform, ); - case AssetKind.model: - doCopy = - !await sceneImporter.importScene( - input: content.file as File, - outputPath: file.path, - ); } if (doCopy) { await (content.file as File).copy(file.path); diff --git a/packages/flutter_tools/lib/src/build_system/tools/scene_importer.dart b/packages/flutter_tools/lib/src/build_system/tools/scene_importer.dart deleted file mode 100644 index 9ea51ee522..0000000000 --- a/packages/flutter_tools/lib/src/build_system/tools/scene_importer.dart +++ /dev/null @@ -1,151 +0,0 @@ -// Copyright 2014 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'dart:math' as math; -import 'dart:typed_data'; - -import 'package:meta/meta.dart'; -import 'package:pool/pool.dart'; -import 'package:process/process.dart'; - -import '../../artifacts.dart'; -import '../../base/error_handling_io.dart'; -import '../../base/file_system.dart'; -import '../../base/io.dart'; -import '../../base/logger.dart'; -import '../../convert.dart'; -import '../../devfs.dart'; -import '../build_system.dart'; - -/// A wrapper around [SceneImporter] to support hot reload of 3D models. -class DevelopmentSceneImporter { - DevelopmentSceneImporter({ - required SceneImporter sceneImporter, - required FileSystem fileSystem, - @visibleForTesting math.Random? random, - }) : _sceneImporter = sceneImporter, - _fileSystem = fileSystem, - _random = random ?? math.Random(); - - final SceneImporter _sceneImporter; - final FileSystem _fileSystem; - final Pool _compilationPool = Pool(4); - final math.Random _random; - - /// Recompile the input ipscene and return a devfs content that should be - /// synced to the attached device in its place. - Future reimportScene(DevFSContent inputScene) async { - final File output = _fileSystem.systemTempDirectory.childFile('${_random.nextDouble()}.temp'); - late File inputFile; - bool cleanupInput = false; - Uint8List result; - PoolResource? resource; - try { - resource = await _compilationPool.request(); - if (inputScene is DevFSFileContent) { - inputFile = inputScene.file as File; - } else { - inputFile = _fileSystem.systemTempDirectory.childFile('${_random.nextDouble()}.temp'); - inputFile.writeAsBytesSync(await inputScene.contentsAsBytes()); - cleanupInput = true; - } - final bool success = await _sceneImporter.importScene( - input: inputFile, - outputPath: output.path, - fatal: false, - ); - if (!success) { - return null; - } - result = output.readAsBytesSync(); - } finally { - resource?.release(); - ErrorHandlingFileSystem.deleteIfExists(output); - if (cleanupInput) { - ErrorHandlingFileSystem.deleteIfExists(inputFile); - } - } - return DevFSByteContent(result); - } -} - -/// A class the wraps the functionality of the Impeller Scene importer scenec. -class SceneImporter { - SceneImporter({ - required ProcessManager processManager, - required Logger logger, - required FileSystem fileSystem, - required Artifacts artifacts, - }) : _processManager = processManager, - _logger = logger, - _fs = fileSystem, - _artifacts = artifacts; - - final ProcessManager _processManager; - final Logger _logger; - final FileSystem _fs; - final Artifacts _artifacts; - - /// The [Source] inputs that targets using this should depend on. - /// - /// See [Target.inputs]. - static const List inputs = [ - Source.pattern( - '{FLUTTER_ROOT}/packages/flutter_tools/lib/src/build_system/tools/scene_importer.dart', - ), - Source.hostArtifact(HostArtifact.scenec), - ]; - - /// Calls scenec, which transforms the [input] 3D model into an imported - /// ipscene at [outputPath]. - /// - /// All parameters are required. - /// - /// If the scene importer subprocess fails, it will print the stdout and - /// stderr to the log and throw a [SceneImporterException]. Otherwise, it - /// will return true. - Future importScene({ - required File input, - required String outputPath, - bool fatal = true, - }) async { - final File scenec = _fs.file(_artifacts.getHostArtifact(HostArtifact.scenec)); - if (!scenec.existsSync()) { - throw SceneImporterException._( - 'The scenec utility is missing at "${scenec.path}". ' - 'Run "flutter doctor".', - ); - } - - final List cmd = [scenec.path, '--input=${input.path}', '--output=$outputPath']; - _logger.printTrace('scenec command: $cmd'); - final Process scenecProcess = await _processManager.start(cmd); - final int code = await scenecProcess.exitCode; - if (code != 0) { - final String stdout = await utf8.decodeStream(scenecProcess.stdout); - final String stderr = await utf8.decodeStream(scenecProcess.stderr); - _logger.printTrace(stdout); - _logger.printError(stderr); - if (fatal) { - throw SceneImporterException._( - 'Scene import of "${input.path}" to "$outputPath" ' - 'failed with exit code $code.\n' - 'scenec stdout:\n$stdout\n' - 'scenec stderr:\n$stderr', - ); - } - return false; - } - return true; - } -} - -class SceneImporterException implements Exception { - SceneImporterException._(this.message); - - final String message; - - @override - String toString() => 'SceneImporterException: $message\n\n'; -} diff --git a/packages/flutter_tools/lib/src/bundle_builder.dart b/packages/flutter_tools/lib/src/bundle_builder.dart index bb9385a85f..22c455f5a2 100644 --- a/packages/flutter_tools/lib/src/bundle_builder.dart +++ b/packages/flutter_tools/lib/src/bundle_builder.dart @@ -15,7 +15,6 @@ import 'build_info.dart'; import 'build_system/build_system.dart'; import 'build_system/depfile.dart'; import 'build_system/tools/asset_transformer.dart'; -import 'build_system/tools/scene_importer.dart'; import 'build_system/tools/shader_compiler.dart'; import 'bundle.dart'; import 'cache.dart'; @@ -166,13 +165,6 @@ Future writeBundle( artifacts: artifacts, ); - final SceneImporter sceneImporter = SceneImporter( - processManager: processManager, - logger: logger, - fileSystem: fileSystem, - artifacts: artifacts, - ); - final AssetTransformer assetTransformer = AssetTransformer( processManager: processManager, fileSystem: fileSystem, @@ -225,8 +217,6 @@ Future writeBundle( outputPath: file.path, targetPlatform: targetPlatform, ); - case AssetKind.model: - doCopy = !await sceneImporter.importScene(input: input, outputPath: file.path); } if (doCopy) { input.copySync(file.path); diff --git a/packages/flutter_tools/lib/src/commands/widget_preview.dart b/packages/flutter_tools/lib/src/commands/widget_preview.dart index 4cdecc59d9..c710e0b8c6 100644 --- a/packages/flutter_tools/lib/src/commands/widget_preview.dart +++ b/packages/flutter_tools/lib/src/commands/widget_preview.dart @@ -525,8 +525,6 @@ final class WidgetPreviewStartCommand extends WidgetPreviewSubCommandBase with C final List shaders = rootManifest.shaders.map(transformAssetUri).toList(); - final List models = rootManifest.models.map(transformAssetUri).toList(); - final List? deferredComponents = rootManifest.deferredComponents?.map(transformDeferredComponent).toList(); @@ -535,7 +533,6 @@ final class WidgetPreviewStartCommand extends WidgetPreviewSubCommandBase with C assets: assets, fonts: fonts, shaders: shaders, - models: models, deferredComponents: deferredComponents, ); } diff --git a/packages/flutter_tools/lib/src/devfs.dart b/packages/flutter_tools/lib/src/devfs.dart index 05fffc59eb..ed6c83f9da 100644 --- a/packages/flutter_tools/lib/src/devfs.dart +++ b/packages/flutter_tools/lib/src/devfs.dart @@ -19,7 +19,6 @@ import 'base/net.dart'; import 'base/os.dart'; import 'build_info.dart'; import 'build_system/tools/asset_transformer.dart'; -import 'build_system/tools/scene_importer.dart'; import 'build_system/tools/shader_compiler.dart'; import 'compile.dart'; import 'convert.dart' show base64, utf8; @@ -476,7 +475,6 @@ class DevFS { final Directory rootDirectory; final Set assetPathsToEvict = {}; final Set shaderPathsToEvict = {}; - final Set scenePathsToEvict = {}; // A flag to indicate whether we have called `setAssetDirectory` on the target device. bool hasSetAssetDirectory = false; @@ -564,7 +562,6 @@ class DevFS { required PackageConfig packageConfig, required String dillOutputPath, required DevelopmentShaderCompiler shaderCompiler, - DevelopmentSceneImporter? sceneImporter, DevFSWriter? devFSWriter, String? target, AssetBundle? bundle, @@ -654,23 +651,6 @@ class DevFS { shaderPathsToEvict.add(archivePath); } }); - case AssetKind.model: - if (sceneImporter == null) { - break; - } - final Future pending = sceneImporter.reimportScene(entry.content); - pendingAssetBuilds.add(pending); - pending.then((DevFSContent? content) { - if (content == null) { - assetBuildFailed = true; - return; - } - dirtyEntries[deviceUri] = content; - syncedBytes += content.size; - if (!bundleFirstUpload) { - scenePathsToEvict.add(archivePath); - } - }); case AssetKind.regular: case AssetKind.font: case null: diff --git a/packages/flutter_tools/lib/src/flutter_manifest.dart b/packages/flutter_tools/lib/src/flutter_manifest.dart index 6be6753781..050a8bb86a 100644 --- a/packages/flutter_tools/lib/src/flutter_manifest.dart +++ b/packages/flutter_tools/lib/src/flutter_manifest.dart @@ -16,9 +16,6 @@ import 'base/utils.dart'; import 'globals.dart' as globals; import 'plugins.dart'; -/// Whether or not Impeller Scene 3D model import is enabled. -const bool kIs3dSceneSupported = true; - const Set _kValidPluginPlatforms = { 'android', 'ios', @@ -81,7 +78,6 @@ class FlutterManifest { List? assets, List? fonts, List? shaders, - List? models, List? deferredComponents, }) { final FlutterManifest copy = FlutterManifest._(logger: _logger); @@ -106,12 +102,6 @@ class FlutterManifest { ); } - if (models != null && models.isNotEmpty) { - copy._flutterDescriptor['models'] = YamlList.wrap( - models.map((Uri uri) => uri.toString()).toList(), - ); - } - if (deferredComponents != null && deferredComponents.isNotEmpty) { copy._flutterDescriptor['deferred-components'] = YamlList.wrap( deferredComponents.map((DeferredComponent dc) => dc.descriptor).toList(), @@ -407,8 +397,6 @@ class FlutterManifest { } late final List shaders = _extractAssetUris('shaders', 'Shader'); - late final List models = - kIs3dSceneSupported ? _extractAssetUris('models', 'Model') : []; List _extractAssetUris(String key, String singularName) { if (!_flutterDescriptor.containsKey(key)) { @@ -571,18 +559,6 @@ void _validateFlutter(YamlMap? yaml, List errors) { 'Expected "$yamlKey" to be a list of strings, but the first element is $yamlValue (${yamlValue.runtimeType}).', ); } - case 'models': - if (yamlValue is! YamlList) { - errors.add( - 'Expected "$yamlKey" to be a list, but got $yamlValue (${yamlValue.runtimeType}).', - ); - } else if (yamlValue.isEmpty) { - break; - } else if (yamlValue[0] is! String) { - errors.add( - 'Expected "$yamlKey" to be a list of strings, but the first element is $yamlValue (${yamlValue.runtimeType}).', - ); - } case 'fonts': if (yamlValue is! YamlList) { errors.add( diff --git a/packages/flutter_tools/lib/src/isolated/devfs_web.dart b/packages/flutter_tools/lib/src/isolated/devfs_web.dart index a63f14e9a2..56537dfe98 100644 --- a/packages/flutter_tools/lib/src/isolated/devfs_web.dart +++ b/packages/flutter_tools/lib/src/isolated/devfs_web.dart @@ -24,7 +24,6 @@ import '../base/logger.dart'; import '../base/net.dart'; import '../base/platform.dart'; import '../build_info.dart'; -import '../build_system/tools/scene_importer.dart'; import '../build_system/tools/shader_compiler.dart'; import '../bundle_builder.dart'; import '../cache.dart'; @@ -1031,7 +1030,6 @@ class WebDevFS implements DevFS { required PackageConfig packageConfig, required String dillOutputPath, required DevelopmentShaderCompiler shaderCompiler, - DevelopmentSceneImporter? sceneImporter, DevFSWriter? devFSWriter, String? target, AssetBundle? bundle, @@ -1234,9 +1232,6 @@ class WebDevFS implements DevFS { @override Set get shaderPathsToEvict => {}; - - @override - Set get scenePathsToEvict => {}; } class ReleaseAssetServer { diff --git a/packages/flutter_tools/lib/src/resident_runner.dart b/packages/flutter_tools/lib/src/resident_runner.dart index 185201281f..22b3245820 100644 --- a/packages/flutter_tools/lib/src/resident_runner.dart +++ b/packages/flutter_tools/lib/src/resident_runner.dart @@ -24,7 +24,6 @@ import 'base/terminal.dart'; import 'base/utils.dart'; import 'build_info.dart'; import 'build_system/build_system.dart'; -import 'build_system/tools/scene_importer.dart'; import 'build_system/tools/shader_compiler.dart'; import 'bundle.dart'; import 'cache.dart'; @@ -51,7 +50,6 @@ class FlutterDevice { ResidentCompiler? generator, this.userIdentifier, required this.developmentShaderCompiler, - this.developmentSceneImporter, }) : generator = generator ?? ResidentCompiler( @@ -100,16 +98,6 @@ class FlutterDevice { fileSystem: globals.fs, ); - final DevelopmentSceneImporter sceneImporter = DevelopmentSceneImporter( - sceneImporter: SceneImporter( - artifacts: globals.artifacts!, - logger: globals.logger, - processManager: globals.processManager, - fileSystem: globals.fs, - ), - fileSystem: globals.fs, - ); - final ResidentCompiler generator; // For both web and non-web platforms we initialize dill to/from @@ -205,7 +193,6 @@ class FlutterDevice { buildInfo: buildInfo, userIdentifier: userIdentifier, developmentShaderCompiler: shaderCompiler, - developmentSceneImporter: sceneImporter, ); } @@ -215,7 +202,6 @@ class FlutterDevice { final BuildInfo buildInfo; final String? userIdentifier; final DevelopmentShaderCompiler developmentShaderCompiler; - final DevelopmentSceneImporter? developmentSceneImporter; DevFSWriter? devFSWriter; Stream? vmServiceUris; @@ -557,7 +543,6 @@ class FlutterDevice { packageConfig: packageConfig, devFSWriter: devFSWriter, shaderCompiler: developmentShaderCompiler, - sceneImporter: developmentSceneImporter, dartPluginRegistrant: FlutterProject.current().dartPluginRegistrant, ); } on DevFSException { diff --git a/packages/flutter_tools/lib/src/run_hot.dart b/packages/flutter_tools/lib/src/run_hot.dart index 16407fed99..8e26c31087 100644 --- a/packages/flutter_tools/lib/src/run_hot.dart +++ b/packages/flutter_tools/lib/src/run_hot.dart @@ -557,7 +557,6 @@ class HotRunner extends ResidentRunner { } devFS.assetPathsToEvict.clear(); devFS.shaderPathsToEvict.clear(); - devFS.scenePathsToEvict.clear(); } } @@ -1163,9 +1162,7 @@ class HotRunner extends ResidentRunner { Future evictDirtyAssets() async { final List> futures = >[]; for (final FlutterDevice? device in flutterDevices) { - if (device!.devFS!.assetPathsToEvict.isEmpty && - device.devFS!.shaderPathsToEvict.isEmpty && - device.devFS!.scenePathsToEvict.isEmpty) { + if (device!.devFS!.assetPathsToEvict.isEmpty && device.devFS!.shaderPathsToEvict.isEmpty) { continue; } final List views = await device.vmService!.getFlutterViews(); @@ -1215,14 +1212,8 @@ class HotRunner extends ResidentRunner { device.vmService!.flutterEvictShader(assetPath, isolateId: views.first.uiIsolate!.id!), ); } - for (final String assetPath in device.devFS!.scenePathsToEvict) { - futures.add( - device.vmService!.flutterEvictScene(assetPath, isolateId: views.first.uiIsolate!.id!), - ); - } device.devFS!.assetPathsToEvict.clear(); device.devFS!.shaderPathsToEvict.clear(); - device.devFS!.scenePathsToEvict.clear(); } await Future.wait(futures); } diff --git a/packages/flutter_tools/lib/src/vmservice.dart b/packages/flutter_tools/lib/src/vmservice.dart index 6add860df5..29f80086f4 100644 --- a/packages/flutter_tools/lib/src/vmservice.dart +++ b/packages/flutter_tools/lib/src/vmservice.dart @@ -717,14 +717,6 @@ class FlutterVmService { ); } - Future?> flutterEvictScene(String assetPath, {required String isolateId}) { - return invokeFlutterExtensionRpcRaw( - 'ext.ui.window.reinitializeScene', - isolateId: isolateId, - args: {'assetKey': assetPath}, - ); - } - /// Exit the application by calling [exit] from `dart:io`. /// /// This method is only supported by certain embedders. This is diff --git a/packages/flutter_tools/test/commands.shard/hermetic/widget_preview/widget_preview_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/widget_preview/widget_preview_test.dart index caa08069a0..df56562bdb 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/widget_preview/widget_preview_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/widget_preview/widget_preview_test.dart @@ -89,7 +89,6 @@ void main() { } expect(updated.shaders, root.shaders.map(WidgetPreviewStartCommand.transformAssetUri)); - expect(updated.models, root.models.map(WidgetPreviewStartCommand.transformAssetUri)); expect(updated.deferredComponents?.length, root.deferredComponents?.length); if (root.deferredComponents != null) { @@ -161,8 +160,6 @@ flutter: asset: package/assetUri shaders: - shaderUri - models: - - modelUri deferred-components: - name: deferredComponent libraries: diff --git a/packages/flutter_tools/test/general.shard/flutter_manifest_test.dart b/packages/flutter_tools/test/general.shard/flutter_manifest_test.dart index 68c6f5e230..9b597479ff 100644 --- a/packages/flutter_tools/test/general.shard/flutter_manifest_test.dart +++ b/packages/flutter_tools/test/general.shard/flutter_manifest_test.dart @@ -1490,7 +1490,6 @@ flutter: FontAsset(Uri(path: 'assetUri'), weight: 100, style: 'normal'), ]), ], - models: [Uri(path: 'modelUri')], shaders: [Uri(path: 'shaderUri')], deferredComponents: [ DeferredComponent( @@ -1535,8 +1534,6 @@ flutter: asset: assetUri shaders: - shaderUri - models: - - modelUri deferred-components: - name: deferredComponent libraries: diff --git a/packages/flutter_tools/test/general.shard/hot_shared.dart b/packages/flutter_tools/test/general.shard/hot_shared.dart index cd145b350b..55856027ac 100644 --- a/packages/flutter_tools/test/general.shard/hot_shared.dart +++ b/packages/flutter_tools/test/general.shard/hot_shared.dart @@ -37,9 +37,6 @@ class FakeDevFs extends Fake implements DevFS { @override Set shaderPathsToEvict = {}; - @override - Set scenePathsToEvict = {}; - @override Uri? baseUri; } diff --git a/packages/flutter_tools/test/general.shard/resident_runner_helpers.dart b/packages/flutter_tools/test/general.shard/resident_runner_helpers.dart index 388b11b6f6..1b04505a6e 100644 --- a/packages/flutter_tools/test/general.shard/resident_runner_helpers.dart +++ b/packages/flutter_tools/test/general.shard/resident_runner_helpers.dart @@ -9,7 +9,6 @@ import 'package:flutter_tools/src/asset.dart'; import 'package:flutter_tools/src/base/dds.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/build_info.dart'; -import 'package:flutter_tools/src/build_system/tools/scene_importer.dart'; import 'package:flutter_tools/src/build_system/tools/shader_compiler.dart'; import 'package:flutter_tools/src/compile.dart'; import 'package:flutter_tools/src/devfs.dart'; @@ -450,9 +449,6 @@ class FakeDevFS extends Fake implements DevFS { @override Set shaderPathsToEvict = {}; - @override - Set scenePathsToEvict = {}; - @override bool didUpdateFontManifest = false; @@ -481,7 +477,6 @@ class FakeDevFS extends Fake implements DevFS { required PackageConfig packageConfig, required String dillOutputPath, required DevelopmentShaderCompiler shaderCompiler, - DevelopmentSceneImporter? sceneImporter, DevFSWriter? devFSWriter, String? target, AssetBundle? bundle, diff --git a/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart b/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart index f3c4ecde75..f1ccfd1ee5 100644 --- a/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart +++ b/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart @@ -17,7 +17,6 @@ import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/base/terminal.dart'; import 'package:flutter_tools/src/base/time.dart'; import 'package:flutter_tools/src/build_info.dart'; -import 'package:flutter_tools/src/build_system/tools/scene_importer.dart'; import 'package:flutter_tools/src/build_system/tools/shader_compiler.dart'; import 'package:flutter_tools/src/compile.dart'; import 'package:flutter_tools/src/dart/pub.dart'; @@ -1815,7 +1814,6 @@ class FakeWebDevFS extends Fake implements WebDevFS { required PackageConfig packageConfig, required String dillOutputPath, required DevelopmentShaderCompiler shaderCompiler, - DevelopmentSceneImporter? sceneImporter, DevFSWriter? devFSWriter, String? target, AssetBundle? bundle, diff --git a/packages/flutter_tools/test/general.shard/widget_preview/preview_manifest_test.dart b/packages/flutter_tools/test/general.shard/widget_preview/preview_manifest_test.dart index 5343e3d6a9..e2fd4514a3 100644 --- a/packages/flutter_tools/test/general.shard/widget_preview/preview_manifest_test.dart +++ b/packages/flutter_tools/test/general.shard/widget_preview/preview_manifest_test.dart @@ -106,7 +106,7 @@ void main() { // Simulate changing the root project's pubspec.yaml and verify that we should regenerate // the widget preview scaffold's pubspec.yaml. rootProject.replacePubspec( - rootProject.manifest.copyWith(logger: logger, models: [Uri(host: 'Random')]), + rootProject.manifest.copyWith(logger: logger, shaders: [Uri(host: 'Random')]), ); expect(previewManifest.shouldRegeneratePubspec(), true);