Skip to content

Commit 5482d9a

Browse files
authored
Remove custom null safety analysis_options files (flutter#3339)
1 parent aa8fcb4 commit 5482d9a

File tree

17 files changed

+14
-81
lines changed

17 files changed

+14
-81
lines changed

packages/connectivity/connectivity/analysis_options.yaml

-4
This file was deleted.

packages/connectivity/connectivity/example/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ flutter:
1919
uses-material-design: true
2020

2121
environment:
22-
sdk: ">=2.1.0 <3.0.0"
22+
sdk: ">=2.12.0-0 <3.0.0"
2323
flutter: ">=1.12.13+hotfix.5 <2.0.0"

packages/connectivity/connectivity/example/test_driver/test/integration_test.dart

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
// TODO(amirh): Remove this once flutter_driver supports null safety.
6+
// https://github.com/flutter/flutter/issues/71379
7+
// @dart = 2.9
8+
59
import 'dart:convert';
610
import 'dart:io';
711
import 'package:flutter_driver/flutter_driver.dart';

packages/connectivity/connectivity_platform_interface/analysis_options.yaml

-4
This file was deleted.

packages/device_info/device_info/analysis_options.yaml

-4
This file was deleted.

packages/device_info/device_info_platform_interface/analysis_options.yaml

-4
This file was deleted.

packages/plugin_platform_interface/analysis_options.yaml

-4
This file was deleted.

packages/share/example/ios/Runner.xcodeproj/project.pbxproj

-19
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@
197197
97C146EC1CF9000F007C117D /* Resources */,
198198
9705A1C41CF9048500538489 /* Embed Frameworks */,
199199
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
200-
12A149CFB1B2610A83692801 /* [CP] Embed Pods Frameworks */,
201200
);
202201
buildRules = (
203202
);
@@ -268,24 +267,6 @@
268267
/* End PBXResourcesBuildPhase section */
269268

270269
/* Begin PBXShellScriptBuildPhase section */
271-
12A149CFB1B2610A83692801 /* [CP] Embed Pods Frameworks */ = {
272-
isa = PBXShellScriptBuildPhase;
273-
buildActionMask = 2147483647;
274-
files = (
275-
);
276-
inputPaths = (
277-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
278-
"${PODS_ROOT}/../Flutter/Flutter.framework",
279-
);
280-
name = "[CP] Embed Pods Frameworks";
281-
outputPaths = (
282-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
283-
);
284-
runOnlyForDeploymentPostprocessing = 0;
285-
shellPath = /bin/sh;
286-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
287-
showEnvVarsInLog = 0;
288-
};
289270
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
290271
isa = PBXShellScriptBuildPhase;
291272
buildActionMask = 2147483647;

packages/url_launcher/url_launcher/analysis_options.yaml

-4
This file was deleted.

packages/url_launcher/url_launcher/example/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ flutter:
2020
uses-material-design: true
2121

2222
environment:
23-
sdk: ">=2.1.0 <3.0.0"
23+
sdk: ">=2.12.0-0 <3.0.0"
2424
flutter: ">=1.12.13+hotfix.5 <2.0.0"

packages/url_launcher/url_launcher_platform_interface/analysis_options.yaml

-4
This file was deleted.

packages/video_player/video_player/analysis_options.yaml

-4
This file was deleted.

packages/video_player/video_player/example/integration_test/video_player_test.dart

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
6+
// TODO(amirh): Remove this once flutter_driver supports null safety.
7+
// https://github.com/flutter/flutter/issues/71379
8+
// @dart = 2.9
9+
510
import 'package:flutter/material.dart';
611
import 'package:integration_test/integration_test.dart';
712
import 'package:flutter_test/flutter_test.dart';
@@ -11,7 +16,7 @@ const Duration _playDuration = Duration(seconds: 1);
1116

1217
void main() {
1318
IntegrationTestWidgetsFlutterBinding.ensureInitialized();
14-
late VideoPlayerController _controller;
19+
VideoPlayerController _controller;
1520
tearDown(() async => _controller.dispose());
1621

1722
group('asset videos', () {

packages/video_player/video_player/example/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ flutter:
2727
- assets/bumble_bee_captions.srt
2828

2929
environment:
30-
sdk: ">=2.8.0 <3.0.0"
30+
sdk: ">=2.12.0-0 <3.0.0"
3131
flutter: ">=1.12.13+hotfix.5 <2.0.0"

packages/video_player/video_player_platform_interface/analysis_options.yaml

-4
This file was deleted.

packages/video_player/video_player_web/analysis_options.yaml

-12
This file was deleted.

script/incremental_build.sh

+1-10
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,8 @@ fi
2929
#
3030
# TODO(mklim): Remove everything from this list. https://github.com/flutter/flutter/issues/45440
3131
CUSTOM_ANALYSIS_PLUGINS=(
32-
"plugin_platform_interface"
33-
"video_player/video_player"
34-
"video_player/video_player_platform_interface"
35-
"video_player/video_player_web"
36-
"url_launcher/url_launcher_platform_interface"
37-
"url_launcher/url_launcher"
38-
"device_info/device_info_platform_interface"
39-
"device_info/device_info"
40-
"connectivity/connectivity_platform_interface"
41-
"connectivity/connectivity"
4232
)
33+
4334
# Comma-separated string of the list above
4435
readonly CUSTOM_FLAG=$(IFS=, ; echo "${CUSTOM_ANALYSIS_PLUGINS[*]}")
4536
# Set some default actions if run without arguments.

0 commit comments

Comments
 (0)