Roll Dart SDK to 2.0.0-dev.16.0, along with associated package updates (#13857)
Rolling the Dart SDK to 2.0, with associated package updates.
https://groups.google.com/forum/#!topic/flutter-dev/E22RdKAYjs8
diff --git a/analysis_options_repo.yaml b/analysis_options_repo.yaml
index 594bb19..aee5b8f 100644
--- a/analysis_options_repo.yaml
+++ b/analysis_options_repo.yaml
@@ -22,7 +22,6 @@
language:
enableStrictCallChecks: true
enableSuperMixins: true
- enableAssertInitializer: true
strong-mode:
implicit-dynamic: false
errors:
diff --git a/bin/flutter b/bin/flutter
index 4fe4802..d068fcb 100755
--- a/bin/flutter
+++ b/bin/flutter
@@ -130,7 +130,6 @@
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 ce317cd..3240522 100644
--- a/bin/flutter.bat
+++ b/bin/flutter.bat
@@ -40,7 +40,6 @@
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 9067cce..f9f88f7 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 5fbb2c3..7371fcf 100644
--- a/dev/automated_tests/pubspec.yaml
+++ b/dev/automated_tests/pubspec.yaml
@@ -5,7 +5,7 @@
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 136922a..1eac84f 100644
--- a/dev/benchmarks/complex_layout/pubspec.yaml
+++ b/dev/benchmarks/complex_layout/pubspec.yaml
@@ -17,7 +17,7 @@
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 dd00dde..7c00d4c 100644
--- a/dev/benchmarks/microbenchmarks/pubspec.yaml
+++ b/dev/benchmarks/microbenchmarks/pubspec.yaml
@@ -9,7 +9,7 @@
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 4914df2..89a5ee6 100644
--- a/dev/bots/pubspec.yaml
+++ b/dev/bots/pubspec.yaml
@@ -3,7 +3,7 @@
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 4e8863e..839e080 100644
--- a/dev/bots/test.dart
+++ b/dev/bots/test.dart
@@ -210,7 +210,7 @@
final List<String> args = <String>['run', 'test', '-j1', '-rexpanded'];
if (testPath != null)
args.add(testPath);
- final Map<String, String> pubEnvironment = <String, String>{'DART_VM_OPTIONS': '--assert-initializer'};
+ final Map<String, String> pubEnvironment = <String, String>{};
if (new Directory(pubCache).existsSync()) {
pubEnvironment['PUB_CACHE'] = pubCache;
}
diff --git a/dev/devicelab/pubspec.yaml b/dev/devicelab/pubspec.yaml
index fa26054..4a417de 100644
--- a/dev/devicelab/pubspec.yaml
+++ b/dev/devicelab/pubspec.yaml
@@ -8,7 +8,7 @@
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 cbd05b5..4a20980 100644
--- a/dev/integration_tests/channels/pubspec.yaml
+++ b/dev/integration_tests/channels/pubspec.yaml
@@ -7,7 +7,7 @@
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 e564cfd..3be7896 100644
--- a/dev/integration_tests/external_ui/pubspec.yaml
+++ b/dev/integration_tests/external_ui/pubspec.yaml
@@ -7,7 +7,7 @@
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 4dba44a..e63b63a 100644
--- a/dev/integration_tests/flavors/pubspec.yaml
+++ b/dev/integration_tests/flavors/pubspec.yaml
@@ -7,7 +7,7 @@
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 7783339..1a5cb70 100644
--- a/dev/integration_tests/platform_interaction/pubspec.yaml
+++ b/dev/integration_tests/platform_interaction/pubspec.yaml
@@ -7,7 +7,7 @@
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 4d68e7a..dfe1b63 100644
--- a/dev/integration_tests/ui/pubspec.yaml
+++ b/dev/integration_tests/ui/pubspec.yaml
@@ -14,7 +14,7 @@
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 7b358df..dbfb005 100644
--- a/dev/manual_tests/pubspec.yaml
+++ b/dev/manual_tests/pubspec.yaml
@@ -8,7 +8,7 @@
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 0132ed0..4368104 100644
--- a/dev/tools/pubspec.yaml
+++ b/dev/tools/pubspec.yaml
@@ -3,7 +3,7 @@
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 317ccdc..58aa6e9 100644
--- a/dev/tools/vitool/pubspec.yaml
+++ b/dev/tools/vitool/pubspec.yaml
@@ -8,7 +8,7 @@
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 631dd12..2f8f2be 100644
--- a/examples/catalog/pubspec.yaml
+++ b/examples/catalog/pubspec.yaml
@@ -11,7 +11,7 @@
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 24e5121..856a3ad 100644
--- a/examples/flutter_gallery/pubspec.yaml
+++ b/examples/flutter_gallery/pubspec.yaml
@@ -23,7 +23,7 @@
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 f443d5d..bc26686 100644
--- a/examples/flutter_view/pubspec.yaml
+++ b/examples/flutter_view/pubspec.yaml
@@ -5,7 +5,7 @@
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 e7ed336..4f9df2a 100644
--- a/examples/hello_world/pubspec.yaml
+++ b/examples/hello_world/pubspec.yaml
@@ -8,7 +8,7 @@
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 ff6c713..2c073b4 100644
--- a/examples/layers/pubspec.yaml
+++ b/examples/layers/pubspec.yaml
@@ -7,7 +7,7 @@
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 e78f66f..aa4d7aa 100644
--- a/examples/platform_channel/pubspec.yaml
+++ b/examples/platform_channel/pubspec.yaml
@@ -10,7 +10,7 @@
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 bf4e975..cbee0e3 100644
--- a/examples/platform_channel_swift/pubspec.yaml
+++ b/examples/platform_channel_swift/pubspec.yaml
@@ -10,7 +10,7 @@
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 9007973..1abff9a 100644
--- a/examples/platform_view/pubspec.yaml
+++ b/examples/platform_view/pubspec.yaml
@@ -4,7 +4,7 @@
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 dfafbed..a8b2d8d 100644
--- a/examples/stocks/pubspec.yaml
+++ b/examples/stocks/pubspec.yaml
@@ -15,7 +15,7 @@
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 abad598..b762b50 100644
--- a/packages/flutter/lib/src/material/ink_ripple.dart
+++ b/packages/flutter/lib/src/material/ink_ripple.dart
@@ -20,8 +20,6 @@
// 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 babcb14..6dcc35a 100644
--- a/packages/flutter/pubspec.yaml
+++ b/packages/flutter/pubspec.yaml
@@ -20,7 +20,7 @@
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 c2640f3..a84d950 100644
--- a/packages/flutter_driver/pubspec.yaml
+++ b/packages/flutter_driver/pubspec.yaml
@@ -24,7 +24,7 @@
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 2b66dd7..decb66d 100644
--- a/packages/flutter_localizations/pubspec.yaml
+++ b/packages/flutter_localizations/pubspec.yaml
@@ -12,7 +12,7 @@
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 79ba19e..a6994ba 100644
--- a/packages/flutter_test/pubspec.yaml
+++ b/packages/flutter_test/pubspec.yaml
@@ -25,7 +25,7 @@
# 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 69c330b..3fe19e3 100644
--- a/packages/flutter_tools/README.md
+++ b/packages/flutter_tools/README.md
@@ -6,5 +6,5 @@
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 c8d6fe9..b0cd984 100644
--- a/packages/flutter_tools/lib/src/dart/sdk.dart
+++ b/packages/flutter_tools/lib/src/dart/sdk.dart
@@ -12,7 +12,7 @@
}
/// The required Dart language flags
-const List<String> dartVmFlags = const <String>['--assert-initializer'];
+const List<String> dartVmFlags = const <String>[];
/// 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 33d3e54..569e570 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';
@@ -62,6 +63,10 @@
abstract class FlutterCommand extends Command<Null> {
@override
+ ArgParser get argParser => _argParser;
+ final ArgParser _argParser = new ArgParser(allowTrailingOptions: false);
+
+ @override
FlutterCommandRunner get runner => super.runner;
bool _requiresPubspecYaml = false;
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 eedd2d2..38ddd96 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
@@ -123,6 +123,10 @@
}
@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 94b6a54..2dd66de 100644
--- a/packages/flutter_tools/pubspec.yaml
+++ b/packages/flutter_tools/pubspec.yaml
@@ -9,9 +9,9 @@
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
