Skip to content

Commit 4446e3e

Browse files
authored
Revert "Roll Dart SDK from 692562354d6d to d3b8091c30f0 (1 revision) (flutter#34273)" (flutter#34281)
This reverts commit 9508a36.
1 parent e752095 commit 4446e3e

File tree

3 files changed

+29
-64
lines changed

3 files changed

+29
-64
lines changed

DEPS

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ vars = {
4545
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS.
4646
# You can use //tools/dart/create_updated_flutter_deps.py to produce
4747
# updated revision list of existing dependencies.
48-
'dart_revision': 'd3b8091c30f023aaf482a6bde81ce202085c4719',
48+
'dart_revision': '692562354d6d9585c73ff130af7105fb92c13101',
4949

5050
# WARNING: DO NOT EDIT MANUALLY
5151
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -54,7 +54,7 @@ vars = {
5454
'dart_browser_launcher_rev': '981ca8847dd2b0fe022f9e742045cfb8f214d35f',
5555
'dart_clock_rev': 'a75eb69c8e939e2e7eab70e4728da3bcf004e717',
5656
'dart_collection_rev': '414ffa1bc8ba18bd608bbf916d95715311d89ac1',
57-
'dart_devtools_rev': '0aa619c42a68d6db4c94a7838121811aba8f5eb1',
57+
'dart_devtools_rev': '51ac983d2db7eb19b3ce5956cb70b769d74fe784',
5858
'dart_protobuf_rev': '3149f6f2d323e11dbcc983b7ac8b3b9e9d686293',
5959
'dart_pub_rev': '9bf4289d6fd5d6872a8929d6312bbd7098f3ea9c',
6060
'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
@@ -173,7 +173,7 @@ deps = {
173173
# WARNING: Unused Dart dependencies in the list below till "WARNING:" marker are removed automatically - see create_updated_flutter_deps.py.
174174

175175
'src/third_party/dart/third_party/devtools':
176-
{'packages': [{'version': 'git_revision:0aa619c42a68d6db4c94a7838121811aba8f5eb1', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
176+
{'packages': [{'version': 'git_revision:51ac983d2db7eb19b3ce5956cb70b769d74fe784', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
177177

178178
'src/third_party/dart/third_party/pkg/args':
179179
Var('dart_git') + '/args.git@73e8d3b55cbedc9765f8e266f3422d8914f8e62a',

ci/licenses_golden/licenses_third_party

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: f26791c387acff0413d2e29dc9b253d7
1+
Signature: 66371714f587d7b7751db0b42ddb833c
22

33
UNUSED LICENSES:
44

sky/packages/sky_engine/LICENSE

+25-60
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ libwebp
300300
pkg
301301
txt
302302
vulkan
303-
vulkan-deps
303+
vulkan-headers
304304
wuffs
305305

306306
Apache License
@@ -857,7 +857,7 @@ accessibility
857857
icu
858858
skia
859859

860-
Copyright 2016 The Chromium Authors. All rights reserved.
860+
Copyright 2015 The Chromium Authors. All rights reserved.
861861

862862
Redistribution and use in source and binary forms, with or without
863863
modification, are permitted provided that the following conditions are
@@ -888,9 +888,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
888888
accessibility
889889
icu
890890
skia
891-
vulkan-deps
892891

893-
Copyright 2015 The Chromium Authors. All rights reserved.
892+
Copyright 2016 The Chromium Authors. All rights reserved.
894893

895894
Redistribution and use in source and binary forms, with or without
896895
modification, are permitted provided that the following conditions are
@@ -1579,40 +1578,6 @@ POSSIBILITY OF SUCH DAMAGE.
15791578
--------------------------------------------------------------------------------
15801579
angle
15811580

1582-
Copyright 2021-2022 The ANGLE Project Authors. All rights reserved.
1583-
1584-
Redistribution and use in source and binary forms, with or without
1585-
modification, are permitted provided that the following conditions
1586-
are met:
1587-
1588-
Redistributions of source code must retain the above copyright
1589-
notice, this list of conditions and the following disclaimer.
1590-
1591-
Redistributions in binary form must reproduce the above
1592-
copyright notice, this list of conditions and the following
1593-
disclaimer in the documentation and/or other materials provided
1594-
with the distribution.
1595-
1596-
Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
1597-
Ltd., nor the names of their contributors may be used to endorse
1598-
or promote products derived from this software without specific
1599-
prior written permission.
1600-
1601-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1602-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1603-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
1604-
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
1605-
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
1606-
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
1607-
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
1608-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
1609-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
1610-
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
1611-
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
1612-
POSSIBILITY OF SUCH DAMAGE.
1613-
--------------------------------------------------------------------------------
1614-
angle
1615-
16161581
Copyright 2022 The ANGLE Project Authors. All rights reserved.
16171582

16181583
Redistribution and use in source and binary forms, with or without
@@ -6299,6 +6264,28 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
62996264
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
63006265
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
63016266
--------------------------------------------------------------------------------
6267+
externals
6268+
6269+
Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
6270+
6271+
Permission is hereby granted, free of charge, to any person obtaining a copy
6272+
of this software and associated documentation files (the "Software"), to deal
6273+
in the Software without restriction, including without limitation the rights
6274+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
6275+
copies of the Software, and to permit persons to whom the Software is
6276+
furnished to do so, subject to the following conditions:
6277+
6278+
The above copyright notice and this permission notice shall be included in
6279+
all copies or substantial portions of the Software.
6280+
6281+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
6282+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
6283+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
6284+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
6285+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
6286+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
6287+
THE SOFTWARE.
6288+
--------------------------------------------------------------------------------
63026289
ffx_spd
63036290

63046291
Copyright (c) 2017-2019 Advanced Micro Devices, Inc. All rights reserved.
@@ -15538,28 +15525,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1553815525
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1553915526
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1554015527
--------------------------------------------------------------------------------
15541-
vulkan_memory_allocator
15542-
15543-
Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
15544-
15545-
Permission is hereby granted, free of charge, to any person obtaining a copy
15546-
of this software and associated documentation files (the "Software"), to deal
15547-
in the Software without restriction, including without limitation the rights
15548-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
15549-
copies of the Software, and to permit persons to whom the Software is
15550-
furnished to do so, subject to the following conditions:
15551-
15552-
The above copyright notice and this permission notice shall be included in
15553-
all copies or substantial portions of the Software.
15554-
15555-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15556-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15557-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
15558-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
15559-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
15560-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
15561-
THE SOFTWARE.
15562-
--------------------------------------------------------------------------------
1556315528
xxhash
1556415529

1556515530
Copyright (C) 2012-2016, Yann Collet

0 commit comments

Comments
 (0)