Revert Dart roll (flutter#23444)

realcome · Jan 7, 2021 · 1758eaa · 1758eaa
1 parent 599a072
commit 1758eaa
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 39 deletions.
diff --git a/DEPS b/DEPS
@@ -34,7 +34,7 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '9542c7bc569aedd82fc626a53274c10d9033002a',
+  'dart_revision': '1c14d9bb3528e32d15f573fa7ef1ffc8d3542bdc',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -59,7 +59,8 @@ vars = {
   'dart_stack_trace_tag': '6788afc61875079b71b3d1c3e65aeaa6a25cbc2f',
   'dart_stream_channel_tag': 'd7251e61253ec389ee6e045ee1042311bced8f1d',
   'dart_typed_data_tag': 'f94fc57b8e8c0e4fe4ff6cfd8290b94af52d3719',
-  'dart_watcher_rev': '1e154d0900eabd5aed4b540e0416b8367e5c0248',
+  'dart_usage_tag': '16fbfd90c58f16e016a295a880bc722d2547d2c9',
+  'dart_watcher_rev': '1fb0a84acd8d195103f10aba03ba6bd6fdb424e5',
 
   'ocmock_tag': 'v3.7.1',
 
@@ -324,13 +325,13 @@ deps = {
    Var('dart_git') + '/typed_data.git' + '@' + Var('dart_typed_data_tag'),
 
   'src/third_party/dart/third_party/pkg/usage':
-   Var('dart_git') + '/usage.git@6c64d9e7b6b3758d06d030efcb5afe20bfc04dde',
+   Var('dart_git') + '/usage.git' + '@' + Var('dart_usage_tag'),
 
   'src/third_party/dart/third_party/pkg/watcher':
    Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
 
   'src/third_party/dart/third_party/pkg/web_socket_channel':
-   Var('dart_git') + '/web_socket_channel.git@680358915e331fda823908234f80beba1ed4ec83',
+   Var('dart_git') + '/web_socket_channel.git@490061ef0e22d3c8460ad2802f9948219365ad6b',
 
   'src/third_party/dart/third_party/pkg/yaml':
    Var('dart_git') + '/yaml.git@cca02c9e4f6826d62644901ed65c6d72b90a0713',

diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party
@@ -1,4 +1,4 @@
-Signature: 950125c44186e46466089663fd97582c
+Signature: 38aee45673a438448298244378faae6f
 
 UNUSED LICENSES:
 
@@ -2490,6 +2490,40 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ====================================================================================================
 
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../third_party/angle/src/common/fuchsia_egl/fuchsia_egl.c + ../../../fuchsia/sdk/linux/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/angle/src/common/fuchsia_egl/fuchsia_egl.c
+FILE: ../../../third_party/angle/src/common/fuchsia_egl/fuchsia_egl.h
+FILE: ../../../third_party/angle/src/common/fuchsia_egl/fuchsia_egl_backend.h
+----------------------------------------------------------------------------------------------------
+Copyright 2019 The Fuchsia Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
 ====================================================================================================
 LIBRARY: angle
 ORIGIN: ../../../third_party/angle/LICENSE
@@ -4240,40 +4274,6 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ====================================================================================================
 
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/src/common/fuchsia_egl/fuchsia_egl.c + ../../../fuchsia/sdk/linux/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/common/fuchsia_egl/fuchsia_egl.c
-FILE: ../../../third_party/angle/src/common/fuchsia_egl/fuchsia_egl.h
-FILE: ../../../third_party/angle/src/common/fuchsia_egl/fuchsia_egl_backend.h
-----------------------------------------------------------------------------------------------------
-Copyright 2019 The Fuchsia Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
 ====================================================================================================
 LIBRARY: angle
 ORIGIN: ../../../third_party/angle/src/compiler/preprocessor/DirectiveParser.cpp + ../../../third_party/angle/LICENSE