Skip to content

Commit 6d729b6

Browse files
authored
rev to the latest dart-lang/http and remove older http_multi_server refs (#161067)
- rev to the latest dart-lang/http and remove older refs to dart-lang/http_multi_server This updates the combined flutter+engine repo to account for upstream repo merges (package:http_multi_server ==> dart-lang/http). Main tracking issue: - dart-lang/sdk#56591 *If you had to change anything in the [flutter/tests] repo, include a link to the migration guide as per the [breaking change policy].* ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [ ] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
1 parent 0c3359d commit 6d729b6

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

DEPS

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ vars = {
6464
'dart_boringssl_rev': 'ee0c13ad1808379cf16b371a051ac3951f8a09c1',
6565
'dart_core_rev': '7f9f597e64fa52faebd3c0a2214f61a7b081174d',
6666
'dart_devtools_rev': '3e5327a02693b1405359dc5322d7f0a40151b9b7',
67-
'dart_http_rev': '79470d014b467f01b0e7c5b63ab6c86b22dec8db',
67+
'dart_http_rev': 'c27d6c780bae0207e938f09596c2cf8d9bb4a963',
6868
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
6969
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
7070
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
@@ -165,7 +165,6 @@ vars = {
165165
"upstream_googletest": "https://github.com/google/googletest.git",
166166
"upstream_gtest-parallel": "https://github.com/google/gtest-parallel.git",
167167
"upstream_harfbuzz": "https://github.com/harfbuzz/harfbuzz.git",
168-
"upstream_http_multi_server": "https://github.com/dart-lang/http_multi_server.git",
169168
"upstream_http": "https://github.com/dart-lang/http.git",
170169
"upstream_icu": "https://github.com/unicode-org/icu.git",
171170
"upstream_intl": "https://github.com/dart-lang/intl.git",
@@ -337,9 +336,6 @@ deps = {
337336
'engine/src/flutter/third_party/dart/third_party/pkg/http':
338337
Var('dart_git') + '/http.git' + '@' + Var('dart_http_rev'),
339338

340-
'engine/src/flutter/third_party/dart/third_party/pkg/http_multi_server':
341-
Var('dart_git') + '/http_multi_server.git@f6a748819139b8cbf513d5fc36b10676b0cb066f',
342-
343339
'engine/src/flutter/third_party/dart/third_party/pkg/intl':
344340
Var('dart_git') + '/intl.git@5d65e3808ce40e6282e40881492607df4e35669f',
345341

engine/src/flutter/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ dependency_overrides:
212212
http:
213213
path: ./third_party/dart/third_party/pkg/http/pkgs/http
214214
http_multi_server:
215-
path: ./third_party/dart/third_party/pkg/http_multi_server
215+
path: ./third_party/dart/third_party/pkg/http/pkgs/http_multi_server
216216
http_parser:
217217
path: ./third_party/dart/third_party/pkg/http/pkgs/http_parser
218218
io:

0 commit comments

Comments
 (0)