diff --git a/bin/flutter.bat b/bin/flutter.bat index 0680542329..59df026a7f 100644 --- a/bin/flutter.bat +++ b/bin/flutter.bat @@ -52,4 +52,4 @@ REM REM Do not use the CALL command in the next line to execute Dart. CALL causes REM Windows to re-read the line from disk after the CALL command has finished REM regardless of the ampersand chain. -"%dart%" --disable-dart-dev --packages="%flutter_tools_dir%\.dart_tool\package_config.json" %FLUTTER_TOOL_ARGS% "%snapshot_path%" %* & "%exit_with_errorlevel%" +"%dart%" --packages="%flutter_tools_dir%\.dart_tool\package_config.json" %FLUTTER_TOOL_ARGS% "%snapshot_path%" %* & "%exit_with_errorlevel%" diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh index bc28618758..d761436a29 100644 --- a/bin/internal/shared.sh +++ b/bin/internal/shared.sh @@ -168,7 +168,7 @@ function upgrade_flutter () ( fi # Compile... - "$DART" --verbosity=error --disable-dart-dev $FLUTTER_TOOL_ARGS --snapshot="$SNAPSHOT_PATH" --snapshot-kind="app-jit" --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" --no-enable-mirrors "$SCRIPT_PATH" > /dev/null + "$DART" --verbosity=error $FLUTTER_TOOL_ARGS --snapshot="$SNAPSHOT_PATH" --snapshot-kind="app-jit" --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" --no-enable-mirrors "$SCRIPT_PATH" > /dev/null echo "$compilekey" > "$STAMP_PATH" # Delete any temporary snapshot path. @@ -262,7 +262,7 @@ function shared::execute() { flutter*) # FLUTTER_TOOL_ARGS aren't quoted below, because it is meant to be # considered as separate space-separated args. - exec "$DART" --disable-dart-dev --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@" + exec "$DART" --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@" ;; dart*) exec "$DART" "$@" diff --git a/dev/bots/docs.sh b/dev/bots/docs.sh index e73877b79e..03dfbc360b 100755 --- a/dev/bots/docs.sh +++ b/dev/bots/docs.sh @@ -132,7 +132,7 @@ function generate_docs() { # Make sure that create_api_docs.dart has all the dependencies it needs. (cd "$FLUTTER_ROOT/dev/tools" && "$FLUTTER" pub get) - (cd "$FLUTTER_ROOT" && "$DART" --disable-dart-dev --enable-asserts "$FLUTTER_ROOT/dev/tools/create_api_docs.dart" --output-dir="$DOC_DIR") + (cd "$FLUTTER_ROOT" && "$DART" --enable-asserts "$FLUTTER_ROOT/dev/tools/create_api_docs.dart" --output-dir="$DOC_DIR") } function main() { diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart index 8aab471776..d7c5596e13 100644 --- a/dev/devicelab/lib/framework/runner.dart +++ b/dev/devicelab/lib/framework/runner.dart @@ -187,6 +187,7 @@ Future runTask( final Process runner = await startProcess( dartBin, [ + // TODO(matanlurey): This is load bearing; see https://github.com/flutter/flutter/issues/154268#issuecomment-2318996125. '--disable-dart-dev', '--enable-vm-service=0', // zero causes the system to choose a free port '--no-pause-isolates-on-exit', diff --git a/dev/devicelab/lib/framework/utils.dart b/dev/devicelab/lib/framework/utils.dart index fdb9b72116..384d8bb044 100644 --- a/dev/devicelab/lib/framework/utils.dart +++ b/dev/devicelab/lib/framework/utils.dart @@ -642,7 +642,7 @@ String get dartBin => String get pubBin => path.join(flutterDirectory.path, 'bin', 'cache', 'dart-sdk', 'bin', 'pub'); -Future dart(List args) => exec(dartBin, ['--disable-dart-dev', ...args]); +Future dart(List args) => exec(dartBin, args); /// Returns a future that completes with a path suitable for JAVA_HOME /// or with null, if Java cannot be found. diff --git a/packages/flutter_tools/lib/src/build_system/targets/icon_tree_shaker.dart b/packages/flutter_tools/lib/src/build_system/targets/icon_tree_shaker.dart index d04694ce9c..199941d680 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/icon_tree_shaker.dart +++ b/packages/flutter_tools/lib/src/build_system/targets/icon_tree_shaker.dart @@ -287,7 +287,6 @@ class IconTreeShaker { ) async { final List cmd = [ dart.path, - '--disable-dart-dev', constFinder.path, '--kernel-file', appDill.path, '--class-library-uri', 'package:flutter/src/widgets/icon_data.dart', diff --git a/packages/flutter_tools/lib/src/build_system/targets/web.dart b/packages/flutter_tools/lib/src/build_system/targets/web.dart index 61789ffee6..742f336897 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/web.dart +++ b/packages/flutter_tools/lib/src/build_system/targets/web.dart @@ -170,7 +170,6 @@ class Dart2JSTarget extends Dart2WebTarget { final String platformBinariesPath = artifacts.getHostArtifact(HostArtifact.webPlatformKernelFolder).path; final List sharedCommandOptions = [ artifacts.getArtifactPath(Artifact.engineDartBinary, platform: TargetPlatform.web_javascript), - '--disable-dart-dev', artifacts.getArtifactPath(Artifact.dart2jsSnapshot, platform: TargetPlatform.web_javascript), '--platform-binaries=$platformBinariesPath', '--invoker=flutter_tool', diff --git a/packages/flutter_tools/lib/src/compile.dart b/packages/flutter_tools/lib/src/compile.dart index f1ce205dbf..a317f44798 100644 --- a/packages/flutter_tools/lib/src/compile.dart +++ b/packages/flutter_tools/lib/src/compile.dart @@ -280,7 +280,6 @@ class KernelCompiler { } commandToStartFrontendServer = [ engineDartPath, - '--disable-dart-dev', frontendServerStarterPath, ]; } else { @@ -290,7 +289,6 @@ class KernelCompiler { } commandToStartFrontendServer = [ engineDartAotRuntimePath, - '--disable-dart-dev', _artifacts.getArtifactPath( Artifact.frontendServerSnapshotForEngineDartSdk, platform: platform, @@ -795,13 +793,11 @@ class DefaultResidentCompiler implements ResidentCompiler { if (frontendServerStarterPath != null && frontendServerStarterPath!.isNotEmpty) { commandToStartFrontendServer = [ artifacts.getArtifactPath(Artifact.engineDartBinary, platform: platform), - '--disable-dart-dev', frontendServerStarterPath!, ]; } else { commandToStartFrontendServer = [ artifacts.getArtifactPath(Artifact.engineDartAotRuntime, platform: platform), - '--disable-dart-dev', artifacts.getArtifactPath( Artifact.frontendServerSnapshotForEngineDartSdk, platform: platform, diff --git a/packages/flutter_tools/lib/src/dart/analysis.dart b/packages/flutter_tools/lib/src/dart/analysis.dart index c040f772a8..c848d56881 100644 --- a/packages/flutter_tools/lib/src/dart/analysis.dart +++ b/packages/flutter_tools/lib/src/dart/analysis.dart @@ -62,7 +62,6 @@ class AnalysisServer { ); final List command = [ _fileSystem.path.join(sdkPath, 'bin', 'dart'), - '--disable-dart-dev', snapshot, '--disable-server-feature-completion', '--disable-server-feature-search', diff --git a/packages/flutter_tools/lib/src/fuchsia/fuchsia_kernel_compiler.dart b/packages/flutter_tools/lib/src/fuchsia/fuchsia_kernel_compiler.dart index f8a16f1832..5abd590e35 100644 --- a/packages/flutter_tools/lib/src/fuchsia/fuchsia_kernel_compiler.dart +++ b/packages/flutter_tools/lib/src/fuchsia/fuchsia_kernel_compiler.dart @@ -78,7 +78,6 @@ class FuchsiaKernelCompiler { } final List command = [ engineDartBinaryPath, - '--disable-dart-dev', kernelCompiler, ...flags, ]; diff --git a/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart index adfbf61617..4b1e50b538 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart @@ -189,7 +189,6 @@ void main() { FakeCommand( command: const [ 'Artifact.engineDartSdkPath/bin/dart', - '--disable-dart-dev', 'Artifact.engineDartSdkPath/bin/snapshots/analysis_server.dart.snapshot', '--disable-server-feature-completion', '--disable-server-feature-search', @@ -227,7 +226,6 @@ void main() { FakeCommand( command: const [ 'Artifact.engineDartSdkPath/bin/dart', - '--disable-dart-dev', 'Artifact.engineDartSdkPath/bin/snapshots/analysis_server.dart.snapshot', '--disable-server-feature-completion', '--disable-server-feature-search', @@ -272,7 +270,6 @@ void main() { FakeCommand( command: const [ 'Artifact.engineDartSdkPath/bin/dart', - '--disable-dart-dev', 'Artifact.engineDartSdkPath/bin/snapshots/analysis_server.dart.snapshot', '--disable-server-feature-completion', '--disable-server-feature-search', @@ -327,7 +324,6 @@ void main() { FakeCommand( command: const [ 'Artifact.engineDartSdkPath/bin/dart', - '--disable-dart-dev', 'Artifact.engineDartSdkPath/bin/snapshots/analysis_server.dart.snapshot', '--disable-server-feature-completion', '--disable-server-feature-search', diff --git a/packages/flutter_tools/test/commands.shard/hermetic/analyze_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/analyze_test.dart index 4e91dd236f..fcde4bce8a 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/analyze_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/analyze_test.dart @@ -93,7 +93,6 @@ void main() { // artifact paths are from Artifacts.test() and stable command: [ 'Artifact.engineDartSdkPath/bin/dart', - '--disable-dart-dev', 'Artifact.engineDartSdkPath/bin/snapshots/analysis_server.dart.snapshot', '--disable-server-feature-completion', '--disable-server-feature-search', @@ -131,7 +130,6 @@ void main() { // artifact paths are from Artifacts.test() and stable command: const [ 'Artifact.engineDartSdkPath/bin/dart', - '--disable-dart-dev', 'Artifact.engineDartSdkPath/bin/snapshots/analysis_server.dart.snapshot', '--disable-server-feature-completion', '--disable-server-feature-search', diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/common_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/common_test.dart index 00baf8b001..37f2513c47 100644 --- a/packages/flutter_tools/test/general.shard/build_system/targets/common_test.dart +++ b/packages/flutter_tools/test/general.shard/build_system/targets/common_test.dart @@ -104,7 +104,6 @@ native-assets: processManager.addCommands([ FakeCommand(command: [ artifacts.getArtifactPath(Artifact.engineDartAotRuntime), - '--disable-dart-dev', artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk), '--sdk-root', '$flutterPatchedSdkPath/', @@ -144,7 +143,6 @@ native-assets: processManager.addCommands([ FakeCommand(command: [ artifacts.getArtifactPath(Artifact.engineDartAotRuntime), - '--disable-dart-dev', artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk), '--sdk-root', '$flutterPatchedSdkPath/', @@ -185,7 +183,6 @@ native-assets: processManager.addCommands([ FakeCommand(command: [ artifacts.getArtifactPath(Artifact.engineDartAotRuntime), - '--disable-dart-dev', artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk), '--sdk-root', '$flutterPatchedSdkPath/', @@ -227,7 +224,6 @@ native-assets: processManager.addCommands([ FakeCommand(command: [ artifacts.getArtifactPath(Artifact.engineDartBinary), - '--disable-dart-dev', 'path/to/frontend_server_starter.dart', '--sdk-root', '$flutterPatchedSdkPath/', @@ -269,7 +265,6 @@ native-assets: processManager.addCommands([ FakeCommand(command: [ artifacts.getArtifactPath(Artifact.engineDartAotRuntime), - '--disable-dart-dev', artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk), '--sdk-root', '$flutterPatchedSdkPath/', @@ -314,7 +309,6 @@ native-assets: processManager.addCommands([ FakeCommand(command: [ artifacts.getArtifactPath(Artifact.engineDartAotRuntime), - '--disable-dart-dev', artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk), '--sdk-root', '$flutterPatchedSdkPath/', @@ -356,7 +350,6 @@ native-assets: processManager.addCommands([ FakeCommand(command: [ artifacts.getArtifactPath(Artifact.engineDartAotRuntime), - '--disable-dart-dev', artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk), '--sdk-root', '$flutterPatchedSdkPath/', @@ -410,7 +403,6 @@ native-assets: processManager.addCommands([ FakeCommand(command: [ artifacts.getArtifactPath(Artifact.engineDartAotRuntime), - '--disable-dart-dev', artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk), '--sdk-root', '$flutterPatchedSdkPath/', @@ -458,7 +450,6 @@ native-assets: if (!empty) FakeCommand(command: [ artifacts.getArtifactPath(Artifact.engineDartAotRuntime), - '--disable-dart-dev', artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk), '--sdk-root', '$flutterPatchedSdkPath/', diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/icon_tree_shaker_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/icon_tree_shaker_test.dart index e4dc7f1ec9..f3b90acf97 100644 --- a/packages/flutter_tools/test/general.shard/build_system/targets/icon_tree_shaker_test.dart +++ b/packages/flutter_tools/test/general.shard/build_system/targets/icon_tree_shaker_test.dart @@ -37,7 +37,6 @@ void main() { List getConstFinderArgs(String appDillPath) => [ dartPath, - '--disable-dart-dev', constFinderPath, '--kernel-file', appDillPath, '--class-library-uri', 'package:flutter/src/widgets/icon_data.dart', diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart index 2408cbf2a8..5a174789b5 100644 --- a/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart +++ b/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart @@ -23,7 +23,6 @@ import '../../../src/testbed.dart'; const List _kDart2jsLinuxArgs = [ 'Artifact.engineDartBinary.TargetPlatform.web_javascript', - '--disable-dart-dev', 'Artifact.dart2jsSnapshot.TargetPlatform.web_javascript', '--platform-binaries=HostArtifact.webPlatformKernelFolder', '--invoker=flutter_tool', diff --git a/packages/flutter_tools/test/general.shard/compile_batch_test.dart b/packages/flutter_tools/test/general.shard/compile_batch_test.dart index 9d0ee764e3..ea2c1f6a92 100644 --- a/packages/flutter_tools/test/general.shard/compile_batch_test.dart +++ b/packages/flutter_tools/test/general.shard/compile_batch_test.dart @@ -54,7 +54,6 @@ void main() { processManager: FakeProcessManager.list([ FakeCommand(command: const [ 'Artifact.engineDartAotRuntime', - '--disable-dart-dev', 'Artifact.frontendServerSnapshotForEngineDartSdk', '--sdk-root', '/path/to/sdkroot/', @@ -100,7 +99,6 @@ void main() { processManager: FakeProcessManager.list([ FakeCommand(command: const [ 'Artifact.engineDartAotRuntime', - '--disable-dart-dev', 'Artifact.frontendServerSnapshotForEngineDartSdk', '--sdk-root', '/path/to/sdkroot/', @@ -146,7 +144,6 @@ void main() { processManager: FakeProcessManager.list([ FakeCommand(command: const [ 'Artifact.engineDartAotRuntime', - '--disable-dart-dev', 'Artifact.frontendServerSnapshotForEngineDartSdk', '--sdk-root', '/path/to/sdkroot/', @@ -192,7 +189,6 @@ void main() { processManager: FakeProcessManager.list([ FakeCommand(command: const [ 'Artifact.engineDartAotRuntime', - '--disable-dart-dev', 'Artifact.frontendServerSnapshotForEngineDartSdk', '--sdk-root', '/path/to/sdkroot/', @@ -242,7 +238,6 @@ void main() { processManager: FakeProcessManager.list([ FakeCommand(command: const [ 'Artifact.engineDartAotRuntime', - '--disable-dart-dev', 'Artifact.frontendServerSnapshotForEngineDartSdk', '--sdk-root', '/path/to/sdkroot/', @@ -292,7 +287,6 @@ void main() { processManager: FakeProcessManager.list([ FakeCommand(command: const [ 'Artifact.engineDartAotRuntime', - '--disable-dart-dev', 'Artifact.frontendServerSnapshotForEngineDartSdk', '--sdk-root', '/path/to/sdkroot/', @@ -344,7 +338,6 @@ void main() { processManager: FakeProcessManager.list([ FakeCommand(command: const [ 'Artifact.engineDartAotRuntime', - '--disable-dart-dev', 'Artifact.frontendServerSnapshotForEngineDartSdk', '--sdk-root', '/path/to/sdkroot/', @@ -394,7 +387,6 @@ void main() { processManager: FakeProcessManager.list([ FakeCommand(command: const [ 'Artifact.engineDartAotRuntime', - '--disable-dart-dev', 'Artifact.frontendServerSnapshotForEngineDartSdk', '--sdk-root', '/path/to/sdkroot/', @@ -454,7 +446,6 @@ void main() { processManager: FakeProcessManager.list([ FakeCommand(command: const [ 'Artifact.engineDartAotRuntime', - '--disable-dart-dev', 'Artifact.frontendServerSnapshotForEngineDartSdk', '--sdk-root', '/path/to/sdkroot/', diff --git a/packages/flutter_tools/test/general.shard/compile_incremental_test.dart b/packages/flutter_tools/test/general.shard/compile_incremental_test.dart index 14749ae1d4..1cad4c66e1 100644 --- a/packages/flutter_tools/test/general.shard/compile_incremental_test.dart +++ b/packages/flutter_tools/test/general.shard/compile_incremental_test.dart @@ -31,7 +31,6 @@ void main() { const List frontendServerCommand = [ 'Artifact.engineDartAotRuntime', - '--disable-dart-dev', 'Artifact.frontendServerSnapshotForEngineDartSdk', '--sdk-root', 'sdkroot/', diff --git a/packages/flutter_tools/test/general.shard/test/web_test_compiler_test.dart b/packages/flutter_tools/test/general.shard/test/web_test_compiler_test.dart index 5f8623a71a..3f5e40fd47 100644 --- a/packages/flutter_tools/test/general.shard/test/web_test_compiler_test.dart +++ b/packages/flutter_tools/test/general.shard/test/web_test_compiler_test.dart @@ -38,7 +38,6 @@ void main() { final FakeProcessManager processManager = FakeProcessManager.list([ FakeCommand(command: [ 'Artifact.engineDartAotRuntime.TargetPlatform.web_javascript', - '--disable-dart-dev', 'Artifact.frontendServerSnapshotForEngineDartSdk.TargetPlatform.web_javascript', '--sdk-root', 'HostArtifact.flutterWebSdk/',