Skip to content

Commit

Permalink
Allow latest pkg:analyzer, bump min SDK to stable release (#2418)
Browse files Browse the repository at this point in the history
Prepare for releases
  • Loading branch information
kevmoo authored Nov 26, 2024
1 parent 8a07bee commit c2f19b4
Show file tree
Hide file tree
Showing 15 changed files with 136 additions and 132 deletions.
212 changes: 106 additions & 106 deletions .github/workflows/dart.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion integration_tests/regression/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: regression_tests
publish_to: none
environment:
sdk: ^3.5.0-311.0.dev
sdk: ^3.5.0
resolution: workspace
dependencies:
test: any
2 changes: 1 addition & 1 deletion integration_tests/spawn_hybrid/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: spawn_hybrid
publish_to: none
environment:
sdk: ^3.5.0-311.0.dev
sdk: ^3.5.0
resolution: workspace
dependencies:
async: ^2.9.0
Expand Down
2 changes: 1 addition & 1 deletion integration_tests/wasm/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: wasm_tests
publish_to: none
environment:
sdk: ^3.5.0-311.0.dev
sdk: ^3.5.0
resolution: workspace
dev_dependencies:
test: any
1 change: 1 addition & 0 deletions pkgs/checks/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- Add `containsMatchingInOrder` and `containsEqualInOrder` to replace the
combined functionality in `containsInOrder`.
- Replace `pairwiseComparesTo` with `pairwiseMatches`.
- Increase SDK constraint to ^3.5.0.

## 0.3.0

Expand Down
2 changes: 1 addition & 1 deletion pkgs/checks/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repository: https://github.com/dart-lang/test/tree/master/pkgs/checks
resolution: workspace

environment:
sdk: ^3.5.0-311.0.dev
sdk: ^3.5.0

dependencies:
async: ^2.8.0
Expand Down
2 changes: 1 addition & 1 deletion pkgs/matcher/lib/mirror_matchers.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.

@Deprecated('Check properties on known types')
library mirror_matchers;
library;

/// The mirror matchers library provides some additional matchers that
/// make use of `dart:mirrors`.
Expand Down
4 changes: 2 additions & 2 deletions pkgs/matcher/lib/src/type_matcher.dart
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ class TypeMatcher<T> extends Matcher {
final _dart2DynamicArgs = RegExp('<dynamic(, dynamic)*>');

/// With this expression `{}.runtimeType.toString`,
/// Dart 1: "<Instance of Map>
/// Dart 2: "<Instance of Map<dynamic, dynamic>>"
/// Dart 1: "`<Instance of Map>`"
/// Dart 2: "`<Instance of Map<dynamic, dynamic>>`"
///
/// This functions returns the Dart 1 output, when Dart 2 runtime semantics
/// are enabled.
Expand Down
5 changes: 3 additions & 2 deletions pkgs/test/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
## 1.25.9-wip
## 1.25.9

* Allow `analyzer: '>=6.0.0 <8.0.0'`
* Fix dart2wasm tests on windows.
* Increase SDK constraint to ^3.5.0-311.0.dev.
* Increase SDK constraint to ^3.5.0.
* Support running Node.js tests compiled with dart2wasm.
* Allow `firefox` or `firefox-bin` executable name on macOS.

Expand Down
10 changes: 5 additions & 5 deletions pkgs/test/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: test
version: 1.25.9-wip
version: 1.25.9
description: >-
A full featured library for writing and running Dart tests across platforms.
repository: https://github.com/dart-lang/test/tree/master/pkgs/test
resolution: workspace

environment:
sdk: ^3.5.0-311.0.dev
sdk: ^3.5.0

dependencies:
analyzer: '>=5.12.0 <7.0.0'
analyzer: '>=6.0.0 <8.0.0'
async: ^2.5.0
boolean_selector: ^2.1.0
collection: ^1.15.0
Expand All @@ -35,8 +35,8 @@ dependencies:
stream_channel: ^2.1.0

# Use an exact version until the test_api and test_core package are stable.
test_api: 0.7.4-wip
test_core: 0.6.6-wip
test_api: 0.7.4
test_core: 0.6.6

typed_data: ^1.3.0
web_socket_channel: '>=2.0.0 <4.0.0'
Expand Down
5 changes: 3 additions & 2 deletions pkgs/test_api/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## 0.7.4-wip
## 0.7.4

* Increase SDK constraint to ^3.5.0-311.0.dev.
* Allow `analyzer: '>=6.0.0 <8.0.0'`
* Increase SDK constraint to ^3.5.0.
* Support running Node.js tests compiled with dart2wasm.

## 0.7.3
Expand Down
6 changes: 3 additions & 3 deletions pkgs/test_api/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: test_api
version: 0.7.4-wip
version: 0.7.4
description: >-
The user facing API for structuring Dart tests and checking expectations.
repository: https://github.com/dart-lang/test/tree/master/pkgs/test_api
resolution: workspace

environment:
sdk: ^3.5.0-311.0.dev
sdk: ^3.5.0

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

dev_dependencies:
analyzer: '>=2.1.0 <7.0.0'
analyzer: '>=6.0.0 <8.0.0'
fake_async: ^1.2.0
glob: ^2.0.0
graphs: ^2.0.0
Expand Down
5 changes: 3 additions & 2 deletions pkgs/test_core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
## 0.6.6-wip
## 0.6.6

* Allow `analyzer: '>=6.0.0 <8.0.0'`
* Fix dart2wasm tests on windows.
* Increase SDK constraint to ^3.5.0-311.0.dev.
* Increase SDK constraint to ^3.5.0.
* Allow passing additional arguments to `dart compile wasm`.

## 0.6.5
Expand Down
8 changes: 4 additions & 4 deletions pkgs/test_core/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: test_core
version: 0.6.6-wip
version: 0.6.6
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
resolution: workspace

environment:
sdk: ^3.5.0-311.0.dev
sdk: ^3.5.0

dependencies:
analyzer: '>=3.3.0 <7.0.0'
analyzer: '>=6.0.0 <8.0.0'
args: ^2.0.0
async: ^2.5.0
boolean_selector: ^2.1.0
Expand All @@ -27,7 +27,7 @@ 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.4-wip
test_api: 0.7.4
vm_service: ">=6.0.0 <15.0.0"
yaml: ^3.0.0

Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: test_workspace
publish_to: none
environment:
sdk: ^3.5.0-311.0.dev # Must be ^3.5.0 or later for workspace to be allowed
sdk: ^3.5.0
workspace:
- integration_tests/regression
- integration_tests/spawn_hybrid
Expand Down

0 comments on commit c2f19b4

Please sign in to comment.