From 5482d9a4cb2d172dadb767888be978493675b987 Mon Sep 17 00:00:00 2001 From: Amir Hardon Date: Wed, 16 Dec 2020 11:33:04 -0800 Subject: [PATCH] Remove custom null safety analysis_options files (#3339) --- .../connectivity/analysis_options.yaml | 4 ---- .../connectivity/example/pubspec.yaml | 2 +- .../test_driver/test/integration_test.dart | 4 ++++ .../analysis_options.yaml | 4 ---- .../device_info/analysis_options.yaml | 4 ---- .../analysis_options.yaml | 4 ---- .../analysis_options.yaml | 4 ---- .../ios/Runner.xcodeproj/project.pbxproj | 19 ------------------- .../url_launcher/analysis_options.yaml | 4 ---- .../url_launcher/example/pubspec.yaml | 2 +- .../analysis_options.yaml | 4 ---- .../video_player/analysis_options.yaml | 4 ---- .../integration_test/video_player_test.dart | 7 ++++++- .../video_player/example/pubspec.yaml | 2 +- .../analysis_options.yaml | 4 ---- .../video_player_web/analysis_options.yaml | 12 ------------ script/incremental_build.sh | 11 +---------- 17 files changed, 14 insertions(+), 81 deletions(-) delete mode 100644 packages/connectivity/connectivity/analysis_options.yaml delete mode 100644 packages/connectivity/connectivity_platform_interface/analysis_options.yaml delete mode 100644 packages/device_info/device_info/analysis_options.yaml delete mode 100644 packages/device_info/device_info_platform_interface/analysis_options.yaml delete mode 100644 packages/plugin_platform_interface/analysis_options.yaml delete mode 100644 packages/url_launcher/url_launcher/analysis_options.yaml delete mode 100644 packages/url_launcher/url_launcher_platform_interface/analysis_options.yaml delete mode 100644 packages/video_player/video_player/analysis_options.yaml delete mode 100644 packages/video_player/video_player_platform_interface/analysis_options.yaml delete mode 100644 packages/video_player/video_player_web/analysis_options.yaml diff --git a/packages/connectivity/connectivity/analysis_options.yaml b/packages/connectivity/connectivity/analysis_options.yaml deleted file mode 100644 index 3d64bb57fe49d5..00000000000000 --- a/packages/connectivity/connectivity/analysis_options.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: ../../../analysis_options.yaml -analyzer: - enable-experiment: - - non-nullable diff --git a/packages/connectivity/connectivity/example/pubspec.yaml b/packages/connectivity/connectivity/example/pubspec.yaml index 94c8505c80960a..682f0a2dd08a3d 100644 --- a/packages/connectivity/connectivity/example/pubspec.yaml +++ b/packages/connectivity/connectivity/example/pubspec.yaml @@ -19,5 +19,5 @@ flutter: uses-material-design: true environment: - sdk: ">=2.1.0 <3.0.0" + sdk: ">=2.12.0-0 <3.0.0" flutter: ">=1.12.13+hotfix.5 <2.0.0" diff --git a/packages/connectivity/connectivity/example/test_driver/test/integration_test.dart b/packages/connectivity/connectivity/example/test_driver/test/integration_test.dart index c0cbdcab2fb676..33421c335bdd20 100644 --- a/packages/connectivity/connectivity/example/test_driver/test/integration_test.dart +++ b/packages/connectivity/connectivity/example/test_driver/test/integration_test.dart @@ -2,6 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// TODO(amirh): Remove this once flutter_driver supports null safety. +// https://github.com/flutter/flutter/issues/71379 +// @dart = 2.9 + import 'dart:convert'; import 'dart:io'; import 'package:flutter_driver/flutter_driver.dart'; diff --git a/packages/connectivity/connectivity_platform_interface/analysis_options.yaml b/packages/connectivity/connectivity_platform_interface/analysis_options.yaml deleted file mode 100644 index 3d64bb57fe49d5..00000000000000 --- a/packages/connectivity/connectivity_platform_interface/analysis_options.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: ../../../analysis_options.yaml -analyzer: - enable-experiment: - - non-nullable diff --git a/packages/device_info/device_info/analysis_options.yaml b/packages/device_info/device_info/analysis_options.yaml deleted file mode 100644 index 3d64bb57fe49d5..00000000000000 --- a/packages/device_info/device_info/analysis_options.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: ../../../analysis_options.yaml -analyzer: - enable-experiment: - - non-nullable diff --git a/packages/device_info/device_info_platform_interface/analysis_options.yaml b/packages/device_info/device_info_platform_interface/analysis_options.yaml deleted file mode 100644 index 3d64bb57fe49d5..00000000000000 --- a/packages/device_info/device_info_platform_interface/analysis_options.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: ../../../analysis_options.yaml -analyzer: - enable-experiment: - - non-nullable diff --git a/packages/plugin_platform_interface/analysis_options.yaml b/packages/plugin_platform_interface/analysis_options.yaml deleted file mode 100644 index f4819cd5c31360..00000000000000 --- a/packages/plugin_platform_interface/analysis_options.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: ../../analysis_options.yaml -analyzer: - enable-experiment: - - non-nullable diff --git a/packages/share/example/ios/Runner.xcodeproj/project.pbxproj b/packages/share/example/ios/Runner.xcodeproj/project.pbxproj index 639666b2865c8f..d03ef3e6577612 100644 --- a/packages/share/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/share/example/ios/Runner.xcodeproj/project.pbxproj @@ -197,7 +197,6 @@ 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 12A149CFB1B2610A83692801 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -268,24 +267,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 12A149CFB1B2610A83692801 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${PODS_ROOT}/../Flutter/Flutter.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/packages/url_launcher/url_launcher/analysis_options.yaml b/packages/url_launcher/url_launcher/analysis_options.yaml deleted file mode 100644 index 3d64bb57fe49d5..00000000000000 --- a/packages/url_launcher/url_launcher/analysis_options.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: ../../../analysis_options.yaml -analyzer: - enable-experiment: - - non-nullable diff --git a/packages/url_launcher/url_launcher/example/pubspec.yaml b/packages/url_launcher/url_launcher/example/pubspec.yaml index 1fdb73cef66603..7caea27744db5e 100644 --- a/packages/url_launcher/url_launcher/example/pubspec.yaml +++ b/packages/url_launcher/url_launcher/example/pubspec.yaml @@ -20,5 +20,5 @@ flutter: uses-material-design: true environment: - sdk: ">=2.1.0 <3.0.0" + sdk: ">=2.12.0-0 <3.0.0" flutter: ">=1.12.13+hotfix.5 <2.0.0" diff --git a/packages/url_launcher/url_launcher_platform_interface/analysis_options.yaml b/packages/url_launcher/url_launcher_platform_interface/analysis_options.yaml deleted file mode 100644 index 3d64bb57fe49d5..00000000000000 --- a/packages/url_launcher/url_launcher_platform_interface/analysis_options.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: ../../../analysis_options.yaml -analyzer: - enable-experiment: - - non-nullable diff --git a/packages/video_player/video_player/analysis_options.yaml b/packages/video_player/video_player/analysis_options.yaml deleted file mode 100644 index 3d64bb57fe49d5..00000000000000 --- a/packages/video_player/video_player/analysis_options.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: ../../../analysis_options.yaml -analyzer: - enable-experiment: - - non-nullable diff --git a/packages/video_player/video_player/example/integration_test/video_player_test.dart b/packages/video_player/video_player/example/integration_test/video_player_test.dart index d2f38367ce9a3c..7ef1cf64065c4e 100644 --- a/packages/video_player/video_player/example/integration_test/video_player_test.dart +++ b/packages/video_player/video_player/example/integration_test/video_player_test.dart @@ -2,6 +2,11 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. + +// TODO(amirh): Remove this once flutter_driver supports null safety. +// https://github.com/flutter/flutter/issues/71379 +// @dart = 2.9 + import 'package:flutter/material.dart'; import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -11,7 +16,7 @@ const Duration _playDuration = Duration(seconds: 1); void main() { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); - late VideoPlayerController _controller; + VideoPlayerController _controller; tearDown(() async => _controller.dispose()); group('asset videos', () { diff --git a/packages/video_player/video_player/example/pubspec.yaml b/packages/video_player/video_player/example/pubspec.yaml index 6cfa93213afb96..fb18d8b75efad4 100644 --- a/packages/video_player/video_player/example/pubspec.yaml +++ b/packages/video_player/video_player/example/pubspec.yaml @@ -27,5 +27,5 @@ flutter: - assets/bumble_bee_captions.srt environment: - sdk: ">=2.8.0 <3.0.0" + sdk: ">=2.12.0-0 <3.0.0" flutter: ">=1.12.13+hotfix.5 <2.0.0" diff --git a/packages/video_player/video_player_platform_interface/analysis_options.yaml b/packages/video_player/video_player_platform_interface/analysis_options.yaml deleted file mode 100644 index 3d64bb57fe49d5..00000000000000 --- a/packages/video_player/video_player_platform_interface/analysis_options.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: ../../../analysis_options.yaml -analyzer: - enable-experiment: - - non-nullable diff --git a/packages/video_player/video_player_web/analysis_options.yaml b/packages/video_player/video_player_web/analysis_options.yaml deleted file mode 100644 index 7e5b7b306a83ab..00000000000000 --- a/packages/video_player/video_player_web/analysis_options.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# This is a temporary file to allow us to unblock the flutter/plugins repo CI. -# It disables some of lints that were disabled inline. Disabling lints inline -# is no longer possible, so this file is required. -# TODO(ditman) https://github.com/flutter/flutter/issues/55000 (clean this up) - -include: ../../../analysis_options.yaml - -analyzer: - enable-experiment: - - non-nullable - errors: - undefined_prefixed_name: ignore diff --git a/script/incremental_build.sh b/script/incremental_build.sh index 95e42c4cfceeb4..f54f90b0669c1b 100755 --- a/script/incremental_build.sh +++ b/script/incremental_build.sh @@ -29,17 +29,8 @@ fi # # TODO(mklim): Remove everything from this list. https://github.com/flutter/flutter/issues/45440 CUSTOM_ANALYSIS_PLUGINS=( - "plugin_platform_interface" - "video_player/video_player" - "video_player/video_player_platform_interface" - "video_player/video_player_web" - "url_launcher/url_launcher_platform_interface" - "url_launcher/url_launcher" - "device_info/device_info_platform_interface" - "device_info/device_info" - "connectivity/connectivity_platform_interface" - "connectivity/connectivity" ) + # Comma-separated string of the list above readonly CUSTOM_FLAG=$(IFS=, ; echo "${CUSTOM_ANALYSIS_PLUGINS[*]}") # Set some default actions if run without arguments.