From 6e0b9db0e2cac88e239cf6632e44c24d1dd9782e Mon Sep 17 00:00:00 2001 From: Elliott Brooks <21270878+elliette@users.noreply.github.com> Date: Thu, 8 Dec 2022 14:47:58 -0800 Subject: [PATCH 1/7] Update SDK constraint --- dwds/debug_extension/pubspec.yaml | 2 +- dwds/debug_extension_mv3/pubspec.yaml | 2 +- dwds/pubspec.yaml | 2 +- example/pubspec.yaml | 2 +- fixtures/_test/pubspec.yaml | 2 +- fixtures/_testCircular1/pubspec.yaml | 2 +- fixtures/_testCircular1Sound/pubspec.yaml | 2 +- fixtures/_testCircular2/pubspec.yaml | 2 +- fixtures/_testCircular2Sound/pubspec.yaml | 2 +- fixtures/_testPackage/pubspec.yaml | 2 +- fixtures/_testPackageSound/pubspec.yaml | 2 +- fixtures/_testSound/pubspec.yaml | 2 +- fixtures/_webdevSmoke/pubspec.yaml | 4 ++-- fixtures/_webdevSoundSmoke/pubspec.yaml | 4 ++-- frontend_server_client/pubspec.yaml | 2 +- frontend_server_client/test/frontend_sever_client_test.dart | 2 +- frontend_server_common/pubspec.yaml | 2 +- webdev/lib/src/pubspec.dart | 2 +- webdev/pubspec.yaml | 2 +- webdev/test/integration_test.dart | 2 +- 20 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dwds/debug_extension/pubspec.yaml b/dwds/debug_extension/pubspec.yaml index 8bbc7e4a5..786bf985c 100644 --- a/dwds/debug_extension/pubspec.yaml +++ b/dwds/debug_extension/pubspec.yaml @@ -6,7 +6,7 @@ description: >- A chrome extension for Dart debugging. environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.12.0 <4.0.0' dependencies: async: ^2.3.0 diff --git a/dwds/debug_extension_mv3/pubspec.yaml b/dwds/debug_extension_mv3/pubspec.yaml index f256afbaa..238f6735b 100644 --- a/dwds/debug_extension_mv3/pubspec.yaml +++ b/dwds/debug_extension_mv3/pubspec.yaml @@ -6,7 +6,7 @@ description: >- A Chrome extension for Dart debugging. environment: - sdk: '>=2.18.0 <3.0.0' + sdk: '>=2.18.0 <4.0.0' dependencies: built_value: ^8.3.0 diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml index b26b45cf8..6db9dbbcf 100644 --- a/dwds/pubspec.yaml +++ b/dwds/pubspec.yaml @@ -7,7 +7,7 @@ description: >- repository: https://github.com/dart-lang/webdev/tree/master/dwds environment: - sdk: ">=2.18.0 <3.0.0" + sdk: ">=2.18.0 <4.0.0" dependencies: async: ^2.9.0 diff --git a/example/pubspec.yaml b/example/pubspec.yaml index e577d4df7..66dc57b04 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -4,7 +4,7 @@ description: A web app example for webdev CLI. publish_to: none environment: - sdk: ">=2.18.0 <3.0.0" + sdk: ">=2.18.0 <4.0.0" dev_dependencies: build_runner: ^2.0.0 diff --git a/fixtures/_test/pubspec.yaml b/fixtures/_test/pubspec.yaml index 51e52d58c..c3fd2dc83 100644 --- a/fixtures/_test/pubspec.yaml +++ b/fixtures/_test/pubspec.yaml @@ -9,7 +9,7 @@ description: >- publish_to: none environment: - sdk: ">=2.5.0 <3.0.0" + sdk: ">=2.5.0 <4.0.0" dependencies: intl: ^0.16.0 diff --git a/fixtures/_testCircular1/pubspec.yaml b/fixtures/_testCircular1/pubspec.yaml index f42bf6aa3..07c266aeb 100644 --- a/fixtures/_testCircular1/pubspec.yaml +++ b/fixtures/_testCircular1/pubspec.yaml @@ -9,7 +9,7 @@ description: >- publish_to: none environment: - sdk: ">=2.5.0 <3.0.0" + sdk: ">=2.5.0 <4.0.0" dependencies: intl: ^0.16.0 diff --git a/fixtures/_testCircular1Sound/pubspec.yaml b/fixtures/_testCircular1Sound/pubspec.yaml index 5b6386c18..9b0c8d467 100644 --- a/fixtures/_testCircular1Sound/pubspec.yaml +++ b/fixtures/_testCircular1Sound/pubspec.yaml @@ -5,7 +5,7 @@ description: >- publish_to: none environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.12.0 <4.0.0' dependencies: intl: ^0.16.0 diff --git a/fixtures/_testCircular2/pubspec.yaml b/fixtures/_testCircular2/pubspec.yaml index 13f43ac70..4f3b21ca2 100644 --- a/fixtures/_testCircular2/pubspec.yaml +++ b/fixtures/_testCircular2/pubspec.yaml @@ -9,7 +9,7 @@ description: >- publish_to: none environment: - sdk: ">=2.10.0 <3.0.0" + sdk: ">=2.10.0 <4.0.0" dependencies: _test_circular1: diff --git a/fixtures/_testCircular2Sound/pubspec.yaml b/fixtures/_testCircular2Sound/pubspec.yaml index bee2c2c3d..9725a44ac 100644 --- a/fixtures/_testCircular2Sound/pubspec.yaml +++ b/fixtures/_testCircular2Sound/pubspec.yaml @@ -5,7 +5,7 @@ description: >- publish_to: none environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.12.0 <4.0.0' dependencies: _test_circular1_sound: diff --git a/fixtures/_testPackage/pubspec.yaml b/fixtures/_testPackage/pubspec.yaml index 070e0b21f..77e8e06b3 100644 --- a/fixtures/_testPackage/pubspec.yaml +++ b/fixtures/_testPackage/pubspec.yaml @@ -9,7 +9,7 @@ description: >- publish_to: none environment: - sdk: ">=2.10.0 <3.0.0" + sdk: ">=2.10.0 <4.0.0" dependencies: _test: diff --git a/fixtures/_testPackageSound/pubspec.yaml b/fixtures/_testPackageSound/pubspec.yaml index 1f30b5fca..a91eeced5 100644 --- a/fixtures/_testPackageSound/pubspec.yaml +++ b/fixtures/_testPackageSound/pubspec.yaml @@ -5,7 +5,7 @@ description: >- publish_to: none environment: - sdk: '>=2.13.0 <3.0.0' + sdk: '>=2.13.0 <4.0.0' dependencies: _test_sound: diff --git a/fixtures/_testSound/pubspec.yaml b/fixtures/_testSound/pubspec.yaml index 438fd0eb1..529af3e73 100644 --- a/fixtures/_testSound/pubspec.yaml +++ b/fixtures/_testSound/pubspec.yaml @@ -5,7 +5,7 @@ description: >- publish_to: none environment: - sdk: '>=2.13.0 <3.0.0' + sdk: '>=2.13.0 <4.0.0' dependencies: intl: ^0.17.0 diff --git a/fixtures/_webdevSmoke/pubspec.yaml b/fixtures/_webdevSmoke/pubspec.yaml index 8af120f31..d28c6d200 100644 --- a/fixtures/_webdevSmoke/pubspec.yaml +++ b/fixtures/_webdevSmoke/pubspec.yaml @@ -13,8 +13,8 @@ description: # and build_web_compilers constraint should match those defined # in pubspec.dart. environment: - sdk: '>=2.18.0 <3.0.0' + sdk: '>=2.18.0 <4.0.0' dev_dependencies: - build_runner: '>=1.6.2 <3.0.0' + build_runner: '>=1.6.2 <4.0.0' build_web_compilers: '>=2.12.0 <4.0.0' diff --git a/fixtures/_webdevSoundSmoke/pubspec.yaml b/fixtures/_webdevSoundSmoke/pubspec.yaml index 6b6efe88e..67fa40759 100644 --- a/fixtures/_webdevSoundSmoke/pubspec.yaml +++ b/fixtures/_webdevSoundSmoke/pubspec.yaml @@ -2,9 +2,9 @@ name: _webdev_smoke description: A test fixture for webdev testing with sound support. environment: - sdk: '>=2.18.0 <3.0.0' + sdk: '>=2.18.0 <4.0.0' dev_dependencies: - build_runner: '>=1.6.2 <3.0.0' + build_runner: '>=1.6.2 <4.0.0' build_web_compilers: '>=2.12.0 <4.0.0' diff --git a/frontend_server_client/pubspec.yaml b/frontend_server_client/pubspec.yaml index c289abc59..3e976e705 100644 --- a/frontend_server_client/pubspec.yaml +++ b/frontend_server_client/pubspec.yaml @@ -6,7 +6,7 @@ description: >- repository: https://github.com/dart-lang/webdev/tree/master/frontend_server_client environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" dependencies: async: ^2.5.0 diff --git a/frontend_server_client/test/frontend_sever_client_test.dart b/frontend_server_client/test/frontend_sever_client_test.dart index 87e0b8da9..39e81461b 100644 --- a/frontend_server_client/test/frontend_sever_client_test.dart +++ b/frontend_server_client/test/frontend_sever_client_test.dart @@ -28,7 +28,7 @@ dependencies: path: ^1.0.0 environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.12.0 <4.0.0' '''), d.dir('bin', [ d.file('main.dart', ''' diff --git a/frontend_server_common/pubspec.yaml b/frontend_server_common/pubspec.yaml index 1d063dfa4..becf67a52 100644 --- a/frontend_server_common/pubspec.yaml +++ b/frontend_server_common/pubspec.yaml @@ -3,7 +3,7 @@ publish_to: none description: >- Frontend server integration code to use for dwds tests. Mimics flutter code. environment: - sdk: ">=2.18.0 <3.0.0" + sdk: ">=2.18.0 <4.0.0" dependencies: dwds: diff --git a/webdev/lib/src/pubspec.dart b/webdev/lib/src/pubspec.dart index 134b1900c..7efb83964 100644 --- a/webdev/lib/src/pubspec.dart +++ b/webdev/lib/src/pubspec.dart @@ -161,7 +161,7 @@ Future> _validateBuildDaemonVersion( return issues; } -final buildRunnerConstraint = VersionConstraint.parse('>=1.6.2 <3.0.0'); +final buildRunnerConstraint = VersionConstraint.parse('>=1.6.2 <4.0.0'); final buildWebCompilersConstraint = VersionConstraint.parse('>=2.12.0 <4.0.0'); // Note the minimum versions should never be dev versions as users will not diff --git a/webdev/pubspec.yaml b/webdev/pubspec.yaml index 3be2614f1..1a6e7c9bf 100644 --- a/webdev/pubspec.yaml +++ b/webdev/pubspec.yaml @@ -9,7 +9,7 @@ description: >- repository: https://github.com/dart-lang/webdev/tree/master/webdev environment: - sdk: ">=2.18.0 <3.0.0" + sdk: ">=2.18.0 <4.0.0" dependencies: args: ^2.3.1 diff --git a/webdev/test/integration_test.dart b/webdev/test/integration_test.dart index cfadf8ca9..e9b415d49 100644 --- a/webdev/test/integration_test.dart +++ b/webdev/test/integration_test.dart @@ -158,7 +158,7 @@ name: sample switch (entry.key) { case 'build_runner': buildRunnerVersion = version; - supportedRange = '>=$_supportedBuildRunnerVersion <3.0.0'; + supportedRange = '>=$_supportedBuildRunnerVersion <4.0.0'; break; case 'build_web_compilers': webCompilersVersion = version; From 2c2a3948adb05b180a69ed4a86bb7704ceff7db1 Mon Sep 17 00:00:00 2001 From: Elliott Brooks <21270878+elliette@users.noreply.github.com> Date: Thu, 8 Dec 2022 16:00:58 -0800 Subject: [PATCH 2/7] Update min SDK test --- dwds/test/build/min_sdk_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dwds/test/build/min_sdk_test.dart b/dwds/test/build/min_sdk_test.dart index 8d7817f54..8001556be 100644 --- a/dwds/test/build/min_sdk_test.dart +++ b/dwds/test/build/min_sdk_test.dart @@ -16,7 +16,7 @@ void main() { var sdkVersion = Version.parse(Platform.version.split(' ')[0]); sdkVersion = Version(sdkVersion.major, sdkVersion.minor, 0); - final sdkConstraint = VersionConstraint.compatibleWith(sdkVersion); + final sdkConstraint = VersionConstraint.parse('>=$sdkVersion <4.0.0'); final pubspecSdkConstraint = pubspec.environment?['sdk']; expect(pubspecSdkConstraint, isNotNull); expect(sdkConstraint.allowsAll(pubspecSdkConstraint!), true, From e4659f484350786178757902136e4add804ead52 Mon Sep 17 00:00:00 2001 From: Elliott Brooks <21270878+elliette@users.noreply.github.com> Date: Thu, 8 Dec 2022 16:05:39 -0800 Subject: [PATCH 3/7] Update test again --- dwds/test/build/min_sdk_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dwds/test/build/min_sdk_test.dart b/dwds/test/build/min_sdk_test.dart index 8001556be..8bc7e3eac 100644 --- a/dwds/test/build/min_sdk_test.dart +++ b/dwds/test/build/min_sdk_test.dart @@ -23,7 +23,7 @@ void main() { reason: 'Min sdk constraint is outdated. Please update SDK constraint in ' 'pubspec to allow latest stable and backwards compatible versions.' - '\n Current stable: $sdkVersion,' + '\n Expected version constraint: $sdkConstraint,' '\n Dwds pubspec constraint: $pubspecSdkConstraint'); }); } From 132d1e40635e68233dfd32ffc8015b142b3ae792 Mon Sep 17 00:00:00 2001 From: Elliott Brooks <21270878+elliette@users.noreply.github.com> Date: Thu, 8 Dec 2022 16:08:59 -0800 Subject: [PATCH 4/7] Update webdev test --- webdev/test/build/min_sdk_test.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webdev/test/build/min_sdk_test.dart b/webdev/test/build/min_sdk_test.dart index 9a12dbab8..d5b1c6089 100644 --- a/webdev/test/build/min_sdk_test.dart +++ b/webdev/test/build/min_sdk_test.dart @@ -16,13 +16,13 @@ void main() { var sdkVersion = Version.parse(Platform.version.split(' ')[0]); sdkVersion = Version(sdkVersion.major, sdkVersion.minor, 0); - var sdkConstraint = VersionConstraint.compatibleWith(sdkVersion); + var sdkConstraint = VersionConstraint.parse('>=$sdkVersion <4.0.0'); var pubspecSdkConstraint = pubspec.environment!['sdk']!; expect(sdkConstraint.allowsAll(pubspecSdkConstraint), true, reason: 'Min sdk constraint is outdated. Please update SDK constraint in ' 'pubspec to allow latest stable and backwards compatible versions.' - '\n Current stable: $sdkVersion, ' + '\n Expected version constraint: $sdkConstraint,' '\n Webdev pubspec constraint: $pubspecSdkConstraint'); }); } From 537b1dbc13278d22324590c15f8646de4b04c188 Mon Sep 17 00:00:00 2001 From: Elliott Brooks <21270878+elliette@users.noreply.github.com> Date: Thu, 8 Dec 2022 16:34:20 -0800 Subject: [PATCH 5/7] Update invalid build_runner version --- webdev/test/integration_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webdev/test/integration_test.dart b/webdev/test/integration_test.dart index e9b415d49..c64723ebf 100644 --- a/webdev/test/integration_test.dart +++ b/webdev/test/integration_test.dart @@ -65,7 +65,7 @@ name: sample }); var invalidRanges = >{ - 'build_runner': ['0.8.9', '3.0.0'], + 'build_runner': ['0.8.9', '4.0.0'], 'build_web_compilers': ['0.3.5', '4.0.0'], 'build_daemon': ['0.3.0', '4.0.0'], }; From 285160df8f30c5302340a1fa850fa2352b8cc6bc Mon Sep 17 00:00:00 2001 From: Elliott Brooks <21270878+elliette@users.noreply.github.com> Date: Thu, 8 Dec 2022 16:37:30 -0800 Subject: [PATCH 6/7] Undo build_runner version changes --- webdev/lib/src/pubspec.dart | 2 +- webdev/test/integration_test.dart | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/webdev/lib/src/pubspec.dart b/webdev/lib/src/pubspec.dart index 7efb83964..134b1900c 100644 --- a/webdev/lib/src/pubspec.dart +++ b/webdev/lib/src/pubspec.dart @@ -161,7 +161,7 @@ Future> _validateBuildDaemonVersion( return issues; } -final buildRunnerConstraint = VersionConstraint.parse('>=1.6.2 <4.0.0'); +final buildRunnerConstraint = VersionConstraint.parse('>=1.6.2 <3.0.0'); final buildWebCompilersConstraint = VersionConstraint.parse('>=2.12.0 <4.0.0'); // Note the minimum versions should never be dev versions as users will not diff --git a/webdev/test/integration_test.dart b/webdev/test/integration_test.dart index c64723ebf..cfadf8ca9 100644 --- a/webdev/test/integration_test.dart +++ b/webdev/test/integration_test.dart @@ -65,7 +65,7 @@ name: sample }); var invalidRanges = >{ - 'build_runner': ['0.8.9', '4.0.0'], + 'build_runner': ['0.8.9', '3.0.0'], 'build_web_compilers': ['0.3.5', '4.0.0'], 'build_daemon': ['0.3.0', '4.0.0'], }; @@ -158,7 +158,7 @@ name: sample switch (entry.key) { case 'build_runner': buildRunnerVersion = version; - supportedRange = '>=$_supportedBuildRunnerVersion <4.0.0'; + supportedRange = '>=$_supportedBuildRunnerVersion <3.0.0'; break; case 'build_web_compilers': webCompilersVersion = version; From 1b6eea99baa6b782c521a4c1a4696403bfa71226 Mon Sep 17 00:00:00 2001 From: Elliott Brooks <21270878+elliette@users.noreply.github.com> Date: Thu, 8 Dec 2022 16:39:23 -0800 Subject: [PATCH 7/7] Missed some build_runner changes --- fixtures/_webdevSmoke/pubspec.yaml | 2 +- fixtures/_webdevSoundSmoke/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fixtures/_webdevSmoke/pubspec.yaml b/fixtures/_webdevSmoke/pubspec.yaml index d28c6d200..fc903245a 100644 --- a/fixtures/_webdevSmoke/pubspec.yaml +++ b/fixtures/_webdevSmoke/pubspec.yaml @@ -16,5 +16,5 @@ environment: sdk: '>=2.18.0 <4.0.0' dev_dependencies: - build_runner: '>=1.6.2 <4.0.0' + build_runner: '>=1.6.2 <3.0.0' build_web_compilers: '>=2.12.0 <4.0.0' diff --git a/fixtures/_webdevSoundSmoke/pubspec.yaml b/fixtures/_webdevSoundSmoke/pubspec.yaml index 67fa40759..e108d9134 100644 --- a/fixtures/_webdevSoundSmoke/pubspec.yaml +++ b/fixtures/_webdevSoundSmoke/pubspec.yaml @@ -5,6 +5,6 @@ environment: sdk: '>=2.18.0 <4.0.0' dev_dependencies: - build_runner: '>=1.6.2 <4.0.0' + build_runner: '>=1.6.2 <3.0.0' build_web_compilers: '>=2.12.0 <4.0.0'