Unverified Commit 26b9a015 authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

[flutter_tools] split cache into API and implementation (#79580)

parent 7d74794a
This diff is collapsed.
......@@ -39,6 +39,7 @@ import 'doctor.dart';
import 'emulator.dart';
import 'features.dart';
import 'flutter_application_package.dart';
import 'flutter_cache.dart';
import 'flutter_device_manager.dart';
import 'flutter_features.dart';
import 'fuchsia/fuchsia_device.dart' show FuchsiaDeviceTools;
......@@ -145,7 +146,7 @@ Future<T> runInContext<T>(
logger: globals.logger,
platform: globals.platform,
),
Cache: () => Cache(
Cache: () => FlutterCache(
fileSystem: globals.fs,
logger: globals.logger,
platform: globals.platform,
......
This diff is collapsed.
......@@ -22,12 +22,6 @@ import '../globals.dart' as globals;
import '../tester/flutter_tester.dart';
import '../web/web_device.dart';
const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo)
const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo)
const String kSnapshotFileName = 'flutter_tools.snapshot'; // in //flutter/bin/cache/
const String kFlutterToolsScriptFileName = 'flutter_tools.dart'; // in //flutter/packages/flutter_tools/bin/
const String kFlutterEnginePackageName = 'sky_engine';
class FlutterCommandRunner extends CommandRunner<void> {
FlutterCommandRunner({ bool verboseHelp = false }) : super(
'flutter',
......
......@@ -13,8 +13,8 @@ import '../base/file_system.dart';
import '../base/logger.dart';
import '../base/platform.dart';
import '../base/user_messages.dart' hide userMessages;
import '../cache.dart';
import '../dart/package_map.dart';
import 'flutter_command_runner.dart';
/// A strategy for locating the out/ directory of a local engine build.
///
......
......@@ -33,6 +33,7 @@ void main() {
platform: platform,
logger: BufferLogger.test(),
osUtils: FakeOperatingSystemUtils(),
artifacts: <ArtifactSet>[],
);
artifacts = CachedArtifacts(
fileSystem: fileSystem,
......@@ -187,6 +188,7 @@ void main() {
platform: platform,
logger: BufferLogger.test(),
osUtils: FakeOperatingSystemUtils(),
artifacts: <ArtifactSet>[],
);
artifacts = LocalEngineArtifacts(
fileSystem.path.join(fileSystem.currentDirectory.path, 'out', 'android_debug_unopt'),
......
......@@ -16,6 +16,7 @@ import 'package:flutter_tools/src/base/os.dart';
import 'package:flutter_tools/src/base/platform.dart';
import 'package:flutter_tools/src/cache.dart';
import 'package:flutter_tools/src/dart/pub.dart';
import 'package:flutter_tools/src/flutter_cache.dart';
import 'package:meta/meta.dart';
import 'package:mockito/mockito.dart';
......
......@@ -814,6 +814,7 @@ void _testInMemory(String description, Future<void> Function() testMethod) {
transfer(Cache(
fileSystem: globals.fs,
logger: logger,
artifacts: <ArtifactSet>[],
osUtils: OperatingSystemUtils(
fileSystem: globals.fs,
logger: logger,
......@@ -858,6 +859,7 @@ void _testInMemory(String description, Future<void> Function() testMethod) {
fileSystem: testFileSystem,
osUtils: globals.os,
platform: globals.platform,
artifacts: <ArtifactSet>[],
),
FlutterProjectFactory: () => FlutterProjectFactory(
fileSystem: testFileSystem,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment