diff --git a/fixtures/_experimentSound/pubspec.yaml b/fixtures/_experimentSound/pubspec.yaml index 12760da0f..5733fc913 100644 --- a/fixtures/_experimentSound/pubspec.yaml +++ b/fixtures/_experimentSound/pubspec.yaml @@ -14,3 +14,49 @@ dependencies: dev_dependencies: build_runner: ^2.4.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 f5c9f5e56..2f7fe4cfb 100644 --- a/fixtures/_testCircular1Sound/pubspec.yaml +++ b/fixtures/_testCircular1Sound/pubspec.yaml @@ -17,3 +17,49 @@ dev_dependencies: build_runner: ^2.4.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 c60a49687..a0735a075 100644 --- a/fixtures/_testCircular2Sound/pubspec.yaml +++ b/fixtures/_testCircular2Sound/pubspec.yaml @@ -15,3 +15,49 @@ dev_dependencies: build_runner: ^2.4.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 3354b80f9..8520a6d64 100644 --- a/fixtures/_testHotReload/pubspec.yaml +++ b/fixtures/_testHotReload/pubspec.yaml @@ -7,3 +7,49 @@ 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 0bfea2e10..e20c45c33 100644 --- a/fixtures/_testHotRestart1Sound/pubspec.yaml +++ b/fixtures/_testHotRestart1Sound/pubspec.yaml @@ -15,3 +15,49 @@ dev_dependencies: build_runner: ^2.4.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 f0967ff53..ebaa69a25 100644 --- a/fixtures/_testHotRestart2Sound/pubspec.yaml +++ b/fixtures/_testHotRestart2Sound/pubspec.yaml @@ -17,3 +17,49 @@ dev_dependencies: build_runner: ^2.4.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 12a48a557..cf3b81881 100644 --- a/fixtures/_testHotRestartBreakpoints/pubspec.yaml +++ b/fixtures/_testHotRestartBreakpoints/pubspec.yaml @@ -7,3 +7,49 @@ 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 965cc97b5..448515e0a 100644 --- a/fixtures/_testPackageSound/pubspec.yaml +++ b/fixtures/_testPackageSound/pubspec.yaml @@ -15,3 +15,49 @@ dev_dependencies: build_runner: ^2.4.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 59c75eb4a..f690af8eb 100644 --- a/fixtures/_testSound/pubspec.yaml +++ b/fixtures/_testSound/pubspec.yaml @@ -15,3 +15,49 @@ dev_dependencies: build_runner: ^2.4.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 edf964a16..eeeb18140 100644 --- a/fixtures/_webdevSoundSmoke/pubspec.yaml +++ b/fixtures/_webdevSoundSmoke/pubspec.yaml @@ -9,3 +9,49 @@ environment: dev_dependencies: build_runner: ^2.4.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 591ff2218..439042436 100644 --- a/webdev/pubspec.yaml +++ b/webdev/pubspec.yaml @@ -55,3 +55,49 @@ 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 4a4e4a579..b8fbc013f 100644 --- a/webdev/test/e2e_test.dart +++ b/webdev/test/e2e_test.dart @@ -88,13 +88,11 @@ void main() { await expectLater( process.stdout, - emitsThrough( - contains('Unable to create merged directory at ${d.sandbox}.'))); - await expectLater( - process.stdout, - emitsThrough( - 'Choose a different directory or delete the contents of that ' - 'directory.')); + emitsThrough(contains( + 'Unable to create merged directory ${d.sandbox}. ' + 'Choose a different directory or delete the contents of that ' + 'directory.', + ))); await process.shouldExit(isNot(0)); }); @@ -113,7 +111,7 @@ void main() { final process = await testRunner.runWebDev(args, workingDirectory: soundExampleDirectory); - await checkProcessStdout(process, ['Writing asset manifest completed']); + await checkProcessStdout(process, ['Built with build_runner']); await process.shouldExit(0); }, // https://github.com/dart-lang/webdev/issues/2489, @@ -133,7 +131,7 @@ void main() { final process = await testRunner.runWebDev(args, workingDirectory: soundExampleDirectory); - final expectedItems = ['Writing asset manifest completed']; + final expectedItems = ['Built with build_runner']; await checkProcessStdout(process, expectedItems); await process.shouldExit(0); @@ -166,7 +164,7 @@ void main() { final process = await testRunner.runWebDev(args, workingDirectory: soundExampleDirectory); - final expectedItems = ['Writing asset manifest completed']; + final expectedItems = ['Built with build_runner']; await checkProcessStdout(process, expectedItems); await process.shouldExit(0); @@ -189,9 +187,7 @@ void main() { final process = await testRunner.runWebDev(args, workingDirectory: soundExampleDirectory); - final expectedItems = [ - 'Caching finalized dependency graph completed' - ]; + final expectedItems = ['Built with build_runner']; await checkProcessStdout(process, expectedItems); await process.shouldExit(0); @@ -218,9 +214,7 @@ void main() { // Wait for the initial build to finish. await expectLater( - process.stdout, - emitsThrough( - contains('Caching finalized dependency graph completed'))); + process.stdout, emitsThrough(contains('Built with build_runner'))); final client = HttpClient(); diff --git a/webdev/test/tls_test.dart b/webdev/test/tls_test.dart index 43a95e8e9..4aac11828 100644 --- a/webdev/test/tls_test.dart +++ b/webdev/test/tls_test.dart @@ -57,7 +57,8 @@ void main() { final process = await testRunner.runWebDev(args, workingDirectory: exampleDirectory); - await expectLater(process.stdout, emitsThrough(contains('Succeeded'))); + await expectLater( + process.stdout, emitsThrough(contains('Built with build_runner'))); final client = HttpClient() ..badCertificateCallback = (_, __, ___) => true; @@ -86,7 +87,8 @@ void main() { final process = await testRunner.runWebDev(args, workingDirectory: exampleDirectory); - await expectLater(process.stdout, emitsThrough(contains('Succeeded'))); + await expectLater( + process.stdout, emitsThrough(contains('Built with build_runner'))); final interfaces = await NetworkInterface.list( type: InternetAddressType.IPv4,