Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Ignore several import_of_legacy_library_into_null_safe #22326

Merged
merged 1 commit into from
Nov 6, 2020
Merged

Ignore several import_of_legacy_library_into_null_safe #22326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/web_ui/lib/src/engine.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import 'dart:js_util' as js_util;
import 'dart:math' as math;
import 'dart:typed_data';

import 'package:js/js.dart';
import 'package:meta/meta.dart';
import 'package:js/js.dart'; // ignore: import_of_legacy_library_into_null_safe
import 'package:meta/meta.dart'; // ignore: import_of_legacy_library_into_null_safe

import '../ui.dart' as ui;

Expand Down
8 changes: 4 additions & 4 deletions lib/web_ui/test/engine/path_metrics_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

import 'dart:math' as math;

import 'package:test/bootstrap/browser.dart';
import 'package:test/test.dart';
import 'package:ui/ui.dart';
import 'package:test/bootstrap/browser.dart'; // ignore: import_of_legacy_library_into_null_safe
Copy link
Contributor

@nturgut nturgut Nov 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question: Do we need to change every occurrence of this import? I think we use it many golden tests, example: https://github.com/flutter/engine/blob/master/lib/web_ui/test/golden_tests/engine/canvas_blend_golden_test.dart

Copy link
Contributor Author

@scheglov scheglov Nov 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only if the library that imports it is Null Safe, i.e. the Dart SDK is 2.12.0, and the library does not opt-out from null safety. The example you pointed at does opt-out, it has // @dart = 2.6, so sets the language version to 2.6, which is less than 2.12 where non-nullable feature it released, and less than 2.10 when this feature was experimentally-released.

import 'package:test/test.dart'; // ignore: import_of_legacy_library_into_null_safe
import 'package:ui/ui.dart'; // ignore: import_of_legacy_library_into_null_safe

import '../matchers.dart';
import '../matchers.dart'; // ignore: import_of_legacy_library_into_null_safe

const double kTolerance = 0.001;

Expand Down
4 changes: 2 additions & 2 deletions lib/web_ui/test/engine/surface/path/path_iterator_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import 'dart:typed_data';

import 'package:ui/src/engine.dart';
import 'package:test/bootstrap/browser.dart';
import 'package:test/test.dart';
import 'package:test/bootstrap/browser.dart'; // ignore: import_of_legacy_library_into_null_safe
import 'package:test/test.dart'; // ignore: import_of_legacy_library_into_null_safe

void main() {
internalBootstrapBrowserTest(() => testMain);
Expand Down
4 changes: 2 additions & 2 deletions lib/web_ui/test/engine/surface/path/path_winding_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
// @dart = 2.10

import 'dart:math' as math;
import 'package:test/bootstrap/browser.dart';
import 'package:test/test.dart';
import 'package:test/bootstrap/browser.dart'; // ignore: import_of_legacy_library_into_null_safe
import 'package:test/test.dart'; // ignore: import_of_legacy_library_into_null_safe
import 'package:ui/ui.dart' hide window;
import 'package:ui/src/engine.dart';

Expand Down
4 changes: 2 additions & 2 deletions lib/web_ui/test/engine/ulps_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// found in the LICENSE file.

import 'dart:typed_data';
import 'package:test/bootstrap/browser.dart';
import 'package:test/test.dart';
import 'package:test/bootstrap/browser.dart'; // ignore: import_of_legacy_library_into_null_safe
import 'package:test/test.dart'; // ignore: import_of_legacy_library_into_null_safe
import 'package:ui/src/engine.dart';

void main() {
Expand Down
6 changes: 3 additions & 3 deletions lib/web_ui/test/golden_tests/engine/color_filter_golden_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
import 'dart:html' as html;
import 'dart:js_util' as js_util;

import 'package:test/bootstrap/browser.dart';
import 'package:test/test.dart';
import 'package:test/bootstrap/browser.dart'; // ignore: import_of_legacy_library_into_null_safe
import 'package:test/test.dart'; // ignore: import_of_legacy_library_into_null_safe
import 'package:ui/ui.dart';
import 'package:ui/src/engine.dart';

import 'package:web_engine_tester/golden_tester.dart';
import 'package:web_engine_tester/golden_tester.dart'; // ignore: import_of_legacy_library_into_null_safe

final Rect region = Rect.fromLTWH(0, 0, 500, 500);

Expand Down
4 changes: 2 additions & 2 deletions lib/web_ui/test/lerp_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// found in the LICENSE file.

// @dart = 2.10
import 'package:test/bootstrap/browser.dart';
import 'package:test/test.dart';
import 'package:test/bootstrap/browser.dart'; // ignore: import_of_legacy_library_into_null_safe
import 'package:test/test.dart'; // ignore: import_of_legacy_library_into_null_safe

import 'package:ui/ui.dart';

Expand Down
6 changes: 3 additions & 3 deletions lib/web_ui/test/path_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
import 'dart:js_util' as js_util;
import 'dart:html' as html;
import 'dart:typed_data';
import 'package:test/bootstrap/browser.dart';
import 'package:test/test.dart';
import 'package:test/bootstrap/browser.dart'; // ignore: import_of_legacy_library_into_null_safe
import 'package:test/test.dart'; // ignore: import_of_legacy_library_into_null_safe
import 'package:ui/ui.dart' hide window;
import 'package:ui/src/engine.dart';

import 'matchers.dart';
import 'matchers.dart'; // ignore: import_of_legacy_library_into_null_safe

void main() {
internalBootstrapBrowserTest(() => testMain);
Expand Down
4 changes: 2 additions & 2 deletions lib/web_ui/test/text/line_breaker_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// found in the LICENSE file.

// @dart = 2.10
import 'package:test/bootstrap/browser.dart';
import 'package:test/test.dart';
import 'package:test/bootstrap/browser.dart'; // ignore: import_of_legacy_library_into_null_safe
import 'package:test/test.dart'; // ignore: import_of_legacy_library_into_null_safe

import 'package:ui/src/engine.dart';
import 'package:ui/ui.dart';
Expand Down