Version 2.14.0-114.0.dev
Merge commit '04fb485fd5ca846ee495151cbec64dca2f989525' into 'dev'
diff --git a/DEPS b/DEPS
index 835c510..f0a9838 100644
--- a/DEPS
+++ b/DEPS
@@ -106,7 +106,7 @@
"dart_style_rev": "f17c23e0eea9a870601c19d904e2a9c1a7c81470",
"chromedriver_tag": "83.0.4103.39",
- "dartdoc_rev" : "505f163f7cb48e917503e4a23fbff1227e08b263",
+ "dartdoc_rev" : "e6a9b7c536a85e49233c97bb892bbb0ab778e425",
"devtools_rev" : "12ad5341ae0a275042c84a4e7be9a6c98db65612",
"jsshell_tag": "version:88.0",
"ffi_rev": "f3346299c55669cc0db48afae85b8110088bf8da",
diff --git a/pkg/dds/CHANGELOG.md b/pkg/dds/CHANGELOG.md
index b39156e..d017347 100644
--- a/pkg/dds/CHANGELOG.md
+++ b/pkg/dds/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 1.8.0-dev
+# 1.8.0
- Add support for launching DevTools from DDS.
- Fixed issue where two clients subscribing to the same stream in close succession
could result in DDS sending multiple `streamListen` requests to the VM service.
diff --git a/pkg/dds/pubspec.yaml b/pkg/dds/pubspec.yaml
index a69236c..edc2cfd 100644
--- a/pkg/dds/pubspec.yaml
+++ b/pkg/dds/pubspec.yaml
@@ -3,7 +3,7 @@
A library used to spawn the Dart Developer Service, used to communicate with
a Dart VM Service instance.
-version: 1.8.0-dev
+version: 1.8.0
homepage: https://github.com/dart-lang/sdk/tree/master/pkg/dds
@@ -12,19 +12,19 @@
dependencies:
async: ^2.4.1
- devtools_shared: ^2.0.0
- json_rpc_2: ^2.2.0
+ devtools_shared: ^2.3.0
+ json_rpc_2: ^3.0.0
meta: ^1.1.8
path: ^1.8.0
pedantic: ^1.7.0
shelf: ^1.0.0
shelf_proxy: ^1.0.0
- shelf_static: ^1.0.0-dev
+ shelf_static: ^1.0.0
shelf_web_socket: ^1.0.0
- sse: ^3.7.0
+ sse: ^4.0.0
stream_channel: ^2.0.0
usage: ^4.0.0
- vm_service: ^6.0.1-nullsafety.0
+ vm_service: ^6.0.1
web_socket_channel: ^2.0.0
dev_dependencies:
diff --git a/pkg/vm_snapshot_analysis/test/instruction_sizes_test.dart b/pkg/vm_snapshot_analysis/test/instruction_sizes_test.dart
index faa3f50..d136957 100644
--- a/pkg/vm_snapshot_analysis/test/instruction_sizes_test.dart
+++ b/pkg/vm_snapshot_analysis/test/instruction_sizes_test.dart
@@ -821,14 +821,10 @@
'#type': 'class',
'makeSomeClosures': {
'#type': 'function',
- // Type of returned list is more precise, as closures
- // that returned non-K objects were removed, causing the
- // type K* to be attributed to makeSomeClosures instead
- // of just those inner closures that returned that type.
- '#size': greaterThan(0),
+ '#size': lessThan(0),
'<anonymous closure>': {
'#type': 'function',
- '#size': lessThan(0), // Some inner closures removed.
+ '#size': lessThan(0),
},
},
},
diff --git a/tools/VERSION b/tools/VERSION
index 8dbbac1..4eae23a 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 14
PATCH 0
-PRERELEASE 113
+PRERELEASE 114
PRERELEASE_PATCH 0
\ No newline at end of file
diff --git a/tools/patches/flutter-engine/apply.sh b/tools/patches/flutter-engine/apply.sh
index b5b7e0c5..38ce731 100755
--- a/tools/patches/flutter-engine/apply.sh
+++ b/tools/patches/flutter-engine/apply.sh
@@ -62,7 +62,7 @@
# DEPS file might have been patched with new version of packages that
# Dart SDK depends on. Get information about dependencies from the
# DEPS file and forcefully update checkouts of those dependencies.
- gclient.py revinfo | grep 'src/third_party/dart/third_party' | while read -r line; do
+ gclient.py revinfo --ignore-dep-type=cipd | grep 'src/third_party/dart/third_party' | while read -r line; do
# revinfo would produce lines in the following format:
# path: git-url@tag-or-hash
# Where no spaces occur inside path, git-url or tag-or-hash.
