diff --git a/agent/lib/src/gallery.dart b/agent/lib/src/gallery.dart index 1a3ba83e72..7a33070fa4 100644 --- a/agent/lib/src/gallery.dart +++ b/agent/lib/src/gallery.dart @@ -24,7 +24,7 @@ class GalleryTransitionTest extends Task { String deviceId = await getUnlockedDeviceId(ios: ios); Directory galleryDirectory = dir('${config.flutterDirectory.path}/examples/flutter_gallery'); await inDirectory(galleryDirectory, () async { - await pub('get'); + await flutter('packages', options: ['get']); if (ios) { // This causes an Xcode project to be created. diff --git a/agent/lib/src/perf_tests.dart b/agent/lib/src/perf_tests.dart index f46b36c5b3..c61d634889 100644 --- a/agent/lib/src/perf_tests.dart +++ b/agent/lib/src/perf_tests.dart @@ -55,7 +55,7 @@ class StartupTest extends Task { Future run() async { return await inDirectory(testDirectory, () async { String deviceId = await getUnlockedDeviceId(ios: ios); - await pub('get'); + await flutter('packages', options: ['get']); if (ios) { // This causes an Xcode project to be created. @@ -93,7 +93,7 @@ class PerfTest extends Task { Future run() { return inDirectory(testDirectory, () async { String deviceId = await getUnlockedDeviceId(ios: ios); - await pub('get'); + await flutter('packages', options: ['get']); if (ios) { // This causes an Xcode project to be created. @@ -129,7 +129,7 @@ class BuildTest extends Task { return await inDirectory(testDirectory, () async { Adb device = await adb(); device.unlock(); - await pub('get'); + await flutter('packages', options: ['get']); var watch = new Stopwatch()..start(); await flutter('build', options: [ diff --git a/agent/lib/src/size_tests.dart b/agent/lib/src/size_tests.dart index a6beee88b7..cb911cf7bb 100644 --- a/agent/lib/src/size_tests.dart +++ b/agent/lib/src/size_tests.dart @@ -30,7 +30,7 @@ class BasicMaterialAppSizeTest extends Task { throw 'Failed to create sample Flutter app in ${sampleDir.path}'; await inDirectory(sampleDir, () async { - await pub('get'); + await flutter('packages', options: ['get']); await flutter('build', options: ['clean']); await flutter('build', options: ['apk', '--release']); apkSizeInBytes = await file('${sampleDir.path}/build/app.apk').length(); diff --git a/agent/lib/src/utils.dart b/agent/lib/src/utils.dart index 0f9bea65e2..87276baddb 100644 --- a/agent/lib/src/utils.dart +++ b/agent/lib/src/utils.dart @@ -234,13 +234,6 @@ String get dartBin => path.join(config.flutterDirectory.path, 'bin/cache/dart-sd Future dart(List args) => exec(dartBin, args); -Future pub(String command) { - return exec( - path.join(config.flutterDirectory.path, 'bin/cache/dart-sdk/bin/pub'), - [command] - ); -} - Future inDirectory(dynamic directory, Future action()) async { String previousCwd = cwd; try {