From 7c6a9891045f3ffdfb246bbc330d20e77fd2421d Mon Sep 17 00:00:00 2001 From: Anna Gringauze Date: Tue, 17 Aug 2021 17:10:27 -0700 Subject: [PATCH 1/4] Update versions and build --- dwds/CHANGELOG.md | 2 +- dwds/lib/src/injected/client.js | 11 ++++++----- dwds/lib/src/version.dart | 2 +- dwds/pubspec.yaml | 4 ++-- webdev/pubspec.yaml | 6 +++++- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md index 495205864..120a41f69 100644 --- a/dwds/CHANGELOG.md +++ b/dwds/CHANGELOG.md @@ -1,4 +1,4 @@ -## 11.2.1-dev +## 11.2.1 - Recover from used port errors when starting debug service. diff --git a/dwds/lib/src/injected/client.js b/dwds/lib/src/injected/client.js index fa5daca38..10bd83d76 100644 --- a/dwds/lib/src/injected/client.js +++ b/dwds/lib/src/injected/client.js @@ -1,4 +1,4 @@ -// Generated by dart2js (NullSafetyMode.unsound, no-legacy-javascript), the Dart to JavaScript compiler version: 2.14.0-374.0.dev. +// Generated by dart2js (NullSafetyMode.unsound, no-legacy-javascript), the Dart to JavaScript compiler version: 2.15.0-19.0.dev. // The code supports the following hooks: // dartPrint(message): // if this function is defined it is called instead of the Dart [print] @@ -4169,9 +4169,10 @@ _._disconnected = false; _.$ti = t0; }, - GuaranteeChannel_closure: function GuaranteeChannel_closure(t0, t1) { + GuaranteeChannel_closure: function GuaranteeChannel_closure(t0, t1, t2) { this._box_0 = t0; this.$this = t1; + this.T = t2; }, GuaranteeChannel__closure: function GuaranteeChannel__closure(t0) { this.$this = t0; @@ -21446,7 +21447,7 @@ if (elements1 === elements2) return true; t2 = this._elementEquality; - counts = P.HashMap_HashMap(t2.get$equals(), t2.get$hash(t2), t2.get$isValidKey(), t1._eval$1("_UnorderedEquality.E"), type$.dynamic); + counts = P.HashMap_HashMap(t1._eval$1("bool(_UnorderedEquality.E,_UnorderedEquality.E)")._as(t2.get$equals()), t1._eval$1("int(_UnorderedEquality.E)")._as(t2.get$hash(t2)), t2.get$isValidKey(), t1._eval$1("_UnorderedEquality.E"), type$.dynamic); for (t1 = J.get$iterator$ax(elements1), $length = 0; t1.moveNext$0();) { e = t1.get$current(t1); count = counts.$index(0, e); @@ -23526,7 +23527,7 @@ _this.set$__GuaranteeChannel__sink(t2); else H.throwExpression(H.LateError$fieldAI("_sink")); - t1 = t1._eval$1("StreamController<1>")._as(P.StreamController_StreamController(null, new K.GuaranteeChannel_closure(_box_0, _this), true, $T)); + t1 = t1._eval$1("StreamController<1>")._as(P.StreamController_StreamController(null, new K.GuaranteeChannel_closure(_box_0, _this, $T), true, $T)); if (_this.__GuaranteeChannel__streamController === $) _this.set$__GuaranteeChannel__streamController(t1); else @@ -23557,7 +23558,7 @@ return; t2 = this._box_0.innerStream; t3 = t1.get$_streamController(); - t1.set$_guarantee_channel$_subscription(t2.listen$3$onDone$onError(t3.get$add(t3), new K.GuaranteeChannel__closure(t1), t1.get$_streamController().get$addError())); + t1.set$_guarantee_channel$_subscription(t2.listen$3$onDone$onError(this.T._eval$1("~(0)")._as(t3.get$add(t3)), new K.GuaranteeChannel__closure(t1), t1.get$_streamController().get$addError())); }, $signature: 0 }; diff --git a/dwds/lib/src/version.dart b/dwds/lib/src/version.dart index b419d06dd..0f3cb58bd 100644 --- a/dwds/lib/src/version.dart +++ b/dwds/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '11.2.1-dev'; +const packageVersion = '11.2.1'; diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml index 013dcd429..0ad5e1d81 100644 --- a/dwds/pubspec.yaml +++ b/dwds/pubspec.yaml @@ -1,13 +1,13 @@ name: dwds # Every time this changes you need to run `pub run build_runner build`. -version: 11.2.1-dev +version: 11.2.1 homepage: https://github.com/dart-lang/webdev/tree/master/dwds description: >- A service that proxies between the Chrome debug protocol and the Dart VM service protocol. environment: - sdk: ">=2.13.0-144.0.dev <3.0.0" + sdk: ">=2.13.4 <3.0.0" dependencies: async: ^2.3.0 diff --git a/webdev/pubspec.yaml b/webdev/pubspec.yaml index 1b217313c..4b5710bea 100644 --- a/webdev/pubspec.yaml +++ b/webdev/pubspec.yaml @@ -9,7 +9,7 @@ description: >- features for users and tools to build and deploy web applications with Dart. environment: - sdk: ">=2.13.0 <3.0.0" + sdk: ">=2.13.4 <3.0.0" dependencies: args: ^2.0.0 @@ -50,5 +50,9 @@ dev_dependencies: test_process: ^2.0.2 webdriver: ^3.0.0 +dependency_overrides: + dwds: + path: ../dwds + executables: webdev: From b1a7882abb000a8b286aea74721043cac80b13d8 Mon Sep 17 00:00:00 2001 From: Anna Gringauze Date: Tue, 17 Aug 2021 17:29:18 -0700 Subject: [PATCH 2/4] Update SDK version for smoke tests --- 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 4f79334ab..bb547979a 100644 --- a/fixtures/_webdevSmoke/pubspec.yaml +++ b/fixtures/_webdevSmoke/pubspec.yaml @@ -7,7 +7,7 @@ description: A test fixture for webdev testing. # and build_web_compilers constraint should match those defined # in pubspec.dart. environment: - sdk: '>=2.13.0 <3.0.0' + sdk: '>=2.13.4 <3.0.0' dev_dependencies: build_runner: '>=1.6.2 <3.0.0' diff --git a/fixtures/_webdevSoundSmoke/pubspec.yaml b/fixtures/_webdevSoundSmoke/pubspec.yaml index 8105d259d..a85a32fe4 100644 --- a/fixtures/_webdevSoundSmoke/pubspec.yaml +++ b/fixtures/_webdevSoundSmoke/pubspec.yaml @@ -2,7 +2,7 @@ name: _webdev_smoke description: A test fixture for webdev testing with sound support. environment: - sdk: '>=2.12.0-259.0.dev <3.0.0' + sdk: '>=2.13.4 <3.0.0' dev_dependencies: build_runner: '>=1.6.2 <3.0.0' From 63bc7095399ed97e4b8982c7f333fcdf084104bb Mon Sep 17 00:00:00 2001 From: Anna Gringauze Date: Wed, 18 Aug 2021 09:09:58 -0700 Subject: [PATCH 3/4] Addressed CR comments - Changed min sdk constraint to 2.13.0, updated changelog. --- dwds/pubspec.yaml | 2 +- fixtures/_webdevSmoke/pubspec.yaml | 2 +- fixtures/_webdevSoundSmoke/pubspec.yaml | 2 +- webdev/pubspec.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml index 0ad5e1d81..f296ed5f4 100644 --- a/dwds/pubspec.yaml +++ b/dwds/pubspec.yaml @@ -7,7 +7,7 @@ description: >- service protocol. environment: - sdk: ">=2.13.4 <3.0.0" + sdk: ">=2.13.0 <3.0.0" dependencies: async: ^2.3.0 diff --git a/fixtures/_webdevSmoke/pubspec.yaml b/fixtures/_webdevSmoke/pubspec.yaml index bb547979a..4f79334ab 100644 --- a/fixtures/_webdevSmoke/pubspec.yaml +++ b/fixtures/_webdevSmoke/pubspec.yaml @@ -7,7 +7,7 @@ description: A test fixture for webdev testing. # and build_web_compilers constraint should match those defined # in pubspec.dart. environment: - sdk: '>=2.13.4 <3.0.0' + sdk: '>=2.13.0 <3.0.0' dev_dependencies: build_runner: '>=1.6.2 <3.0.0' diff --git a/fixtures/_webdevSoundSmoke/pubspec.yaml b/fixtures/_webdevSoundSmoke/pubspec.yaml index a85a32fe4..aa890a992 100644 --- a/fixtures/_webdevSoundSmoke/pubspec.yaml +++ b/fixtures/_webdevSoundSmoke/pubspec.yaml @@ -2,7 +2,7 @@ name: _webdev_smoke description: A test fixture for webdev testing with sound support. environment: - sdk: '>=2.13.4 <3.0.0' + sdk: '>=2.13.0 <3.0.0' dev_dependencies: build_runner: '>=1.6.2 <3.0.0' diff --git a/webdev/pubspec.yaml b/webdev/pubspec.yaml index 4b5710bea..cfd1b018b 100644 --- a/webdev/pubspec.yaml +++ b/webdev/pubspec.yaml @@ -9,7 +9,7 @@ description: >- features for users and tools to build and deploy web applications with Dart. environment: - sdk: ">=2.13.4 <3.0.0" + sdk: ">=2.13.0 <3.0.0" dependencies: args: ^2.0.0 From e7a972f4079d303369530ebce8642bc04ca45755 Mon Sep 17 00:00:00 2001 From: Anna Gringauze Date: Wed, 18 Aug 2021 09:16:51 -0700 Subject: [PATCH 4/4] Update changelog --- dwds/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md index 120a41f69..d313bb8b5 100644 --- a/dwds/CHANGELOG.md +++ b/dwds/CHANGELOG.md @@ -1,6 +1,7 @@ ## 11.2.1 - Recover from used port errors when starting debug service. +- Update min SDK constraint to `2.13.0`. ## 11.2.0