diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8f9d918..742b598 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -20,7 +20,7 @@ jobs: - name: Install dart uses: dart-lang/setup-dart@v1 - name: Install melos - run: dart pub global activate melos + run: dart pub global activate melos 2.9.0 - name: Initialize melos run: melos bs - name: Format and analyze @@ -52,9 +52,9 @@ jobs: - name: Install dart uses: dart-lang/setup-dart@v1 - name: Install melos - run: dart pub global activate melos + run: dart pub global activate melos 2.9.0 - name: Install coverage - run: dart pub global activate coverage + run: dart pub global activate coverage 1.6.3 - name: Install coverde run: dart pub global activate --source path . - name: Initialize melos @@ -95,9 +95,9 @@ jobs: - name: Install dart uses: dart-lang/setup-dart@v1 - name: Install melos - run: dart pub global activate melos + run: dart pub global activate melos 2.9.0 - name: Install pana - run: dart pub global activate pana + run: dart pub global activate pana 0.21.35 - name: Initialize melos run: melos bs - name: Verify pub score (10pts of tolerance) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4e84ef..39236e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## [Unreleased] + +- **FEAT (BREAKING)**: require Dart 3. + ## 0.1.0+1 - **FIX**: use proper version for update check. diff --git a/analysis_options.yaml b/analysis_options.yaml index 734dc7a..fa88f6e 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,4 +1,4 @@ -include: package:very_good_analysis/analysis_options.2.4.0.yaml +include: package:very_good_analysis/analysis_options.2.0.0.yaml analyzer: exclude: diff --git a/melos.yaml b/melos.yaml index 3b5c24c..344802f 100644 --- a/melos.yaml +++ b/melos.yaml @@ -48,7 +48,7 @@ scripts: t: description: Run tests and generate coverage tracefile for a selected package in random order. - run: melos exec -c 1 -- "dart test -x ci-only --coverage=coverage -r expanded --test-randomize-ordering-seed random --color && format_coverage --lcov --in=coverage --out=coverage/lcov.info --packages=.packages --report-on=lib" + run: melos exec -c 1 -- "dart test -x ci-only --coverage=coverage -r expanded --test-randomize-ordering-seed random --color && dart pub global run coverage:format_coverage --lcov --in=coverage --out=coverage/lcov.info --packages=.dart_tool/package_config.json --report-on=lib" select-package: dir-exists: test T: @@ -56,7 +56,7 @@ scripts: run: melos run t --no-select T:ci: description: Run tests and generate coverage tracefiles for all packages in random order. - run: melos exec --fail-fast --dir-exists=test -- "dart test -x ci-only --coverage=coverage -r expanded --test-randomize-ordering-seed random && format_coverage --lcov --in=coverage --out=coverage/lcov.info --packages=.packages --report-on=lib" + run: melos exec --fail-fast --dir-exists=test -- "dart test -x ci-only --coverage=coverage -r expanded --test-randomize-ordering-seed random && dart pub global run coverage:format_coverage --lcov --in=coverage --out=coverage/lcov.info --packages=.dart_tool/package_config.json --report-on=lib" MC: description: Merge all packages coverage tracefiles ignoring data related to generated files. diff --git a/pubspec.yaml b/pubspec.yaml index 697004a..4832fa9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/mrverdant13/coverde issue_tracker: https://github.com/mrverdant13/coverde/issues environment: - sdk: ">=2.16.1 <3.0.0" + sdk: ">=3.0.0 <4.0.0" dependencies: args: ^2.3.0 diff --git a/test/src/commands/report/report_test.dart b/test/src/commands/report/report_test.dart index 0cbf055..0a92f0e 100644 --- a/test/src/commands/report/report_test.dart +++ b/test/src/commands/report/report_test.dart @@ -64,12 +64,10 @@ extension _FixturedString on String { class MockProcessManager extends Mock implements ProcessManager {} -class FakeProcessResult extends Mock implements ProcessResult {} - void main() { test( ''' - + A trace file report generator command should be instantiable ''', () { @@ -136,7 +134,7 @@ AND an existing tracefile <${proj.name}> WHEN the command is invoqued THEN a coverage report should be launched ├─ BY generating an HTML report -├─ AND launching it in a browser +├─ AND launching it in a browser ''', () async { // ARRANGE @@ -154,7 +152,7 @@ THEN a coverage report should be launched ), ).thenAnswer( (_) async => Future.value( - FakeProcessResult(), + ProcessResult(0, 0, '', ''), ), );