diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 25f1b58f0..ddc0148b3 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -1,4 +1,4 @@ -# Created with package:mono_repo v6.6.0 +# Created with package:mono_repo v6.6.1 name: Dart CI on: push: @@ -36,27 +36,27 @@ jobs: name: Checkout repository uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b - name: mono_repo self validate - run: dart pub global activate mono_repo 6.6.0 + run: dart pub global activate mono_repo 6.6.1 - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: - name: "analyze_and_format; linux; Dart 3.0.0; PKGS: pkgs/checks, pkgs/test_core; `dart analyze`" + name: "analyze_and_format; linux; Dart 3.2.0; PKGS: pkgs/checks, pkgs/test_core; `dart analyze`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/checks-pkgs/test_core;commands:analyze_1" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/checks-pkgs/test_core;commands:analyze_1" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/checks-pkgs/test_core - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/checks-pkgs/test_core + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.0.0" + sdk: "3.2.0" - id: checkout name: Checkout repository uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b @@ -212,23 +212,23 @@ jobs: if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm job_005: - name: "unit_test; linux; Dart 3.0.0; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`" + name: "unit_test; linux; Dart 3.2.0; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:integration_tests/spawn_hybrid;commands:test_1" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:integration_tests/spawn_hybrid;commands:test_1" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:integration_tests/spawn_hybrid - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:integration_tests/spawn_hybrid + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.0.0" + sdk: "3.2.0" - id: checkout name: Checkout repository uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b @@ -247,23 +247,23 @@ jobs: - job_003 - job_004 job_006: - name: "unit_test; linux; Dart 3.0.0; PKG: pkgs/checks; `dart test`" + name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/checks; `dart test`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/checks;commands:command_01" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/checks;commands:command_01" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/checks - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/checks + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.0.0" + sdk: "3.2.0" - id: checkout name: Checkout repository uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b @@ -282,23 +282,23 @@ jobs: - job_003 - job_004 job_007: - name: "unit_test; linux; Dart 3.0.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 0`" + name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 0`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/test;commands:command_02" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test;commands:command_02" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/test - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.0.0" + sdk: "3.2.0" - id: checkout name: Checkout repository uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b @@ -317,23 +317,23 @@ jobs: - job_003 - job_004 job_008: - name: "unit_test; linux; Dart 3.0.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 1`" + name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 1`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/test;commands:command_03" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test;commands:command_03" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/test - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.0.0" + sdk: "3.2.0" - id: checkout name: Checkout repository uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b @@ -352,23 +352,23 @@ jobs: - job_003 - job_004 job_009: - name: "unit_test; linux; Dart 3.0.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 2`" + name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 2`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/test;commands:command_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test;commands:command_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/test - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.0.0" + sdk: "3.2.0" - id: checkout name: Checkout repository uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b @@ -387,23 +387,23 @@ jobs: - job_003 - job_004 job_010: - name: "unit_test; linux; Dart 3.0.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 3`" + name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 3`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/test;commands:command_05" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test;commands:command_05" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/test - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.0.0" + sdk: "3.2.0" - id: checkout name: Checkout repository uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b @@ -422,23 +422,23 @@ jobs: - job_003 - job_004 job_011: - name: "unit_test; linux; Dart 3.0.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 4`" + name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 4`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/test;commands:command_06" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test;commands:command_06" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/test - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.0.0" + sdk: "3.2.0" - id: checkout name: Checkout repository uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b @@ -457,23 +457,23 @@ jobs: - job_003 - job_004 job_012: - name: "unit_test; linux; Dart 3.0.0; PKG: pkgs/test_api; `dart test --preset travis -x browser`" + name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/test_api; `dart test --preset travis -x browser`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/test_api;commands:command_12" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test_api;commands:command_12" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:pkgs/test_api - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test_api + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.0.0" + sdk: "3.2.0" - id: checkout name: Checkout repository uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b @@ -846,13 +846,13 @@ jobs: - job_003 - job_004 job_023: - name: "unit_test; windows; Dart 3.0.0; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`" + name: "unit_test; windows; Dart 3.2.0; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.0.0" + sdk: "3.2.0" - id: checkout name: Checkout repository uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b @@ -871,13 +871,13 @@ jobs: - job_003 - job_004 job_024: - name: "unit_test; windows; Dart 3.0.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 0`" + name: "unit_test; windows; Dart 3.2.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 0`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.0.0" + sdk: "3.2.0" - id: checkout name: Checkout repository uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b @@ -896,13 +896,13 @@ jobs: - job_003 - job_004 job_025: - name: "unit_test; windows; Dart 3.0.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 1`" + name: "unit_test; windows; Dart 3.2.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 1`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.0.0" + sdk: "3.2.0" - id: checkout name: Checkout repository uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b @@ -921,13 +921,13 @@ jobs: - job_003 - job_004 job_026: - name: "unit_test; windows; Dart 3.0.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 2`" + name: "unit_test; windows; Dart 3.2.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 2`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.0.0" + sdk: "3.2.0" - id: checkout name: Checkout repository uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b @@ -946,13 +946,13 @@ jobs: - job_003 - job_004 job_027: - name: "unit_test; windows; Dart 3.0.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 3`" + name: "unit_test; windows; Dart 3.2.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 3`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.0.0" + sdk: "3.2.0" - id: checkout name: Checkout repository uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b @@ -971,13 +971,13 @@ jobs: - job_003 - job_004 job_028: - name: "unit_test; windows; Dart 3.0.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 4`" + name: "unit_test; windows; Dart 3.2.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 4`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.0.0" + sdk: "3.2.0" - id: checkout name: Checkout repository uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b diff --git a/integration_tests/regression/pubspec.yaml b/integration_tests/regression/pubspec.yaml index 7ac550eed..116b98523 100644 --- a/integration_tests/regression/pubspec.yaml +++ b/integration_tests/regression/pubspec.yaml @@ -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 diff --git a/integration_tests/spawn_hybrid/pubspec.yaml b/integration_tests/spawn_hybrid/pubspec.yaml index 410738502..a8cbbdbae 100644 --- a/integration_tests/spawn_hybrid/pubspec.yaml +++ b/integration_tests/spawn_hybrid/pubspec.yaml @@ -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 diff --git a/integration_tests/wasm/pubspec.yaml b/integration_tests/wasm/pubspec.yaml index e1fcbfba3..47ab34eb9 100644 --- a/integration_tests/wasm/pubspec.yaml +++ b/integration_tests/wasm/pubspec.yaml @@ -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: diff --git a/pkgs/checks/CHANGELOG.md b/pkgs/checks/CHANGELOG.md index da2075b43..8ef827eb1 100644 --- a/pkgs/checks/CHANGELOG.md +++ b/pkgs/checks/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.1-wip + +- Update min SDK constraint to 3.2.0. + ## 0.3.0 - **Breaking Changes** diff --git a/pkgs/checks/lib/src/checks.dart b/pkgs/checks/lib/src/checks.dart index bf3d9a1c4..5ac2da29c 100644 --- a/pkgs/checks/lib/src/checks.dart +++ b/pkgs/checks/lib/src/checks.dart @@ -574,9 +574,9 @@ final class Extracted { } Extracted _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 { @@ -796,7 +796,7 @@ final class _TestContext implements Context, _ClauseDescription { _TestContext get _root { _TestContext current = this; while (current._parent != null) { - current = current._parent!; + current = current._parent; } return current; } diff --git a/pkgs/checks/pubspec.yaml b/pkgs/checks/pubspec.yaml index bf9989636..1522ecf29 100644 --- a/pkgs/checks/pubspec.yaml +++ b/pkgs/checks/pubspec.yaml @@ -1,12 +1,12 @@ 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 @@ -14,5 +14,5 @@ dependencies: 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 diff --git a/pkgs/test/CHANGELOG.md b/pkgs/test/CHANGELOG.md index 61dc7a347..d079de88c 100644 --- a/pkgs/test/CHANGELOG.md +++ b/pkgs/test/CHANGELOG.md @@ -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 diff --git a/pkgs/test/lib/src/runner/node/socket_channel.dart b/pkgs/test/lib/src/runner/node/socket_channel.dart index 1d9055e62..4e8a35036 100644 --- a/pkgs/test/lib/src/runner/node/socket_channel.dart +++ b/pkgs/test/lib/src/runner/node/socket_channel.dart @@ -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'; diff --git a/pkgs/test/pubspec.yaml b/pkgs/test/pubspec.yaml index 32f1fbef8..7058a6703 100644 --- a/pkgs/test/pubspec.yaml +++ b/pkgs/test/pubspec.yaml @@ -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' @@ -34,8 +34,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.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' @@ -43,7 +43,7 @@ dependencies: 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 diff --git a/pkgs/test/tool/host.dart b/pkgs/test/tool/host.dart index 0d320d331..dc3e5ab0f 100644 --- a/pkgs/test/tool/host.dart +++ b/pkgs/test/tool/host.dart @@ -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'; diff --git a/pkgs/test_api/CHANGELOG.md b/pkgs/test_api/CHANGELOG.md index 470fe8a06..df4ff3174 100644 --- a/pkgs/test_api/CHANGELOG.md +++ b/pkgs/test_api/CHANGELOG.md @@ -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 diff --git a/pkgs/test_api/lib/fake.dart b/pkgs/test_api/lib/fake.dart index 702bb5fee..f8b2d8080 100644 --- a/pkgs/test_api/lib/fake.dart +++ b/pkgs/test_api/lib/fake.dart @@ -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'; diff --git a/pkgs/test_api/lib/scaffolding.dart b/pkgs/test_api/lib/scaffolding.dart index 84185b843..9d864bbb9 100644 --- a/pkgs/test_api/lib/scaffolding.dart +++ b/pkgs/test_api/lib/scaffolding.dart @@ -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; diff --git a/pkgs/test_api/lib/src/backend/declarer.dart b/pkgs/test_api/lib/src/backend/declarer.dart index 53dba0b3c..648e3232d 100644 --- a/pkgs/test_api/lib/src/backend/declarer.dart +++ b/pkgs/test_api/lib/src/backend/declarer.dart @@ -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; } @@ -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(_setUps, (setUp) => setUp()); } diff --git a/pkgs/test_api/lib/src/backend/remote_listener.dart b/pkgs/test_api/lib/src/backend/remote_listener.dart index 9d6762717..66a081428 100644 --- a/pkgs/test_api/lib/src/backend/remote_listener.dart +++ b/pkgs/test_api/lib/src/backend/remote_listener.dart @@ -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, diff --git a/pkgs/test_api/lib/test_api.dart b/pkgs/test_api/lib/test_api.dart index 7804cda5d..75c15403b 100644 --- a/pkgs/test_api/lib/test_api.dart +++ b/pkgs/test_api/lib/test_api.dart @@ -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'; diff --git a/pkgs/test_api/pubspec.yaml b/pkgs/test_api/pubspec.yaml index c11bab19e..3896d901b 100644 --- a/pkgs/test_api/pubspec.yaml +++ b/pkgs/test_api/pubspec.yaml @@ -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 @@ -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 diff --git a/pkgs/test_core/CHANGELOG.md b/pkgs/test_core/CHANGELOG.md index b3d77a685..9c7113618 100644 --- a/pkgs/test_core/CHANGELOG.md +++ b/pkgs/test_core/CHANGELOG.md @@ -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. diff --git a/pkgs/test_core/lib/backend.dart b/pkgs/test_core/lib/backend.dart index 69f655247..f5a3b462b 100644 --- a/pkgs/test_core/lib/backend.dart +++ b/pkgs/test_core/lib/backend.dart @@ -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; diff --git a/pkgs/test_core/lib/src/runner/configuration.dart b/pkgs/test_core/lib/src/runner/configuration.dart index 2da40d516..8ba4aa810 100644 --- a/pkgs/test_core/lib/src/runner/configuration.dart +++ b/pkgs/test_core/lib/src/runner/configuration.dart @@ -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)) { @@ -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); } } diff --git a/pkgs/test_core/lib/src/runner/suite.dart b/pkgs/test_core/lib/src/runner/suite.dart index b3561abf2..b5ee0bea5 100644 --- a/pkgs/test_core/lib/src/runner/suite.dart +++ b/pkgs/test_core/lib/src/runner/suite.dart @@ -110,7 +110,7 @@ final class SuiteConfiguration { /// The set of runtimes on which to run tests. List get runtimes => _runtimes == null ? const ['vm'] - : List.unmodifiable(_runtimes!.map((runtime) => runtime.name)); + : List.unmodifiable(_runtimes.map((runtime) => runtime.name)); final List? _runtimes; /// Configuration for particular tags. diff --git a/pkgs/test_core/lib/test_core.dart b/pkgs/test_core/lib/test_core.dart index 01f44542c..b1df09da2 100644 --- a/pkgs/test_core/lib/test_core.dart +++ b/pkgs/test_core/lib/test_core.dart @@ -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; diff --git a/pkgs/test_core/pubspec.yaml b/pkgs/test_core/pubspec.yaml index 8a8a369c1..fdb500131 100644 --- a/pkgs/test_core/pubspec.yaml +++ b/pkgs/test_core/pubspec.yaml @@ -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' @@ -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 diff --git a/tool/ci.sh b/tool/ci.sh index 4e00803fa..e7dc4de60 100755 --- a/tool/ci.sh +++ b/tool/ci.sh @@ -1,9 +1,10 @@ #!/bin/bash -# Created with package:mono_repo v6.6.0 +# Created with package:mono_repo v6.6.1 # Support built in commands on windows out of the box. + # When it is a flutter repo (check the pubspec.yaml for "sdk: flutter") -# then "flutter" is called instead of "pub". +# then "flutter pub" is called instead of "dart pub". # This assumes that the Flutter SDK has been installed in a previous step. function pub() { if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then @@ -12,18 +13,13 @@ function pub() { command dart pub "$@" fi } -# When it is a flutter repo (check the pubspec.yaml for "sdk: flutter") -# then "flutter" is called instead of "pub". -# This assumes that the Flutter SDK has been installed in a previous step. + function format() { - if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then - command flutter format "$@" - else - command dart format "$@" - fi + command dart format "$@" } + # When it is a flutter repo (check the pubspec.yaml for "sdk: flutter") -# then "flutter" is called instead of "pub". +# then "flutter analyze" is called instead of "dart analyze". # This assumes that the Flutter SDK has been installed in a previous step. function analyze() { if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then