diff --git a/bin/cache/engine.version b/bin/cache/engine.version index 428b78c1cf..468d32f888 100644 --- a/bin/cache/engine.version +++ b/bin/cache/engine.version @@ -1 +1 @@ -57043227981727ae8ceb1d51514a2e0d14bf53f9 +284929b60543c282419208bce4b26772e9cf0ff1 diff --git a/packages/flutter_tools/lib/src/build_configuration.dart b/packages/flutter_tools/lib/src/build_configuration.dart index a352bc1729..924ec312fb 100644 --- a/packages/flutter_tools/lib/src/build_configuration.dart +++ b/packages/flutter_tools/lib/src/build_configuration.dart @@ -15,12 +15,12 @@ enum BuildType { debug, } -/// The type of build - `debug` or `deploy`. +/// The type of build - `debug` or `release`. /// /// TODO(devoncarew): Add a `profile` mode. enum BuildMode { debug, - deploy + release } String getModeName(BuildMode mode) => getEnumName(mode); diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart index 863fb9ee84..13ea9494a0 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart @@ -189,7 +189,7 @@ class FlutterEngine { List _getEngineDirs() { List dirs = [ 'android-arm', - 'android-arm-deploy', + 'android-arm-release', 'android-x64' ]; diff --git a/packages/flutter_tools/lib/src/commands/build_apk.dart b/packages/flutter_tools/lib/src/commands/build_apk.dart index a723ec17a3..21fd1a3e6f 100644 --- a/packages/flutter_tools/lib/src/commands/build_apk.dart +++ b/packages/flutter_tools/lib/src/commands/build_apk.dart @@ -170,8 +170,8 @@ class BuildApkCommand extends FlutterCommand { @override final String description = 'Build an Android APK file from your app.\n\n' - 'This command can build development and deployable versions of your application. \'debug\' builds\n' - 'support debugging and a quick development cycle. \'deploy\' builds don\'t support debugging and are\n' + 'This command can build debug and release versions of your application. \'debug\' builds support\n' + 'debugging and a quick development cycle. \'release\' builds don\'t support debugging and are\n' 'suitable for deploying to app stores.'; @override diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart index 6c56269f1b..406858cf74 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart @@ -64,18 +64,18 @@ abstract class FlutterCommand extends Command { argParser.addFlag('debug', negatable: false, help: 'Build a debug version of your app (the default).'); - argParser.addFlag('deploy', + argParser.addFlag('release', negatable: false, - help: 'Build a deployable version of your app.'); + help: 'Build a release version of your app.'); } BuildMode getBuildMode() { - if (argResults['debug'] && argResults['deploy']) - throw new UsageException('Only one of --debug or --deploy should be specified.', null); + if (argResults['debug'] && argResults['release']) + throw new UsageException('Only one of --debug or --release should be specified.', null); BuildMode mode = BuildMode.debug; - if (argResults['deploy']) - mode = BuildMode.deploy; + if (argResults['release']) + mode = BuildMode.release; return mode; } diff --git a/packages/flutter_tools/lib/src/toolchain.dart b/packages/flutter_tools/lib/src/toolchain.dart index d74b26eea8..74a05c344f 100644 --- a/packages/flutter_tools/lib/src/toolchain.dart +++ b/packages/flutter_tools/lib/src/toolchain.dart @@ -162,9 +162,9 @@ class ToolConfiguration { return new Directory(path.join(engineSrcPath, 'out/${type}_$_modeStr')); } else { // For now, only suffix for deploy variants. - String suffix = mode == BuildMode.deploy ? '-${getModeName(mode)}' : ''; + String suffix = mode == BuildMode.release ? '-${getModeName(mode)}' : ''; - // Create something like `android-arm` or `android-arm-deploy`. + // Create something like `android-arm` or `android-arm-release`. String dirName = getNameForTargetPlatform(platform) + suffix; Directory engineDir = _cache.getArtifactDirectory('engine'); return new Directory(path.join(engineDir.path, dirName)); diff --git a/packages/flutter_tools/test/toolchain_test.dart b/packages/flutter_tools/test/toolchain_test.dart index 159e839479..aaae0096a1 100644 --- a/packages/flutter_tools/test/toolchain_test.dart +++ b/packages/flutter_tools/test/toolchain_test.dart @@ -37,8 +37,8 @@ void main() { endsWith('cache/artifacts/engine/android-arm') ); expect( - toolConfig.getEngineArtifactsDirectory(TargetPlatform.android_arm, BuildMode.deploy).path, - endsWith('cache/artifacts/engine/android-arm-deploy') + toolConfig.getEngineArtifactsDirectory(TargetPlatform.android_arm, BuildMode.release).path, + endsWith('cache/artifacts/engine/android-arm-release') ); });