diff --git a/packages/connectivity/connectivity/analysis_options.yaml b/packages/connectivity/connectivity/analysis_options.yaml deleted file mode 100644 index 3d64bb57fe49..000000000000 --- 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 94c8505c8096..682f0a2dd08a 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 c0cbdcab2fb6..33421c335bdd 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 3d64bb57fe49..000000000000 --- 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 3d64bb57fe49..000000000000 --- 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 3d64bb57fe49..000000000000 --- 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 f4819cd5c313..000000000000 --- 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 639666b2865c..d03ef3e65776 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 3d64bb57fe49..000000000000 --- 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 1fdb73cef666..7caea27744db 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 3d64bb57fe49..000000000000 --- 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 3d64bb57fe49..000000000000 --- 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 4fb89a7cec22..7ef1cf64065c 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,12 +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 'dart:async'; -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -17,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', () { @@ -35,58 +34,10 @@ void main() { const Duration(seconds: 7, milliseconds: 540)); }); - testWidgets( - 'reports buffering status', - (WidgetTester tester) async { - VideoPlayerController networkController = VideoPlayerController.network( - 'https://flutter.github.io/assets-for-api-docs/assets/videos/bee.mp4', - ); - await networkController.initialize(); - // Mute to allow playing without DOM interaction on Web. - // See https://developers.google.com/web/updates/2017/09/autoplay-policy-changes - await networkController.setVolume(0); - final Completer started = Completer(); - final Completer ended = Completer(); - bool startedBuffering = false; - bool endedBuffering = false; - networkController.addListener(() { - if (networkController.value.isBuffering && !startedBuffering) { - startedBuffering = true; - started.complete(); - } - if (startedBuffering && - !networkController.value.isBuffering && - !endedBuffering) { - endedBuffering = true; - ended.complete(); - } - }); - - await networkController.play(); - await networkController.seekTo(const Duration(seconds: 5)); - await tester.pumpAndSettle(_playDuration); - await networkController.pause(); - - expect(networkController.value.isPlaying, false); - expect(networkController.value.position, - (Duration position) => position > const Duration(seconds: 0)); - - await started; - expect(startedBuffering, true); - - await ended; - expect(endedBuffering, true); - }, - skip: !(kIsWeb || defaultTargetPlatform == TargetPlatform.android), - ); - testWidgets( 'can be played', (WidgetTester tester) async { await _controller.initialize(); - // Mute to allow playing without DOM interaction on Web. - // See https://developers.google.com/web/updates/2017/09/autoplay-policy-changes - await _controller.setVolume(0); await _controller.play(); await tester.pumpAndSettle(_playDuration); @@ -112,9 +63,6 @@ void main() { 'can be paused', (WidgetTester tester) async { await _controller.initialize(); - // Mute to allow playing without DOM interaction on Web. - // See https://developers.google.com/web/updates/2017/09/autoplay-policy-changes - await _controller.setVolume(0); // Play for a second, then pause, and then wait a second. await _controller.play(); @@ -161,6 +109,6 @@ void main() { await tester.pumpAndSettle(); expect(_controller.value.isPlaying, true); - }, skip: kIsWeb); // Web does not support local assets. + }); }); } diff --git a/packages/video_player/video_player/example/pubspec.yaml b/packages/video_player/video_player/example/pubspec.yaml index 6cfa93213afb..fb18d8b75efa 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 3d64bb57fe49..000000000000 --- 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 7e5b7b306a83..000000000000 --- 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 95e42c4cfcee..f54f90b0669c 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.