Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump dart_flutter_team_lints from 2.1.1 to ^3.0.0 in all packages #2228

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
118 changes: 59 additions & 59 deletions .github/workflows/dart.yml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions integration_tests/regression/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: regression_tests
publish_to: none
environment:
sdk: ^3.0.0
sdk: ^3.2.0
dependencies:
test: any
dev_dependencies:
dart_flutter_team_lints: ^2.1.1
dart_flutter_team_lints: ^3.0.0
dependency_overrides:
test:
path: ../../pkgs/test
Expand Down
4 changes: 2 additions & 2 deletions integration_tests/spawn_hybrid/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: spawn_hybrid
publish_to: none
environment:
sdk: ^3.0.0
sdk: ^3.2.0
dependencies:
async: ^2.9.0
path: ^1.8.2
stream_channel: ^2.1.0
dev_dependencies:
dart_flutter_team_lints: ^2.0.0
dart_flutter_team_lints: ^3.0.0
other_package:
path: other_package/
test: any
Expand Down
4 changes: 2 additions & 2 deletions integration_tests/wasm/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: wasm_tests
publish_to: none
environment:
sdk: ^3.0.0
sdk: ^3.2.0
dev_dependencies:
dart_flutter_team_lints: ^2.1.1
dart_flutter_team_lints: ^3.0.0
test: any
dependency_overrides:
test:
Expand Down
4 changes: 4 additions & 0 deletions pkgs/checks/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.3.1-wip

- Update min SDK constraint to 3.2.0.

## 0.3.0

- **Breaking Changes**
Expand Down
6 changes: 3 additions & 3 deletions pkgs/checks/lib/src/checks.dart
Original file line number Diff line number Diff line change
Expand Up @@ -574,9 +574,9 @@ final class Extracted<T> {
}

Extracted<T> _fillActual(Object? actual) => _rejection == null ||
_rejection!.actual.isNotEmpty
_rejection.actual.isNotEmpty
? this
: Extracted.rejection(actual: literal(actual), which: _rejection!.which);
: Extracted.rejection(actual: literal(actual), which: _rejection.which);
}

abstract interface class _Optional<T> {
Expand Down Expand Up @@ -796,7 +796,7 @@ final class _TestContext<T> implements Context<T>, _ClauseDescription {
_TestContext get _root {
_TestContext<dynamic> current = this;
while (current._parent != null) {
current = current._parent!;
current = current._parent;
}
return current;
}
Expand Down
6 changes: 3 additions & 3 deletions pkgs/checks/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
name: checks
version: 0.3.0
version: 0.3.1-wip
description: >-
A framework for checking values against expectations and building custom
expectations.
repository: https://github.com/dart-lang/test/tree/master/pkgs/checks

environment:
sdk: ^3.0.0
sdk: ^3.2.0

dependencies:
async: ^2.8.0
meta: ^1.9.0
test_api: ">=0.5.0 <0.8.0"

dev_dependencies:
dart_flutter_team_lints: ^2.0.0
dart_flutter_team_lints: ^3.0.0
test: ^1.21.3
1 change: 1 addition & 0 deletions pkgs/test/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## 1.25.6-wip

* Point API doc links to `package:test` canonical libraries.
* Update min SDK constraint to 3.2.0.

## 1.25.5

Expand Down
2 changes: 1 addition & 1 deletion pkgs/test/lib/src/runner/node/socket_channel.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// BSD-style license that can be found in the LICENSE file.

@JS()
library node;
library;

import 'dart:async';
import 'dart:convert';
Expand Down
8 changes: 4 additions & 4 deletions pkgs/test/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >-
repository: https://github.com/dart-lang/test/tree/master/pkgs/test

environment:
sdk: ^3.0.0
sdk: ^3.2.0

dependencies:
analyzer: '>=5.12.0 <7.0.0'
Expand Down Expand Up @@ -34,16 +34,16 @@ dependencies:
stream_channel: ^2.1.0

# Use an exact version until the test_api and test_core package are stable.
test_api: 0.7.1
test_core: 0.6.2
test_api: 0.7.2
test_core: 0.6.3

typed_data: ^1.3.0
web_socket_channel: '>=2.0.0 <4.0.0'
webkit_inspection_protocol: ^1.0.0
yaml: ^3.0.0

dev_dependencies:
dart_flutter_team_lints: ^2.1.1
dart_flutter_team_lints: ^3.0.0
fake_async: ^1.0.0
glob: ^2.0.0
test_descriptor: ^2.0.0
Expand Down
2 changes: 1 addition & 1 deletion pkgs/test/tool/host.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// BSD-style license that can be found in the LICENSE file.

@JS()
library test.host;
library;

import 'dart:async';
import 'dart:convert';
Expand Down
4 changes: 4 additions & 0 deletions pkgs/test_api/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.7.2-wip

* Update min SDK constraint to 3.2.0.

## 0.7.1

- Added [`@doNotSubmit`](https://pub.dev/documentation/meta/latest/meta/doNotSubmit-constant.html) to `test(solo: ...)` and `group(solo: ...)`. In
Expand Down
2 changes: 1 addition & 1 deletion pkgs/test_api/lib/fake.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@

@Deprecated('package:test_api is not intended for general use. '
'Please use package:test.')
library test_api.fake;
library;

export 'src/frontend/fake.dart';
2 changes: 1 addition & 1 deletion pkgs/test_api/lib/scaffolding.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/// {@canonicalFor tags.Tags}
/// {@canonicalFor test_on.TestOn}
/// {@canonicalFor timeout.Timeout}
library test_api.scaffolding;
library;

export 'src/backend/configuration/on_platform.dart' show OnPlatform;
export 'src/backend/configuration/retry.dart' show Retry;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/test_api/lib/src/backend/declarer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ class Declarer {
_checkNotBuilt('group');

final fullTestPrefix = _prefix(name);
if (_fullTestName != null && !_fullTestName!.startsWith(fullTestPrefix)) {
if (_fullTestName != null && !_fullTestName.startsWith(fullTestPrefix)) {
return;
}

Expand Down Expand Up @@ -348,7 +348,7 @@ class Declarer {
/// If no set-up functions are declared, this returns a [Future] that
/// completes immediately.
Future _runSetUps() async {
if (_parent != null) await _parent!._runSetUps();
if (_parent != null) await _parent._runSetUps();
// TODO: why does type inference not work here?
await Future.forEach<Function>(_setUps, (setUp) => setUp());
}
Expand Down
2 changes: 1 addition & 1 deletion pkgs/test_api/lib/src/backend/remote_listener.dart
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ final class RemoteListener {
});

liveTest.onMessage.listen((message) {
if (_printZone != null) _printZone!.print(message.text);
if (_printZone != null) _printZone.print(message.text);
channel.sink.add({
'type': 'message',
'message-type': message.type.name,
Expand Down
2 changes: 1 addition & 1 deletion pkgs/test_api/lib/test_api.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

@Deprecated('package:test_api is not intended for general use. '
'Please use package:test.')
library test_api;
library;

export 'hooks.dart' show TestFailure;
export 'scaffolding.dart';
6 changes: 3 additions & 3 deletions pkgs/test_api/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: test_api
version: 0.7.1
version: 0.7.2-wip
description: >-
The user facing API for structuring Dart tests and checking expectations.
repository: https://github.com/dart-lang/test/tree/master/pkgs/test_api

environment:
sdk: ^3.0.0
sdk: ^3.2.0

dependencies:
async: ^2.5.0
Expand All @@ -20,7 +20,7 @@ dependencies:

dev_dependencies:
analyzer: '>=2.1.0 <7.0.0'
dart_flutter_team_lints: ^2.0.0
dart_flutter_team_lints: ^3.0.0
fake_async: ^1.2.0
glob: ^2.0.0
graphs: ^2.0.0
Expand Down
4 changes: 4 additions & 0 deletions pkgs/test_core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.6.3-wip

* Update min SDK constraint to 3.2.0.

## 0.6.2

* Add `@doNotSubmit` to more declarations of the `solo` parameter.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/test_core/lib/backend.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

@Deprecated('package:test_core is not intended for general use. '
'Please use package:test.')
library test_core.backend;
library;

export 'package:test_api/backend.dart'
show Compiler, Metadata, PlatformSelector, Runtime, SuitePlatform;
Expand Down
12 changes: 6 additions & 6 deletions pkgs/test_core/lib/src/runner/configuration.dart
Original file line number Diff line number Diff line change
Expand Up @@ -791,10 +791,10 @@ class Configuration {
}
return config;
}()) {
if (_filename != null && _filename!.context.style != p.style) {
if (_filename != null && _filename.context.style != p.style) {
throw ArgumentError(
"filename's context must match the current operating system, was "
'${_filename!.context.style}.');
'${_filename.context.style}.');
}

if ((shardIndex == null) != (totalShards == null)) {
Expand Down Expand Up @@ -897,15 +897,15 @@ class Configuration {
var foldTraceExcept = other._foldTraceExcept ?? _foldTraceExcept;
if (_foldTraceOnly != null) {
if (other._foldTraceExcept != null) {
foldTraceOnly = _foldTraceOnly!.difference(other._foldTraceExcept!);
foldTraceOnly = _foldTraceOnly.difference(other._foldTraceExcept);
} else if (other._foldTraceOnly != null) {
foldTraceOnly = other._foldTraceOnly!.intersection(_foldTraceOnly!);
foldTraceOnly = other._foldTraceOnly.intersection(_foldTraceOnly);
}
} else if (_foldTraceExcept != null) {
if (other._foldTraceOnly != null) {
foldTraceOnly = other._foldTraceOnly!.difference(_foldTraceExcept!);
foldTraceOnly = other._foldTraceOnly.difference(_foldTraceExcept);
} else if (other._foldTraceExcept != null) {
foldTraceExcept = other._foldTraceExcept!.union(_foldTraceExcept!);
foldTraceExcept = other._foldTraceExcept.union(_foldTraceExcept);
}
}

Expand Down
2 changes: 1 addition & 1 deletion pkgs/test_core/lib/src/runner/suite.dart
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ final class SuiteConfiguration {
/// The set of runtimes on which to run tests.
List<String> get runtimes => _runtimes == null
? const ['vm']
: List.unmodifiable(_runtimes!.map((runtime) => runtime.name));
: List.unmodifiable(_runtimes.map((runtime) => runtime.name));
final List<RuntimeSelection>? _runtimes;

/// Configuration for particular tags.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/test_core/lib/test_core.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

@Deprecated('package:test_core is not intended for general use. '
'Please use package:test.')
library test_core;
library;

export 'package:test_api/hooks.dart' show TestFailure;

Expand Down
8 changes: 4 additions & 4 deletions pkgs/test_core/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: test_core
version: 0.6.2
version: 0.6.3-wip
description: A basic library for writing tests and running them on the VM.
repository: https://github.com/dart-lang/test/tree/master/pkgs/test_core

environment:
sdk: ^3.0.0
sdk: ^3.2.0

dependencies:
analyzer: '>=3.3.0 <7.0.0'
Expand All @@ -26,9 +26,9 @@ dependencies:
stack_trace: ^1.10.0
stream_channel: ^2.1.0
# Use an exact version until the test_api package is stable.
test_api: 0.7.1
test_api: 0.7.2
vm_service: ">=6.0.0 <15.0.0"
yaml: ^3.0.0

dev_dependencies:
dart_flutter_team_lints: ^2.1.1
dart_flutter_team_lints: ^3.0.0
18 changes: 7 additions & 11 deletions tool/ci.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading