diff --git a/.github/workflows/dart_ci.yaml b/.github/workflows/dart_ci.yaml index 839b174..f22689a 100644 --- a/.github/workflows/dart_ci.yaml +++ b/.github/workflows/dart_ci.yaml @@ -25,9 +25,7 @@ jobs: strategy: fail-fast: false matrix: - sdk: [ 2.19.6 ] - # TODO: Add stable and beta sdk's as a separate effort (FEDX-1911)[https://jira.atl.workiva.net/browse/FEDX-1911] - # sdk: [ 2.19.6, stable, beta ] + sdk: [ 2.19.6, stable, beta ] steps: - uses: actions/checkout@v4 - uses: dart-lang/setup-dart@v1 @@ -48,9 +46,7 @@ jobs: strategy: fail-fast: false matrix: - sdk: [ 2.19.6 ] - # TODO: Add stable and beta sdk's as a separate effort (FEDX-1911)[https://jira.atl.workiva.net/browse/FEDX-1911] - # sdk: [ 2.19.6, stable, beta ] + sdk: [ 2.19.6, stable, beta ] steps: - uses: actions/checkout@v4 - uses: dart-lang/setup-dart@v1 diff --git a/bin/browser_aggregate_tests.dart b/bin/browser_aggregate_tests.dart index 5091d92..bae3ed1 100644 --- a/bin/browser_aggregate_tests.dart +++ b/bin/browser_aggregate_tests.dart @@ -171,6 +171,7 @@ Future buildTests(List testPaths, 'run', 'build_runner', 'build', + '--delete-conflicting-outputs', ...buildRunnerBuildArgs(testPaths, release: release, userBuildArgs: userBuildArgs), ]; diff --git a/pubspec.yaml b/pubspec.yaml index 1fae376..cc700a3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: json_annotation: ^4.1.0 path: ^1.8.0 test: ^1.17.12 - test_core: ">=0.4.2 <0.6.0" + test_core: ">=0.4.2 <0.7.0" yaml: ^3.1.0 dev_dependencies: diff --git a/test/bin/browser_aggregate_tests_test.dart b/test/bin/browser_aggregate_tests_test.dart index 79c5b45..4abcd9d 100644 --- a/test/bin/browser_aggregate_tests_test.dart +++ b/test/bin/browser_aggregate_tests_test.dart @@ -95,7 +95,7 @@ void main() { emitsThrough('Reading browser aggregate test config...'), emitsThrough('Found 1 aggregate tests to run.'), emitsThrough( - 'dart run build_runner build --build-filter=test/templates/default_template.browser_aggregate_test.**'), + 'dart run build_runner build --delete-conflicting-outputs --build-filter=test/templates/default_template.browser_aggregate_test.**'), emitsThrough(contains('Succeeded')), ])); await process.shouldExit(0); @@ -116,7 +116,7 @@ void main() { emitsThrough('Reading browser aggregate test config...'), emitsThrough('Found 1 aggregate tests to run.'), emitsThrough( - 'dart run build_runner build -c custom --release --build-filter=test/templates/default_template.browser_aggregate_test.**'), + 'dart run build_runner build --delete-conflicting-outputs -c custom --release --build-filter=test/templates/default_template.browser_aggregate_test.**'), emitsThrough(contains('Succeeded')), ])); await process.shouldExit(0);