From b3f22d072efeb01cb1a743b2baaa101c0b5663ce Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Wed, 30 Dec 2020 02:26:25 +0000 Subject: [PATCH] [Observatory] Switch to Dart 2.12 and remove redundant experiment TEST=None Change-Id: I16bf33a6fc78c7bdcd32b376919b348922777b47 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/176880 Commit-Queue: Ben Konyi Reviewed-by: Ben Konyi --- runtime/observatory/BUILD.gn | 1 - runtime/observatory/analysis_options.yaml | 3 --- runtime/observatory/pubspec.yaml | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/runtime/observatory/BUILD.gn b/runtime/observatory/BUILD.gn index 360863ccd09..022498ecbae 100644 --- a/runtime/observatory/BUILD.gn +++ b/runtime/observatory/BUILD.gn @@ -37,7 +37,6 @@ prebuilt_dart2js_action("build_observatory") { "-o", rebase_path(output), "--packages=" + rebase_path("../../.packages"), - "--enable-experiment=non-nullable", "--no-sound-null-safety", ] if (is_debug) { diff --git a/runtime/observatory/analysis_options.yaml b/runtime/observatory/analysis_options.yaml index f9cf4b3139c..e579874bf6a 100644 --- a/runtime/observatory/analysis_options.yaml +++ b/runtime/observatory/analysis_options.yaml @@ -1,7 +1,4 @@ analyzer: - enable-experiment: - - non-nullable - errors: dead_code: info getter_not_subtype_setter_types: info diff --git a/runtime/observatory/pubspec.yaml b/runtime/observatory/pubspec.yaml index ba282ab2f93..ddf5b9c3d96 100644 --- a/runtime/observatory/pubspec.yaml +++ b/runtime/observatory/pubspec.yaml @@ -1,6 +1,6 @@ name: observatory environment: - sdk: '>=2.10.0 <3.0.0' + sdk: '>=2.12.0-0 <3.0.0' dependencies: usage: 'any'