From da0a12c611fc32e60763d69db7cb0d1727768d47 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Tue, 10 Nov 2015 13:18:34 -0800 Subject: [PATCH] Rename sky_tools to flutter_tools --- bin/flutter | 2 +- packages/flutter_tools/bin/build_sky_apk.dart | 2 +- .../bin/{sky_tools.dart => flutter_tools.dart} | 2 +- .../flutter_tools/lib/src/application_package.dart | 2 +- packages/flutter_tools/lib/src/artifacts.dart | 2 +- .../flutter_tools/lib/src/build_configuration.dart | 2 +- packages/flutter_tools/lib/src/commands/cache.dart | 4 ++-- packages/flutter_tools/lib/src/commands/daemon.dart | 2 +- .../lib/src/commands/flutter_command_runner.dart | 4 ++-- packages/flutter_tools/lib/src/commands/list.dart | 2 +- packages/flutter_tools/lib/src/commands/listen.dart | 2 +- packages/flutter_tools/lib/src/commands/logs.dart | 2 +- packages/flutter_tools/lib/src/commands/run_mojo.dart | 2 +- packages/flutter_tools/lib/src/commands/start.dart | 2 +- packages/flutter_tools/lib/src/commands/stop.dart | 2 +- packages/flutter_tools/lib/src/commands/test.dart | 2 +- packages/flutter_tools/lib/src/commands/trace.dart | 2 +- packages/flutter_tools/lib/src/device.dart | 2 +- packages/flutter_tools/lib/src/os_utils.dart | 2 +- packages/flutter_tools/lib/src/process.dart | 2 +- packages/flutter_tools/lib/src/test/loader.dart | 6 +++--- packages/flutter_tools/lib/src/test/remote_test.dart | 2 +- packages/flutter_tools/pubspec.yaml | 8 ++------ packages/flutter_tools/test/android_device_test.dart | 2 +- packages/flutter_tools/test/daemon_test.dart | 2 +- packages/flutter_tools/test/init_test.dart | 8 ++++---- packages/flutter_tools/test/install_test.dart | 2 +- packages/flutter_tools/test/list_test.dart | 2 +- packages/flutter_tools/test/listen_test.dart | 2 +- packages/flutter_tools/test/logs_test.dart | 2 +- packages/flutter_tools/test/os_utils_test.dart | 4 ++-- packages/flutter_tools/test/src/mocks.dart | 10 +++++----- packages/flutter_tools/test/start_test.dart | 2 +- packages/flutter_tools/test/stop_test.dart | 2 +- packages/flutter_tools/test/trace_test.dart | 2 +- packages/flutter_tools/tool/daemon_client.dart | 2 +- packages/unit/pubspec.yaml | 3 ++- 37 files changed, 51 insertions(+), 54 deletions(-) rename packages/flutter_tools/bin/{sky_tools.dart => flutter_tools.dart} (77%) diff --git a/bin/flutter b/bin/flutter index 31c97377f5..9d96ad347d 100755 --- a/bin/flutter +++ b/bin/flutter @@ -7,7 +7,7 @@ export FLUTTER_ROOT=$(dirname $(dirname "${BASH_SOURCE[0]}")) FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools" SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot" STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp" -SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/sky_tools.dart" +SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart" # TODO(abarth): We shouldn't require dart to be on the user's path. DART=dart diff --git a/packages/flutter_tools/bin/build_sky_apk.dart b/packages/flutter_tools/bin/build_sky_apk.dart index b0f5086703..528dfc89ac 100644 --- a/packages/flutter_tools/bin/build_sky_apk.dart +++ b/packages/flutter_tools/bin/build_sky_apk.dart @@ -94,7 +94,7 @@ main(List argv) async { ArgResults args = parser.parse(argv); if (args['help']) { - print('usage: pub run sky_tools:build_sky_apk '); + print('usage: build_sky_apk '); print(''); print(parser.usage); return; diff --git a/packages/flutter_tools/bin/sky_tools.dart b/packages/flutter_tools/bin/flutter_tools.dart similarity index 77% rename from packages/flutter_tools/bin/sky_tools.dart rename to packages/flutter_tools/bin/flutter_tools.dart index 99338de253..482239c9b1 100644 --- a/packages/flutter_tools/bin/sky_tools.dart +++ b/packages/flutter_tools/bin/flutter_tools.dart @@ -2,6 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky_tools/executable.dart' as executable; +import 'package:flutter_tools/executable.dart' as executable; main(List args) => executable.main(args); diff --git a/packages/flutter_tools/lib/src/application_package.dart b/packages/flutter_tools/lib/src/application_package.dart index fbe7e53d88..ac25746fd9 100644 --- a/packages/flutter_tools/lib/src/application_package.dart +++ b/packages/flutter_tools/lib/src/application_package.dart @@ -10,7 +10,7 @@ import 'package:path/path.dart' as path; import 'artifacts.dart'; import 'build_configuration.dart'; -final Logger _logging = new Logger('sky_tools.application_package'); +final Logger _logging = new Logger('flutter_tools.application_package'); abstract class ApplicationPackage { /// Path to the actual apk or bundle. diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart index 0fb7c351b6..6310851bbf 100644 --- a/packages/flutter_tools/lib/src/artifacts.dart +++ b/packages/flutter_tools/lib/src/artifacts.dart @@ -12,7 +12,7 @@ import 'build_configuration.dart'; import 'os_utils.dart'; import 'process.dart'; -final Logger _logging = new Logger('sky_tools.artifacts'); +final Logger _logging = new Logger('flutter_tools.artifacts'); const String _kShellCategory = 'shell'; const String _kViewerCategory = 'viewer'; diff --git a/packages/flutter_tools/lib/src/build_configuration.dart b/packages/flutter_tools/lib/src/build_configuration.dart index 5ac291c8a6..374fbb477b 100644 --- a/packages/flutter_tools/lib/src/build_configuration.dart +++ b/packages/flutter_tools/lib/src/build_configuration.dart @@ -7,7 +7,7 @@ import 'dart:io'; import 'package:logging/logging.dart'; import 'package:path/path.dart' as path; -final Logger _logging = new Logger('sky_tools.build_configuration'); +final Logger _logging = new Logger('flutter_tools.build_configuration'); enum BuildType { prebuilt, diff --git a/packages/flutter_tools/lib/src/commands/cache.dart b/packages/flutter_tools/lib/src/commands/cache.dart index ac8d185800..6ab2fb88b6 100644 --- a/packages/flutter_tools/lib/src/commands/cache.dart +++ b/packages/flutter_tools/lib/src/commands/cache.dart @@ -9,11 +9,11 @@ import 'package:logging/logging.dart'; import '../artifacts.dart'; -final Logger _logging = new Logger('sky_tools.cache'); +final Logger _logging = new Logger('flutter_tools.cache'); class CacheCommand extends Command { final String name = 'cache'; - final String description = 'Manages sky_tools\' cache of binary artifacts.'; + final String description = 'Manages Flutter\'s cache of binary artifacts.'; CacheCommand() { addSubcommand(new _ClearCommand()); addSubcommand(new _PopulateCommand()); diff --git a/packages/flutter_tools/lib/src/commands/daemon.dart b/packages/flutter_tools/lib/src/commands/daemon.dart index 78872bd322..cd82c5fab0 100644 --- a/packages/flutter_tools/lib/src/commands/daemon.dart +++ b/packages/flutter_tools/lib/src/commands/daemon.dart @@ -20,7 +20,7 @@ const String domain = 'domain'; /// A domain @command annotation. const String command = 'command'; -final Logger _logging = new Logger('sky_tools.daemon'); +final Logger _logging = new Logger('flutter_tools.daemon'); // TODO: Create a `device` domain in order to list devices and fire events when // devices are added or removed. diff --git a/packages/flutter_tools/lib/src/commands/flutter_command_runner.dart b/packages/flutter_tools/lib/src/commands/flutter_command_runner.dart index ecd69a8748..295e52cf39 100644 --- a/packages/flutter_tools/lib/src/commands/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/commands/flutter_command_runner.dart @@ -14,12 +14,12 @@ import '../artifacts.dart'; import '../build_configuration.dart'; import '../process.dart'; -final Logger _logging = new Logger('sky_tools.flutter_command_runner'); +final Logger _logging = new Logger('flutter_tools.flutter_command_runner'); 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 = 'sky_tools.dart'; // in //flutter/packages/flutter_tools/bin/ +const String kFlutterToolsScriptFileName = 'flutter_tools.dart'; // in //flutter/packages/flutter_tools/bin/ const String kFlutterEnginePackageName = 'sky_engine'; class FlutterCommandRunner extends CommandRunner { diff --git a/packages/flutter_tools/lib/src/commands/list.dart b/packages/flutter_tools/lib/src/commands/list.dart index 498f0a5e47..d38cd78066 100644 --- a/packages/flutter_tools/lib/src/commands/list.dart +++ b/packages/flutter_tools/lib/src/commands/list.dart @@ -9,7 +9,7 @@ import 'package:logging/logging.dart'; import '../device.dart'; import 'flutter_command.dart'; -final Logger _logging = new Logger('sky_tools.list'); +final Logger _logging = new Logger('flutter_tools.list'); class ListCommand extends FlutterCommand { final String name = 'list'; diff --git a/packages/flutter_tools/lib/src/commands/listen.dart b/packages/flutter_tools/lib/src/commands/listen.dart index e384e85259..5adc3232d8 100644 --- a/packages/flutter_tools/lib/src/commands/listen.dart +++ b/packages/flutter_tools/lib/src/commands/listen.dart @@ -13,7 +13,7 @@ import '../process.dart'; import 'build.dart'; import 'flutter_command.dart'; -final Logger _logging = new Logger('sky_tools.listen'); +final Logger _logging = new Logger('flutter_tools.listen'); class ListenCommand extends FlutterCommand { final String name = 'listen'; diff --git a/packages/flutter_tools/lib/src/commands/logs.dart b/packages/flutter_tools/lib/src/commands/logs.dart index 992187f128..40b1901441 100644 --- a/packages/flutter_tools/lib/src/commands/logs.dart +++ b/packages/flutter_tools/lib/src/commands/logs.dart @@ -9,7 +9,7 @@ import 'package:logging/logging.dart'; import '../device.dart'; import 'flutter_command.dart'; -final Logger _logging = new Logger('sky_tools.logs'); +final Logger _logging = new Logger('flutter_tools.logs'); class LogsCommand extends FlutterCommand { final String name = 'logs'; diff --git a/packages/flutter_tools/lib/src/commands/run_mojo.dart b/packages/flutter_tools/lib/src/commands/run_mojo.dart index 6a60270241..ce0a187547 100644 --- a/packages/flutter_tools/lib/src/commands/run_mojo.dart +++ b/packages/flutter_tools/lib/src/commands/run_mojo.dart @@ -13,7 +13,7 @@ import '../artifacts.dart'; import '../build_configuration.dart'; import '../process.dart'; -final Logger _logging = new Logger('sky_tools.run_mojo'); +final Logger _logging = new Logger('flutter_tools.run_mojo'); class RunMojoCommand extends Command { final String name = 'run_mojo'; diff --git a/packages/flutter_tools/lib/src/commands/start.dart b/packages/flutter_tools/lib/src/commands/start.dart index f85e3d0342..ce60e438c5 100644 --- a/packages/flutter_tools/lib/src/commands/start.dart +++ b/packages/flutter_tools/lib/src/commands/start.dart @@ -15,7 +15,7 @@ import 'flutter_command.dart'; import 'install.dart'; import 'stop.dart'; -final Logger _logging = new Logger('sky_tools.start'); +final Logger _logging = new Logger('flutter_tools.start'); class StartCommand extends FlutterCommand { final String name = 'start'; diff --git a/packages/flutter_tools/lib/src/commands/stop.dart b/packages/flutter_tools/lib/src/commands/stop.dart index 9117443594..1b94da086d 100644 --- a/packages/flutter_tools/lib/src/commands/stop.dart +++ b/packages/flutter_tools/lib/src/commands/stop.dart @@ -10,7 +10,7 @@ import '../application_package.dart'; import '../device.dart'; import 'flutter_command.dart'; -final Logger _logging = new Logger('sky_tools.stop'); +final Logger _logging = new Logger('flutter_tools.stop'); class StopCommand extends FlutterCommand { final String name = 'stop'; diff --git a/packages/flutter_tools/lib/src/commands/test.dart b/packages/flutter_tools/lib/src/commands/test.dart index 0decb1c513..8c3202c60d 100644 --- a/packages/flutter_tools/lib/src/commands/test.dart +++ b/packages/flutter_tools/lib/src/commands/test.dart @@ -15,7 +15,7 @@ import '../process.dart'; import '../test/loader.dart' as loader; import 'flutter_command.dart'; -final Logger _logging = new Logger('sky_tools.test'); +final Logger _logging = new Logger('flutter_tools.test'); class TestCommand extends FlutterCommand { String get name => 'test'; diff --git a/packages/flutter_tools/lib/src/commands/trace.dart b/packages/flutter_tools/lib/src/commands/trace.dart index b30f570312..6ed14079e9 100644 --- a/packages/flutter_tools/lib/src/commands/trace.dart +++ b/packages/flutter_tools/lib/src/commands/trace.dart @@ -10,7 +10,7 @@ import '../application_package.dart'; import '../device.dart'; import 'flutter_command.dart'; -final Logger _logging = new Logger('sky_tools.trace'); +final Logger _logging = new Logger('flutter_tools.trace'); class TraceCommand extends FlutterCommand { final String name = 'trace'; diff --git a/packages/flutter_tools/lib/src/device.dart b/packages/flutter_tools/lib/src/device.dart index da07055d89..31d876e27b 100644 --- a/packages/flutter_tools/lib/src/device.dart +++ b/packages/flutter_tools/lib/src/device.dart @@ -13,7 +13,7 @@ import 'application_package.dart'; import 'build_configuration.dart'; import 'process.dart'; -final Logger _logging = new Logger('sky_tools.device'); +final Logger _logging = new Logger('flutter_tools.device'); abstract class Device { final String id; diff --git a/packages/flutter_tools/lib/src/os_utils.dart b/packages/flutter_tools/lib/src/os_utils.dart index d200652569..6b5a986a14 100644 --- a/packages/flutter_tools/lib/src/os_utils.dart +++ b/packages/flutter_tools/lib/src/os_utils.dart @@ -8,7 +8,7 @@ import 'package:logging/logging.dart'; final OperatingSystemUtils osUtils = new OperatingSystemUtils._(); -final Logger _logging = new Logger('sky_tools.os'); +final Logger _logging = new Logger('flutter_tools.os'); abstract class OperatingSystemUtils { factory OperatingSystemUtils._() { diff --git a/packages/flutter_tools/lib/src/process.dart b/packages/flutter_tools/lib/src/process.dart index d1db6547c4..3259b69e00 100644 --- a/packages/flutter_tools/lib/src/process.dart +++ b/packages/flutter_tools/lib/src/process.dart @@ -8,7 +8,7 @@ import 'dart:io'; import 'package:logging/logging.dart'; -final Logger _logging = new Logger('sky_tools.process'); +final Logger _logging = new Logger('flutter_tools.process'); /// This runs the command and streams stdout/stderr from the child process to /// this process' stdout/stderr. diff --git a/packages/flutter_tools/lib/src/test/loader.dart b/packages/flutter_tools/lib/src/test/loader.dart index cf54c0a976..1a5d6122de 100644 --- a/packages/flutter_tools/lib/src/test/loader.dart +++ b/packages/flutter_tools/lib/src/test/loader.dart @@ -7,8 +7,8 @@ import 'dart:convert'; import 'dart:io'; import 'package:path/path.dart' as p; -import 'package:sky_tools/src/test/json_socket.dart'; -import 'package:sky_tools/src/test/remote_test.dart'; +import 'package:flutter_tools/src/test/json_socket.dart'; +import 'package:flutter_tools/src/test/remote_test.dart'; import 'package:stack_trace/stack_trace.dart'; import 'package:test/src/backend/group.dart'; import 'package:test/src/backend/metadata.dart'; @@ -79,7 +79,7 @@ Future _loadVMFile(String path, import 'dart:convert'; import 'package:test/src/backend/metadata.dart'; -import 'package:sky_tools/src/test/remote_listener.dart'; +import 'package:flutter_tools/src/test/remote_listener.dart'; import '${p.toUri(p.absolute(path))}' as test; diff --git a/packages/flutter_tools/lib/src/test/remote_test.dart b/packages/flutter_tools/lib/src/test/remote_test.dart index d3abea3492..aa7eb0c421 100644 --- a/packages/flutter_tools/lib/src/test/remote_test.dart +++ b/packages/flutter_tools/lib/src/test/remote_test.dart @@ -15,7 +15,7 @@ import 'package:test/src/backend/test.dart'; import 'package:test/src/backend/test_platform.dart'; import 'package:test/src/util/remote_exception.dart'; -import 'package:sky_tools/src/test/json_socket.dart'; +import 'package:flutter_tools/src/test/json_socket.dart'; class RemoteTest extends Test { RemoteTest(this.name, this.metadata, this._socket, this._index); diff --git a/packages/flutter_tools/pubspec.yaml b/packages/flutter_tools/pubspec.yaml index 6232d603fb..0a9b584d82 100644 --- a/packages/flutter_tools/pubspec.yaml +++ b/packages/flutter_tools/pubspec.yaml @@ -1,5 +1,5 @@ -name: sky_tools -version: 0.0.37 +name: flutter_tools +version: 0.0.38 description: Tools for building Flutter applications homepage: http://flutter.io author: Flutter Authors @@ -31,7 +31,3 @@ dependencies: dev_dependencies: mockito: ^0.10.1 - -# Add the bin/sky_tools.dart script to the scripts pub installs. -executables: - sky_tools: diff --git a/packages/flutter_tools/test/android_device_test.dart b/packages/flutter_tools/test/android_device_test.dart index 9a153b6228..99f90006cb 100644 --- a/packages/flutter_tools/test/android_device_test.dart +++ b/packages/flutter_tools/test/android_device_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky_tools/src/device.dart'; +import 'package:flutter_tools/src/device.dart'; import 'package:test/test.dart'; main() => defineTests(); diff --git a/packages/flutter_tools/test/daemon_test.dart b/packages/flutter_tools/test/daemon_test.dart index 352bb71f91..9a61dd0baa 100644 --- a/packages/flutter_tools/test/daemon_test.dart +++ b/packages/flutter_tools/test/daemon_test.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'package:mockito/mockito.dart'; -import 'package:sky_tools/src/commands/daemon.dart'; +import 'package:flutter_tools/src/commands/daemon.dart'; import 'package:test/test.dart'; import 'src/mocks.dart'; diff --git a/packages/flutter_tools/test/init_test.dart b/packages/flutter_tools/test/init_test.dart index f93bf14f71..a2b5365c30 100644 --- a/packages/flutter_tools/test/init_test.dart +++ b/packages/flutter_tools/test/init_test.dart @@ -6,9 +6,9 @@ import 'dart:io'; import 'package:args/command_runner.dart'; import 'package:path/path.dart' as p; -import 'package:sky_tools/src/artifacts.dart'; -import 'package:sky_tools/src/commands/init.dart'; -import 'package:sky_tools/src/process.dart'; +import 'package:flutter_tools/src/artifacts.dart'; +import 'package:flutter_tools/src/commands/init.dart'; +import 'package:flutter_tools/src/process.dart'; import 'package:test/test.dart'; main() => defineTests(); @@ -18,7 +18,7 @@ defineTests() { Directory temp; setUp(() { - temp = Directory.systemTemp.createTempSync('sky_tools'); + temp = Directory.systemTemp.createTempSync('flutter_tools'); }); tearDown(() { diff --git a/packages/flutter_tools/test/install_test.dart b/packages/flutter_tools/test/install_test.dart index d10c652746..64fce89263 100644 --- a/packages/flutter_tools/test/install_test.dart +++ b/packages/flutter_tools/test/install_test.dart @@ -4,7 +4,7 @@ import 'package:args/command_runner.dart'; import 'package:mockito/mockito.dart'; -import 'package:sky_tools/src/commands/install.dart'; +import 'package:flutter_tools/src/commands/install.dart'; import 'package:test/test.dart'; import 'src/mocks.dart'; diff --git a/packages/flutter_tools/test/list_test.dart b/packages/flutter_tools/test/list_test.dart index c2fec2183a..68b8cf72ed 100644 --- a/packages/flutter_tools/test/list_test.dart +++ b/packages/flutter_tools/test/list_test.dart @@ -6,7 +6,7 @@ import 'dart:io'; import 'package:args/command_runner.dart'; import 'package:mockito/mockito.dart'; -import 'package:sky_tools/src/commands/list.dart'; +import 'package:flutter_tools/src/commands/list.dart'; import 'package:test/test.dart'; import 'src/mocks.dart'; diff --git a/packages/flutter_tools/test/listen_test.dart b/packages/flutter_tools/test/listen_test.dart index 7899a9103d..6f56177482 100644 --- a/packages/flutter_tools/test/listen_test.dart +++ b/packages/flutter_tools/test/listen_test.dart @@ -4,7 +4,7 @@ import 'package:args/command_runner.dart'; import 'package:mockito/mockito.dart'; -import 'package:sky_tools/src/commands/listen.dart'; +import 'package:flutter_tools/src/commands/listen.dart'; import 'package:test/test.dart'; import 'src/mocks.dart'; diff --git a/packages/flutter_tools/test/logs_test.dart b/packages/flutter_tools/test/logs_test.dart index e43bf5cda8..a38a25b145 100644 --- a/packages/flutter_tools/test/logs_test.dart +++ b/packages/flutter_tools/test/logs_test.dart @@ -4,7 +4,7 @@ import 'package:args/command_runner.dart'; import 'package:mockito/mockito.dart'; -import 'package:sky_tools/src/commands/logs.dart'; +import 'package:flutter_tools/src/commands/logs.dart'; import 'package:test/test.dart'; import 'src/mocks.dart'; diff --git a/packages/flutter_tools/test/os_utils_test.dart b/packages/flutter_tools/test/os_utils_test.dart index c38e6386b6..647970e893 100644 --- a/packages/flutter_tools/test/os_utils_test.dart +++ b/packages/flutter_tools/test/os_utils_test.dart @@ -4,7 +4,7 @@ import 'dart:io'; -import 'package:sky_tools/src/os_utils.dart'; +import 'package:flutter_tools/src/os_utils.dart'; import 'package:test/test.dart'; import 'package:path/path.dart' as p; @@ -15,7 +15,7 @@ defineTests() { Directory temp; setUp(() { - temp = Directory.systemTemp.createTempSync('sky_tools'); + temp = Directory.systemTemp.createTempSync('flutter_tools'); }); tearDown(() { diff --git a/packages/flutter_tools/test/src/mocks.dart b/packages/flutter_tools/test/src/mocks.dart index 94466d4984..4e281ade2e 100644 --- a/packages/flutter_tools/test/src/mocks.dart +++ b/packages/flutter_tools/test/src/mocks.dart @@ -3,11 +3,11 @@ // found in the LICENSE file. import 'package:mockito/mockito.dart'; -import 'package:sky_tools/src/application_package.dart'; -import 'package:sky_tools/src/build_configuration.dart'; -import 'package:sky_tools/src/commands/flutter_command.dart'; -import 'package:sky_tools/src/device.dart'; -import 'package:sky_tools/src/toolchain.dart'; +import 'package:flutter_tools/src/application_package.dart'; +import 'package:flutter_tools/src/build_configuration.dart'; +import 'package:flutter_tools/src/commands/flutter_command.dart'; +import 'package:flutter_tools/src/device.dart'; +import 'package:flutter_tools/src/toolchain.dart'; class MockApplicationPackageStore extends ApplicationPackageStore { MockApplicationPackageStore() : super( diff --git a/packages/flutter_tools/test/start_test.dart b/packages/flutter_tools/test/start_test.dart index 772edd6c07..0ab19c4b08 100644 --- a/packages/flutter_tools/test/start_test.dart +++ b/packages/flutter_tools/test/start_test.dart @@ -4,7 +4,7 @@ import 'package:args/command_runner.dart'; import 'package:mockito/mockito.dart'; -import 'package:sky_tools/src/commands/start.dart'; +import 'package:flutter_tools/src/commands/start.dart'; import 'package:test/test.dart'; import 'src/mocks.dart'; diff --git a/packages/flutter_tools/test/stop_test.dart b/packages/flutter_tools/test/stop_test.dart index 53da532aa5..bc82dba47f 100644 --- a/packages/flutter_tools/test/stop_test.dart +++ b/packages/flutter_tools/test/stop_test.dart @@ -4,7 +4,7 @@ import 'package:args/command_runner.dart'; import 'package:mockito/mockito.dart'; -import 'package:sky_tools/src/commands/stop.dart'; +import 'package:flutter_tools/src/commands/stop.dart'; import 'package:test/test.dart'; import 'src/mocks.dart'; diff --git a/packages/flutter_tools/test/trace_test.dart b/packages/flutter_tools/test/trace_test.dart index 83f5a1b18f..9b9f00b089 100644 --- a/packages/flutter_tools/test/trace_test.dart +++ b/packages/flutter_tools/test/trace_test.dart @@ -4,7 +4,7 @@ import 'package:args/command_runner.dart'; import 'package:mockito/mockito.dart'; -import 'package:sky_tools/src/commands/trace.dart'; +import 'package:flutter_tools/src/commands/trace.dart'; import 'package:test/test.dart'; import 'src/mocks.dart'; diff --git a/packages/flutter_tools/tool/daemon_client.dart b/packages/flutter_tools/tool/daemon_client.dart index bb21f2008e..cba8eaece2 100644 --- a/packages/flutter_tools/tool/daemon_client.dart +++ b/packages/flutter_tools/tool/daemon_client.dart @@ -8,7 +8,7 @@ import 'dart:io'; Process daemon; main() async { - daemon = await Process.start('dart', ['bin/sky_tools.dart', 'daemon']); + daemon = await Process.start('dart', ['bin/flutter_tools.dart', 'daemon']); print('daemon process started, pid: ${daemon.pid}'); daemon.stdout diff --git a/packages/unit/pubspec.yaml b/packages/unit/pubspec.yaml index 3a89126041..41f9d23342 100644 --- a/packages/unit/pubspec.yaml +++ b/packages/unit/pubspec.yaml @@ -8,5 +8,6 @@ dependencies: path: ../flutter stocks: path: ../../examples/stocks - sky_tools: + # To ensure the version of test doesn't get out of sync. + flutter_tools: path: ../flutter_tools