From 6fe800abd5c1c490e17499d939d1eef940f8f65d Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Thu, 5 Nov 2020 23:58:11 -0800 Subject: [PATCH] [null-safety] remove enable experiment flags (#69930) --- dev/bots/test.dart | 13 +++---------- .../non_nullable/analysis_options.yaml | 6 ------ dev/integration_tests/non_nullable/lib/main.dart | 1 - dev/integration_tests/non_nullable/pubspec.yaml | 2 +- .../non_nullable/test/test_test.dart | 2 +- dev/integration_tests/web/lib/null_assert_main.dart | 2 +- dev/integration_tests/web/lib/null_enabled_api.dart | 2 +- dev/integration_tests/web/lib/null_safe_main.dart | 2 +- dev/integration_tests/web/lib/sound_mode.dart | 2 +- examples/layers/analysis_options.yaml | 2 -- examples/layers/pubspec.yaml | 2 +- packages/flutter/analysis_options.yaml | 2 -- packages/flutter/test_private/pubspec.yaml | 3 +-- packages/flutter/test_private/test/pubspec.yaml | 2 +- packages/flutter_driver/analysis_options.yaml | 2 -- packages/flutter_test/analysis_options.yaml | 2 -- 16 files changed, 12 insertions(+), 35 deletions(-) delete mode 100644 dev/integration_tests/non_nullable/analysis_options.yaml diff --git a/dev/bots/test.dart b/dev/bots/test.dart index 304e411c8e..7130721b99 100644 --- a/dev/bots/test.dart +++ b/dev/bots/test.dart @@ -383,7 +383,7 @@ Future _runExampleProjectBuildTests(FileSystemEntity exampleDirectory) asy final String examplePath = exampleDirectory.path; final bool hasNullSafety = File(path.join(examplePath, 'null_safety')).existsSync(); final List additionalArgs = hasNullSafety - ? ['--enable-experiment', 'non-nullable', '--no-sound-null-safety'] + ? ['--no-sound-null-safety'] : []; if (Directory(path.join(examplePath, 'android')).existsSync()) { await _flutterBuildApk(examplePath, release: false, additionalArgs: additionalArgs, verifyCaching: verifyCaching); @@ -589,8 +589,8 @@ Future _runAddToAppLifeCycleTests() async { Future _runFrameworkTests() async { final bq.BigqueryApi bigqueryApi = await _getBigqueryApi(); - final List soundNullSafetyOptions = ['--enable-experiment=non-nullable', '--null-assertions', '--sound-null-safety']; - final List mixedModeNullSafetyOptions = ['--enable-experiment=non-nullable', '--null-assertions', '--no-sound-null-safety']; + final List soundNullSafetyOptions = ['--null-assertions', '--sound-null-safety']; + final List mixedModeNullSafetyOptions = ['--null-assertions', '--no-sound-null-safety']; final List trackWidgetCreationAlternatives = ['--track-widget-creation', '--no-track-widget-creation']; Future runWidgets() async { @@ -634,7 +634,6 @@ Future _runFrameworkTests() async { Future runPrivateTests() async { final List args = [ 'run', - '--enable-experiment=non-nullable', '--sound-null-safety', 'test_private.dart', ]; @@ -938,13 +937,9 @@ Future _runWebIntegrationTests() async { ] ); await _runWebDebugTest('lib/sound_mode.dart', additionalArguments: [ - '--enable-experiment', - 'non-nullable', '--sound-null-safety', ]); await _runWebReleaseTest('lib/sound_mode.dart', additionalArguments: [ - '--enable-experiment', - 'non-nullable', '--sound-null-safety', ]); } @@ -1049,8 +1044,6 @@ Future _runWebDebugTest(String target, { '--debug', if (enableNullSafety) ...[ - '--enable-experiment', - 'non-nullable', '--no-sound-null-safety', '--null-assertions', ], diff --git a/dev/integration_tests/non_nullable/analysis_options.yaml b/dev/integration_tests/non_nullable/analysis_options.yaml deleted file mode 100644 index 6bfd4556b2..0000000000 --- a/dev/integration_tests/non_nullable/analysis_options.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# Exclude lib/main.dart to avoid warnings about the non_nullable -# experiment before it is enabled. -analyzer: - exclude: - - lib/main.dart - - test/test_test.dart diff --git a/dev/integration_tests/non_nullable/lib/main.dart b/dev/integration_tests/non_nullable/lib/main.dart index 6e0fb3ac9b..fff4692898 100644 --- a/dev/integration_tests/non_nullable/lib/main.dart +++ b/dev/integration_tests/non_nullable/lib/main.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart=2.10 import 'package:flutter/material.dart'; String? unused; diff --git a/dev/integration_tests/non_nullable/pubspec.yaml b/dev/integration_tests/non_nullable/pubspec.yaml index 36e613c62e..2405fcd1c9 100644 --- a/dev/integration_tests/non_nullable/pubspec.yaml +++ b/dev/integration_tests/non_nullable/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ">=2.7.0 <3.0.0" + sdk: ">=2.12.0-0 <3.0.0" dependencies: flutter: diff --git a/dev/integration_tests/non_nullable/test/test_test.dart b/dev/integration_tests/non_nullable/test/test_test.dart index a6f74118e0..9e262993cc 100644 --- a/dev/integration_tests/non_nullable/test/test_test.dart +++ b/dev/integration_tests/non_nullable/test/test_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart=2.8 +// @dart = 2.8 import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/dev/integration_tests/web/lib/null_assert_main.dart b/dev/integration_tests/web/lib/null_assert_main.dart index 134720cd73..80c0a38bba 100644 --- a/dev/integration_tests/web/lib/null_assert_main.dart +++ b/dev/integration_tests/web/lib/null_assert_main.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart=2.8 +// @dart = 2.8 import 'null_enabled_api.dart'; diff --git a/dev/integration_tests/web/lib/null_enabled_api.dart b/dev/integration_tests/web/lib/null_enabled_api.dart index 633dac7330..c0fc0b6556 100644 --- a/dev/integration_tests/web/lib/null_enabled_api.dart +++ b/dev/integration_tests/web/lib/null_enabled_api.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart=2.10 +// @dart = 2.12 void methodThatAcceptsNonNull(int x) { print(x + 2); diff --git a/dev/integration_tests/web/lib/null_safe_main.dart b/dev/integration_tests/web/lib/null_safe_main.dart index d5be80de26..a5b6068054 100644 --- a/dev/integration_tests/web/lib/null_safe_main.dart +++ b/dev/integration_tests/web/lib/null_safe_main.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart=2.10 +// @dart = 2.12 String? x; diff --git a/dev/integration_tests/web/lib/sound_mode.dart b/dev/integration_tests/web/lib/sound_mode.dart index a507692f5a..1875c9ad70 100644 --- a/dev/integration_tests/web/lib/sound_mode.dart +++ b/dev/integration_tests/web/lib/sound_mode.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart=2.10 +// @dart = 2.12 import 'dart:html' as html; diff --git a/examples/layers/analysis_options.yaml b/examples/layers/analysis_options.yaml index 03733cd330..0620babbbb 100644 --- a/examples/layers/analysis_options.yaml +++ b/examples/layers/analysis_options.yaml @@ -3,8 +3,6 @@ include: ../../analysis_options.yaml analyzer: - enable-experiment: - - non-nullable errors: always_require_non_null_named_parameters: false # not needed with nnbd type_init_formals: false # https://github.com/dart-lang/linter/issues/2192 diff --git a/examples/layers/pubspec.yaml b/examples/layers/pubspec.yaml index 92c90df923..a1b0858c8c 100644 --- a/examples/layers/pubspec.yaml +++ b/examples/layers/pubspec.yaml @@ -2,7 +2,7 @@ name: flutter_examples_layers environment: # The pub client defaults to an <2.0.0 sdk constraint which we need to explicitly overwrite. - sdk: ">=2.10.0-0.0.dev <3.0.0" + sdk: ">=2.12.0-0 <3.0.0" dependencies: flutter: diff --git a/packages/flutter/analysis_options.yaml b/packages/flutter/analysis_options.yaml index a368eea79d..eb8a8500b7 100644 --- a/packages/flutter/analysis_options.yaml +++ b/packages/flutter/analysis_options.yaml @@ -3,8 +3,6 @@ include: ../analysis_options.yaml analyzer: - enable-experiment: - - non-nullable errors: always_require_non_null_named_parameters: false # not needed with nnbd type_init_formals: false # https://github.com/dart-lang/linter/issues/2192 diff --git a/packages/flutter/test_private/pubspec.yaml b/packages/flutter/test_private/pubspec.yaml index e06718e217..52cac24fa4 100644 --- a/packages/flutter/test_private/pubspec.yaml +++ b/packages/flutter/test_private/pubspec.yaml @@ -4,7 +4,7 @@ description: Tests private interfaces of the flutter environment: # The pub client defaults to an <2.0.0 sdk constraint which we need to explicitly overwrite. - sdk: ">=2.10.0-0.0.dev <3.0.0" + sdk: ">=2.12.0-0 <3.0.0" dependencies: # To update these, use "flutter update-packages --force-upgrade". @@ -18,6 +18,5 @@ dependencies: file: 6.0.0-nullsafety.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" platform: 3.0.0-nullsafety.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -dev_dependencies: # PUBSPEC CHECKSUM: b421 diff --git a/packages/flutter/test_private/test/pubspec.yaml b/packages/flutter/test_private/test/pubspec.yaml index bcbdd32f78..e53e601302 100644 --- a/packages/flutter/test_private/test/pubspec.yaml +++ b/packages/flutter/test_private/test/pubspec.yaml @@ -3,7 +3,7 @@ author: Flutter Authors environment: # The pub client defaults to an <2.0.0 sdk constraint which we need to explicitly overwrite. - sdk: ">=2.10.0-0.0.dev <3.0.0" + sdk: ">=2.12.0-0 <3.0.0" dependencies: # To update these, use "flutter update-packages --force-upgrade". diff --git a/packages/flutter_driver/analysis_options.yaml b/packages/flutter_driver/analysis_options.yaml index a368eea79d..eb8a8500b7 100644 --- a/packages/flutter_driver/analysis_options.yaml +++ b/packages/flutter_driver/analysis_options.yaml @@ -3,8 +3,6 @@ include: ../analysis_options.yaml analyzer: - enable-experiment: - - non-nullable errors: always_require_non_null_named_parameters: false # not needed with nnbd type_init_formals: false # https://github.com/dart-lang/linter/issues/2192 diff --git a/packages/flutter_test/analysis_options.yaml b/packages/flutter_test/analysis_options.yaml index 9adc519955..0125e40fd3 100644 --- a/packages/flutter_test/analysis_options.yaml +++ b/packages/flutter_test/analysis_options.yaml @@ -3,8 +3,6 @@ include: ../analysis_options.yaml analyzer: - enable-experiment: - - non-nullable errors: always_require_non_null_named_parameters: false # not needed with nnbd unrelated_type_equality_checks: false # https://github.com/dart-lang/linter/issues/2196