diff --git a/analysis_options_repo.yaml b/analysis_options_repo.yaml index 594bb193f0..aee5b8f73c 100644 --- a/analysis_options_repo.yaml +++ b/analysis_options_repo.yaml @@ -22,7 +22,6 @@ analyzer: language: enableStrictCallChecks: true enableSuperMixins: true - enableAssertInitializer: true strong-mode: implicit-dynamic: false errors: diff --git a/bin/flutter b/bin/flutter index 4fe4802de3..d068fcbbda 100755 --- a/bin/flutter +++ b/bin/flutter @@ -130,7 +130,6 @@ if [ ! -d "$FLUTTER_ROOT/.git" ]; then exit 1 fi -FLUTTER_TOOL_ARGS="--assert-initializer $FLUTTER_TOOL_ARGS" # To debug the tool, you can uncomment the following lines to enable checked mode and set an observatory port: # FLUTTER_TOOL_ARGS="--checked $FLUTTER_TOOL_ARGS" # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" diff --git a/bin/flutter.bat b/bin/flutter.bat index ce317cdfec..3240522e03 100644 --- a/bin/flutter.bat +++ b/bin/flutter.bat @@ -40,7 +40,6 @@ IF NOT EXIST "%flutter_root%\.git" ( REM Ensure that bin/cache exists. IF NOT EXIST "%cache_dir%" MKDIR "%cache_dir%" -SET FLUTTER_TOOL_ARGS=--assert-initializer %FLUTTER_TOOL_ARGS% REM To debug the tool, you can uncomment the following lines to enable checked mode and set an observatory port: REM SET FLUTTER_TOOL_ARGS="--checked %FLUTTER_TOOL_ARGS%" REM SET FLUTTER_TOOL_ARGS="%FLUTTER_TOOL_ARGS% --observe=65432" diff --git a/bin/internal/dart-sdk.version b/bin/internal/dart-sdk.version index 9067cced61..f9f88f7b01 100644 --- a/bin/internal/dart-sdk.version +++ b/bin/internal/dart-sdk.version @@ -1 +1 @@ -1.25.0-dev.11.0 +2.0.0-dev.16.0 diff --git a/dev/automated_tests/pubspec.yaml b/dev/automated_tests/pubspec.yaml index 5fbb2c3329..7371fcf1de 100644 --- a/dev/automated_tests/pubspec.yaml +++ b/dev/automated_tests/pubspec.yaml @@ -5,7 +5,7 @@ dependencies: flutter_test: sdk: flutter - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/dev/benchmarks/complex_layout/pubspec.yaml b/dev/benchmarks/complex_layout/pubspec.yaml index 136922a21f..1eac84fd30 100644 --- a/dev/benchmarks/complex_layout/pubspec.yaml +++ b/dev/benchmarks/complex_layout/pubspec.yaml @@ -17,7 +17,7 @@ dev_dependencies: flutter_test: sdk: flutter - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/dev/benchmarks/microbenchmarks/pubspec.yaml b/dev/benchmarks/microbenchmarks/pubspec.yaml index dd00ddec9f..7c00d4c38f 100644 --- a/dev/benchmarks/microbenchmarks/pubspec.yaml +++ b/dev/benchmarks/microbenchmarks/pubspec.yaml @@ -9,7 +9,7 @@ dependencies: stocks: path: ../../../examples/stocks - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/dev/bots/pubspec.yaml b/dev/bots/pubspec.yaml index 4914df2748..89a5ee6154 100644 --- a/dev/bots/pubspec.yaml +++ b/dev/bots/pubspec.yaml @@ -3,7 +3,7 @@ description: Scripts which run on bots. dependencies: path: 1.5.1 - args: 0.13.7 + args: 1.2.0 process: 2.0.7 dev_dependencies: diff --git a/dev/bots/test.dart b/dev/bots/test.dart index 4e8863eeaa..839e08024f 100644 --- a/dev/bots/test.dart +++ b/dev/bots/test.dart @@ -210,7 +210,7 @@ Future _pubRunTest( final List args = ['run', 'test', '-j1', '-rexpanded']; if (testPath != null) args.add(testPath); - final Map pubEnvironment = {'DART_VM_OPTIONS': '--assert-initializer'}; + final Map pubEnvironment = {}; if (new Directory(pubCache).existsSync()) { pubEnvironment['PUB_CACHE'] = pubCache; } diff --git a/dev/devicelab/pubspec.yaml b/dev/devicelab/pubspec.yaml index fa2605466f..4a417de151 100644 --- a/dev/devicelab/pubspec.yaml +++ b/dev/devicelab/pubspec.yaml @@ -8,7 +8,7 @@ environment: sdk: '>=1.12.0 <2.0.0' dependencies: - args: 0.13.7 + args: 1.2.0 file: 2.3.5 image: 1.1.29 meta: 1.1.1 diff --git a/dev/integration_tests/channels/pubspec.yaml b/dev/integration_tests/channels/pubspec.yaml index cbd05b5f53..4a20980c1e 100644 --- a/dev/integration_tests/channels/pubspec.yaml +++ b/dev/integration_tests/channels/pubspec.yaml @@ -7,7 +7,7 @@ dependencies: flutter_driver: sdk: flutter - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/dev/integration_tests/external_ui/pubspec.yaml b/dev/integration_tests/external_ui/pubspec.yaml index e564cfdba9..3be7896ed4 100644 --- a/dev/integration_tests/external_ui/pubspec.yaml +++ b/dev/integration_tests/external_ui/pubspec.yaml @@ -7,7 +7,7 @@ dependencies: flutter_driver: sdk: flutter - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/dev/integration_tests/flavors/pubspec.yaml b/dev/integration_tests/flavors/pubspec.yaml index 4dba44a3b3..e63b63a1d0 100644 --- a/dev/integration_tests/flavors/pubspec.yaml +++ b/dev/integration_tests/flavors/pubspec.yaml @@ -7,7 +7,7 @@ dependencies: flutter_driver: sdk: flutter - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/dev/integration_tests/platform_interaction/pubspec.yaml b/dev/integration_tests/platform_interaction/pubspec.yaml index 7783339d23..1a5cb70af9 100644 --- a/dev/integration_tests/platform_interaction/pubspec.yaml +++ b/dev/integration_tests/platform_interaction/pubspec.yaml @@ -7,7 +7,7 @@ dependencies: flutter_driver: sdk: flutter - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/dev/integration_tests/ui/pubspec.yaml b/dev/integration_tests/ui/pubspec.yaml index 4d68e7a914..dfe1b630c5 100644 --- a/dev/integration_tests/ui/pubspec.yaml +++ b/dev/integration_tests/ui/pubspec.yaml @@ -14,7 +14,7 @@ dev_dependencies: test: 0.12.26 archive: 1.0.33 # TRANSITIVE DEPENDENCY - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/dev/manual_tests/pubspec.yaml b/dev/manual_tests/pubspec.yaml index 7b358df27d..dbfb00542f 100644 --- a/dev/manual_tests/pubspec.yaml +++ b/dev/manual_tests/pubspec.yaml @@ -8,7 +8,7 @@ dev_dependencies: flutter_test: sdk: flutter - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/dev/tools/pubspec.yaml b/dev/tools/pubspec.yaml index 0132ed09e3..4368104ab4 100644 --- a/dev/tools/pubspec.yaml +++ b/dev/tools/pubspec.yaml @@ -3,7 +3,7 @@ description: Various repository development tools for flutter. dependencies: archive: 1.0.33 - args: 0.13.7 + args: 1.2.0 http: 0.11.3+14 intl: 0.15.2 meta: 1.1.1 diff --git a/dev/tools/vitool/pubspec.yaml b/dev/tools/vitool/pubspec.yaml index 317ccdcc8a..58aa6e9bad 100644 --- a/dev/tools/vitool/pubspec.yaml +++ b/dev/tools/vitool/pubspec.yaml @@ -8,7 +8,7 @@ environment: sdk: '>=1.20.1 <2.0.0' dependencies: - args: 0.13.7 + args: 1.2.0 vector_math: 2.0.5 xml: 2.6.0 diff --git a/examples/catalog/pubspec.yaml b/examples/catalog/pubspec.yaml index 631dd12405..2f8f2be54c 100644 --- a/examples/catalog/pubspec.yaml +++ b/examples/catalog/pubspec.yaml @@ -11,7 +11,7 @@ dev_dependencies: flutter_driver: sdk: flutter - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/examples/flutter_gallery/pubspec.yaml b/examples/flutter_gallery/pubspec.yaml index 24e5121a58..856a3ad430 100644 --- a/examples/flutter_gallery/pubspec.yaml +++ b/examples/flutter_gallery/pubspec.yaml @@ -23,7 +23,7 @@ dev_dependencies: flutter_driver: sdk: flutter - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/examples/flutter_view/pubspec.yaml b/examples/flutter_view/pubspec.yaml index f443d5ddfa..bc26686fd0 100644 --- a/examples/flutter_view/pubspec.yaml +++ b/examples/flutter_view/pubspec.yaml @@ -5,7 +5,7 @@ dependencies: flutter: sdk: flutter - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/examples/hello_world/pubspec.yaml b/examples/hello_world/pubspec.yaml index e7ed336f3c..4f9df2abea 100644 --- a/examples/hello_world/pubspec.yaml +++ b/examples/hello_world/pubspec.yaml @@ -8,7 +8,7 @@ dev_dependencies: flutter_test: sdk: flutter - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/examples/layers/pubspec.yaml b/examples/layers/pubspec.yaml index ff6c71377a..2c073b4989 100644 --- a/examples/layers/pubspec.yaml +++ b/examples/layers/pubspec.yaml @@ -7,7 +7,7 @@ dev_dependencies: flutter_test: sdk: flutter - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/examples/platform_channel/pubspec.yaml b/examples/platform_channel/pubspec.yaml index e78f66f52f..aa4d7aafab 100644 --- a/examples/platform_channel/pubspec.yaml +++ b/examples/platform_channel/pubspec.yaml @@ -10,7 +10,7 @@ dev_dependencies: flutter_driver: sdk: flutter - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/examples/platform_channel_swift/pubspec.yaml b/examples/platform_channel_swift/pubspec.yaml index bf4e9756c5..cbee0e3d7f 100644 --- a/examples/platform_channel_swift/pubspec.yaml +++ b/examples/platform_channel_swift/pubspec.yaml @@ -10,7 +10,7 @@ dev_dependencies: flutter_driver: sdk: flutter - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/examples/platform_view/pubspec.yaml b/examples/platform_view/pubspec.yaml index 900797306d..1abff9aad6 100644 --- a/examples/platform_view/pubspec.yaml +++ b/examples/platform_view/pubspec.yaml @@ -4,7 +4,7 @@ dependencies: flutter: sdk: flutter - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/examples/stocks/pubspec.yaml b/examples/stocks/pubspec.yaml index dfafbedb91..a8b2d8db8e 100644 --- a/examples/stocks/pubspec.yaml +++ b/examples/stocks/pubspec.yaml @@ -15,7 +15,7 @@ dev_dependencies: flutter_driver: sdk: flutter - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/packages/flutter/lib/src/material/ink_ripple.dart b/packages/flutter/lib/src/material/ink_ripple.dart index abad5985d6..b762b508fc 100644 --- a/packages/flutter/lib/src/material/ink_ripple.dart +++ b/packages/flutter/lib/src/material/ink_ripple.dart @@ -20,8 +20,6 @@ const Duration _kCancelDuration = const Duration(milliseconds: 75); // The fade out begins 300ms after the _fadeOutController starts. See confirm(). const double _kFadeOutIntervalStart = 300.0 / 450.0; -const double _kRippleConfirmedVelocity = 1.0; // logical pixels per millisecond - RectCallback _getClipCallback(RenderBox referenceBox, bool containedInkWell, RectCallback rectCallback) { if (rectCallback != null) { assert(containedInkWell); diff --git a/packages/flutter/pubspec.yaml b/packages/flutter/pubspec.yaml index babcb146b1..6dcc35aa85 100644 --- a/packages/flutter/pubspec.yaml +++ b/packages/flutter/pubspec.yaml @@ -20,7 +20,7 @@ dev_dependencies: sdk: flutter mockito: 2.2.1 - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/packages/flutter_driver/pubspec.yaml b/packages/flutter_driver/pubspec.yaml index c2640f3678..a84d950a67 100644 --- a/packages/flutter_driver/pubspec.yaml +++ b/packages/flutter_driver/pubspec.yaml @@ -24,7 +24,7 @@ dev_dependencies: mockito: 2.2.1 quiver: 0.27.0 - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/packages/flutter_localizations/pubspec.yaml b/packages/flutter_localizations/pubspec.yaml index 2b66dd7483..decb66d0ff 100644 --- a/packages/flutter_localizations/pubspec.yaml +++ b/packages/flutter_localizations/pubspec.yaml @@ -12,7 +12,7 @@ dev_dependencies: sdk: flutter mockito: 2.2.1 - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/packages/flutter_test/pubspec.yaml b/packages/flutter_test/pubspec.yaml index 79ba19e60f..a6994ba2d4 100644 --- a/packages/flutter_test/pubspec.yaml +++ b/packages/flutter_test/pubspec.yaml @@ -25,7 +25,7 @@ dependencies: # Used by globalToLocal et al. vector_math: 2.0.5 - args: 0.13.7 # TRANSITIVE DEPENDENCY + args: 1.2.0 # TRANSITIVE DEPENDENCY async: 1.13.3 # TRANSITIVE DEPENDENCY barback: 0.15.2+14 # TRANSITIVE DEPENDENCY boolean_selector: 1.0.2 # TRANSITIVE DEPENDENCY diff --git a/packages/flutter_tools/README.md b/packages/flutter_tools/README.md index 69c330bc4c..3fe19e378d 100644 --- a/packages/flutter_tools/README.md +++ b/packages/flutter_tools/README.md @@ -6,5 +6,5 @@ To run the tests, ensure that no devices are connected, then navigate to `flutter_tools` and execute: ```shell -DART_VM_OPTIONS=--assert-initializer ../../bin/cache/dart-sdk/bin/pub run test +../../bin/cache/dart-sdk/bin/pub run test ``` diff --git a/packages/flutter_tools/lib/src/dart/sdk.dart b/packages/flutter_tools/lib/src/dart/sdk.dart index c8d6fe97a6..b0cd98492a 100644 --- a/packages/flutter_tools/lib/src/dart/sdk.dart +++ b/packages/flutter_tools/lib/src/dart/sdk.dart @@ -12,7 +12,7 @@ String get dartSdkPath { } /// The required Dart language flags -const List dartVmFlags = const ['--assert-initializer']; +const List dartVmFlags = const []; /// Return the platform specific name for the given Dart SDK binary. So, `pub` /// ==> `pub.bat`. The default SDK location can be overridden with a specified diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart index 33d3e54cff..569e57061c 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart @@ -4,6 +4,7 @@ import 'dart:async'; +import 'package:args/args.dart'; import 'package:args/command_runner.dart'; import 'package:meta/meta.dart'; import 'package:quiver/strings.dart'; @@ -61,6 +62,10 @@ class FlutterOptions { } abstract class FlutterCommand extends Command { + @override + ArgParser get argParser => _argParser; + final ArgParser _argParser = new ArgParser(allowTrailingOptions: false); + @override FlutterCommandRunner get runner => super.runner; diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart index eedd2d2466..38ddd965ce 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart @@ -122,6 +122,10 @@ class FlutterCommandRunner extends CommandRunner { '--record-to.'); } + @override + ArgParser get argParser => _argParser; + final ArgParser _argParser = new ArgParser(allowTrailingOptions: false); + @override String get usageFooter { return 'Run "flutter help -v" for verbose help output, including less commonly used options.'; diff --git a/packages/flutter_tools/pubspec.yaml b/packages/flutter_tools/pubspec.yaml index 94b6a548e6..2dd66de854 100644 --- a/packages/flutter_tools/pubspec.yaml +++ b/packages/flutter_tools/pubspec.yaml @@ -9,9 +9,9 @@ environment: dependencies: # To update these, use "flutter update-packages --force-upgrade". archive: 1.0.33 - args: 0.13.7 + args: 1.2.0 cli_util: 0.1.2+1 - coverage: 0.9.3 + coverage: 0.10.0 crypto: 2.0.2+1 file: 2.3.5 http: 0.11.3+14