diff --git a/fixtures/_experimentSound/pubspec.yaml b/fixtures/_experimentSound/pubspec.yaml index 5733fc913..7daad68a8 100644 --- a/fixtures/_experimentSound/pubspec.yaml +++ b/fixtures/_experimentSound/pubspec.yaml @@ -12,51 +12,5 @@ dependencies: path: ^1.8.2 dev_dependencies: - build_runner: ^2.4.0 + build_runner: ^2.5.0 build_web_compilers: ^4.0.4 -dependency_overrides: - build: - git: - url: https://github.com/dart-lang/build - path: build - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_config: - git: - url: https://github.com/dart-lang/build - path: build_config - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_daemon: - git: - url: https://github.com/dart-lang/build - path: build_daemon - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_modules: - git: - url: https://github.com/dart-lang/build - path: build_modules - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_resolvers: - git: - url: https://github.com/dart-lang/build - path: build_resolvers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner: - git: - url: https://github.com/dart-lang/build - path: build_runner - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner_core: - git: - url: https://github.com/dart-lang/build - path: build_runner_core - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_test: - git: - url: https://github.com/dart-lang/build - path: build_test - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_web_compilers: - git: - url: https://github.com/dart-lang/build - path: build_web_compilers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 diff --git a/fixtures/_testCircular1Sound/pubspec.yaml b/fixtures/_testCircular1Sound/pubspec.yaml index 2f7fe4cfb..156214727 100644 --- a/fixtures/_testCircular1Sound/pubspec.yaml +++ b/fixtures/_testCircular1Sound/pubspec.yaml @@ -14,52 +14,5 @@ dependencies: path: ../_testCircular2Sound dev_dependencies: - build_runner: ^2.4.0 + build_runner: ^2.5.0 build_web_compilers: ^4.0.4 - -dependency_overrides: - build: - git: - url: https://github.com/dart-lang/build - path: build - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_config: - git: - url: https://github.com/dart-lang/build - path: build_config - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_daemon: - git: - url: https://github.com/dart-lang/build - path: build_daemon - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_modules: - git: - url: https://github.com/dart-lang/build - path: build_modules - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_resolvers: - git: - url: https://github.com/dart-lang/build - path: build_resolvers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner: - git: - url: https://github.com/dart-lang/build - path: build_runner - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner_core: - git: - url: https://github.com/dart-lang/build - path: build_runner_core - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_test: - git: - url: https://github.com/dart-lang/build - path: build_test - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_web_compilers: - git: - url: https://github.com/dart-lang/build - path: build_web_compilers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 diff --git a/fixtures/_testCircular2Sound/pubspec.yaml b/fixtures/_testCircular2Sound/pubspec.yaml index a0735a075..e9d936050 100644 --- a/fixtures/_testCircular2Sound/pubspec.yaml +++ b/fixtures/_testCircular2Sound/pubspec.yaml @@ -12,52 +12,5 @@ dependencies: path: ../_testCircular1Sound dev_dependencies: - build_runner: ^2.4.0 + build_runner: ^2.5.0 build_web_compilers: ^4.0.4 - -dependency_overrides: - build: - git: - url: https://github.com/dart-lang/build - path: build - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_config: - git: - url: https://github.com/dart-lang/build - path: build_config - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_daemon: - git: - url: https://github.com/dart-lang/build - path: build_daemon - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_modules: - git: - url: https://github.com/dart-lang/build - path: build_modules - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_resolvers: - git: - url: https://github.com/dart-lang/build - path: build_resolvers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner: - git: - url: https://github.com/dart-lang/build - path: build_runner - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner_core: - git: - url: https://github.com/dart-lang/build - path: build_runner_core - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_test: - git: - url: https://github.com/dart-lang/build - path: build_test - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_web_compilers: - git: - url: https://github.com/dart-lang/build - path: build_web_compilers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 diff --git a/fixtures/_testHotReload/pubspec.yaml b/fixtures/_testHotReload/pubspec.yaml index 8520a6d64..461c8ead3 100644 --- a/fixtures/_testHotReload/pubspec.yaml +++ b/fixtures/_testHotReload/pubspec.yaml @@ -6,50 +6,3 @@ publish_to: none environment: sdk: ^3.7.0 - -dependency_overrides: - build: - git: - url: https://github.com/dart-lang/build - path: build - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_config: - git: - url: https://github.com/dart-lang/build - path: build_config - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_daemon: - git: - url: https://github.com/dart-lang/build - path: build_daemon - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_modules: - git: - url: https://github.com/dart-lang/build - path: build_modules - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_resolvers: - git: - url: https://github.com/dart-lang/build - path: build_resolvers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner: - git: - url: https://github.com/dart-lang/build - path: build_runner - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner_core: - git: - url: https://github.com/dart-lang/build - path: build_runner_core - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_test: - git: - url: https://github.com/dart-lang/build - path: build_test - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_web_compilers: - git: - url: https://github.com/dart-lang/build - path: build_web_compilers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 diff --git a/fixtures/_testHotRestart1Sound/pubspec.yaml b/fixtures/_testHotRestart1Sound/pubspec.yaml index e20c45c33..cc41653e9 100644 --- a/fixtures/_testHotRestart1Sound/pubspec.yaml +++ b/fixtures/_testHotRestart1Sound/pubspec.yaml @@ -12,52 +12,5 @@ dependencies: path: ^1.6.1 dev_dependencies: - build_runner: ^2.4.0 + build_runner: ^2.5.0 build_web_compilers: ^4.0.4 - -dependency_overrides: - build: - git: - url: https://github.com/dart-lang/build - path: build - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_config: - git: - url: https://github.com/dart-lang/build - path: build_config - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_daemon: - git: - url: https://github.com/dart-lang/build - path: build_daemon - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_modules: - git: - url: https://github.com/dart-lang/build - path: build_modules - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_resolvers: - git: - url: https://github.com/dart-lang/build - path: build_resolvers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner: - git: - url: https://github.com/dart-lang/build - path: build_runner - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner_core: - git: - url: https://github.com/dart-lang/build - path: build_runner_core - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_test: - git: - url: https://github.com/dart-lang/build - path: build_test - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_web_compilers: - git: - url: https://github.com/dart-lang/build - path: build_web_compilers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 diff --git a/fixtures/_testHotRestart2Sound/pubspec.yaml b/fixtures/_testHotRestart2Sound/pubspec.yaml index ebaa69a25..47015e83f 100644 --- a/fixtures/_testHotRestart2Sound/pubspec.yaml +++ b/fixtures/_testHotRestart2Sound/pubspec.yaml @@ -14,52 +14,5 @@ dependencies: path: ../_testHotRestart1Sound dev_dependencies: - build_runner: ^2.4.0 + build_runner: ^2.5.0 build_web_compilers: ^4.0.4 - -dependency_overrides: - build: - git: - url: https://github.com/dart-lang/build - path: build - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_config: - git: - url: https://github.com/dart-lang/build - path: build_config - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_daemon: - git: - url: https://github.com/dart-lang/build - path: build_daemon - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_modules: - git: - url: https://github.com/dart-lang/build - path: build_modules - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_resolvers: - git: - url: https://github.com/dart-lang/build - path: build_resolvers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner: - git: - url: https://github.com/dart-lang/build - path: build_runner - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner_core: - git: - url: https://github.com/dart-lang/build - path: build_runner_core - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_test: - git: - url: https://github.com/dart-lang/build - path: build_test - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_web_compilers: - git: - url: https://github.com/dart-lang/build - path: build_web_compilers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 diff --git a/fixtures/_testHotRestartBreakpoints/pubspec.yaml b/fixtures/_testHotRestartBreakpoints/pubspec.yaml index cf3b81881..ecb0f8a7e 100644 --- a/fixtures/_testHotRestartBreakpoints/pubspec.yaml +++ b/fixtures/_testHotRestartBreakpoints/pubspec.yaml @@ -6,50 +6,3 @@ publish_to: none environment: sdk: ^3.7.0 - -dependency_overrides: - build: - git: - url: https://github.com/dart-lang/build - path: build - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_config: - git: - url: https://github.com/dart-lang/build - path: build_config - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_daemon: - git: - url: https://github.com/dart-lang/build - path: build_daemon - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_modules: - git: - url: https://github.com/dart-lang/build - path: build_modules - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_resolvers: - git: - url: https://github.com/dart-lang/build - path: build_resolvers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner: - git: - url: https://github.com/dart-lang/build - path: build_runner - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner_core: - git: - url: https://github.com/dart-lang/build - path: build_runner_core - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_test: - git: - url: https://github.com/dart-lang/build - path: build_test - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_web_compilers: - git: - url: https://github.com/dart-lang/build - path: build_web_compilers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 diff --git a/fixtures/_testPackageSound/pubspec.yaml b/fixtures/_testPackageSound/pubspec.yaml index 448515e0a..53ef4fcb4 100644 --- a/fixtures/_testPackageSound/pubspec.yaml +++ b/fixtures/_testPackageSound/pubspec.yaml @@ -12,52 +12,5 @@ dependencies: path: ../_testSound dev_dependencies: - build_runner: ^2.4.0 + build_runner: ^2.5.0 build_web_compilers: ^4.0.4 - -dependency_overrides: - build: - git: - url: https://github.com/dart-lang/build - path: build - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_config: - git: - url: https://github.com/dart-lang/build - path: build_config - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_daemon: - git: - url: https://github.com/dart-lang/build - path: build_daemon - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_modules: - git: - url: https://github.com/dart-lang/build - path: build_modules - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_resolvers: - git: - url: https://github.com/dart-lang/build - path: build_resolvers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner: - git: - url: https://github.com/dart-lang/build - path: build_runner - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner_core: - git: - url: https://github.com/dart-lang/build - path: build_runner_core - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_test: - git: - url: https://github.com/dart-lang/build - path: build_test - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_web_compilers: - git: - url: https://github.com/dart-lang/build - path: build_web_compilers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 diff --git a/fixtures/_testSound/pubspec.yaml b/fixtures/_testSound/pubspec.yaml index f690af8eb..6d8808719 100644 --- a/fixtures/_testSound/pubspec.yaml +++ b/fixtures/_testSound/pubspec.yaml @@ -12,52 +12,5 @@ dependencies: path: ^1.8.2 dev_dependencies: - build_runner: ^2.4.0 + build_runner: ^2.5.0 build_web_compilers: ^4.0.4 - -dependency_overrides: - build: - git: - url: https://github.com/dart-lang/build - path: build - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_config: - git: - url: https://github.com/dart-lang/build - path: build_config - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_daemon: - git: - url: https://github.com/dart-lang/build - path: build_daemon - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_modules: - git: - url: https://github.com/dart-lang/build - path: build_modules - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_resolvers: - git: - url: https://github.com/dart-lang/build - path: build_resolvers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner: - git: - url: https://github.com/dart-lang/build - path: build_runner - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner_core: - git: - url: https://github.com/dart-lang/build - path: build_runner_core - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_test: - git: - url: https://github.com/dart-lang/build - path: build_test - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_web_compilers: - git: - url: https://github.com/dart-lang/build - path: build_web_compilers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 diff --git a/fixtures/_webdevSoundSmoke/pubspec.yaml b/fixtures/_webdevSoundSmoke/pubspec.yaml index eeeb18140..123d60f15 100644 --- a/fixtures/_webdevSoundSmoke/pubspec.yaml +++ b/fixtures/_webdevSoundSmoke/pubspec.yaml @@ -7,51 +7,5 @@ environment: sdk: ^3.2.0 dev_dependencies: - build_runner: ^2.4.0 + build_runner: ^2.5.0 build_web_compilers: ^4.0.4 -dependency_overrides: - build: - git: - url: https://github.com/dart-lang/build - path: build - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_config: - git: - url: https://github.com/dart-lang/build - path: build_config - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_daemon: - git: - url: https://github.com/dart-lang/build - path: build_daemon - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_modules: - git: - url: https://github.com/dart-lang/build - path: build_modules - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_resolvers: - git: - url: https://github.com/dart-lang/build - path: build_resolvers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner: - git: - url: https://github.com/dart-lang/build - path: build_runner - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner_core: - git: - url: https://github.com/dart-lang/build - path: build_runner_core - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_test: - git: - url: https://github.com/dart-lang/build - path: build_test - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_web_compilers: - git: - url: https://github.com/dart-lang/build - path: build_web_compilers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 diff --git a/webdev/pubspec.yaml b/webdev/pubspec.yaml index 439042436..5e7ea31f0 100644 --- a/webdev/pubspec.yaml +++ b/webdev/pubspec.yaml @@ -43,7 +43,7 @@ dev_dependencies: analysis_config: path: ../_analysis_config build: ^2.3.0 - build_runner: ^2.4.0 + build_runner: ^2.5.0 build_verify: ^3.0.0 build_version: ^2.1.1 test: ^1.21.1 @@ -55,49 +55,3 @@ dev_dependencies: executables: webdev: -dependency_overrides: - build: - git: - url: https://github.com/dart-lang/build - path: build - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_config: - git: - url: https://github.com/dart-lang/build - path: build_config - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_daemon: - git: - url: https://github.com/dart-lang/build - path: build_daemon - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_modules: - git: - url: https://github.com/dart-lang/build - path: build_modules - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_resolvers: - git: - url: https://github.com/dart-lang/build - path: build_resolvers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner: - git: - url: https://github.com/dart-lang/build - path: build_runner - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_runner_core: - git: - url: https://github.com/dart-lang/build - path: build_runner_core - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_test: - git: - url: https://github.com/dart-lang/build - path: build_test - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 - build_web_compilers: - git: - url: https://github.com/dart-lang/build - path: build_web_compilers - ref: 855dbe5e568aa1f049f19c400afdfe2b35066640 diff --git a/webdev/test/e2e_test.dart b/webdev/test/e2e_test.dart index b8fbc013f..8001202f5 100644 --- a/webdev/test/e2e_test.dart +++ b/webdev/test/e2e_test.dart @@ -10,6 +10,7 @@ import 'dart:io'; import 'package:io/io.dart'; import 'package:logging/logging.dart'; import 'package:path/path.dart' as p; +import 'package:pub_semver/pub_semver.dart'; import 'package:test/test.dart'; import 'package:test_common/utilities.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; @@ -69,8 +70,11 @@ void main() { loadYaml(await File('pubspec.yaml').readAsString()) as YamlMap; expect(smokeYaml['environment']['sdk'], equals(webdevYaml['environment']['sdk'])); - expect(smokeYaml['dev_dependencies']['build_runner'], - equals(buildRunnerConstraint.toString())); + expect( + VersionConstraint.parse(smokeYaml['dev_dependencies']['build_runner']) + .union(buildRunnerConstraint) + .isEmpty, + false); expect(smokeYaml['dev_dependencies']['build_web_compilers'], equals(buildWebCompilersConstraint.toString())); });