From 75f6bdfd41b4c19a5b27ee18d96281f01b2ae221 Mon Sep 17 00:00:00 2001 From: Ben Konyi Date: Thu, 6 Sep 2018 19:09:30 -0700 Subject: [PATCH] Revert "Dart SDK roll for 2018/09/06 (#6189)" (#6192) This reverts commit f02fc8c1068619dd2911a3e8bf95f8d43b8d276c. --- DEPS | 2 +- ci/licenses_golden/licenses_third_party | 91 ++++++++++++------------- frontend_server/lib/server.dart | 5 -- 3 files changed, 46 insertions(+), 52 deletions(-) diff --git a/DEPS b/DEPS index e704ef9e65..49174b6860 100644 --- a/DEPS +++ b/DEPS @@ -31,7 +31,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': 'c7ab56e1b5ab9bcf6f20057ac9135dede7d40395', + 'dart_revision': '760a9690c22ec3f3d163173737f9949f97e6e02a', 'dart_args_tag': '1.4.4', 'dart_async_tag': '2.0.8', diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 4aba7f34ba..effcb3701a 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: cd0d6dca1aa2aca73d1f1dab47cf9355 +Signature: da77c336d1e2756b2cca2e2d00f2d741 UNUSED LICENSES: @@ -5461,7 +5461,6 @@ FILE: ../../../third_party/dart/runtime/vm/compiler/backend/code_statistics.cc FILE: ../../../third_party/dart/runtime/vm/compiler/backend/code_statistics.h FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_pass.cc FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_pass.h -FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_state.h FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/base_flow_graph_builder.cc FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/base_flow_graph_builder.h FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/bytecode_reader.cc @@ -16699,50 +16698,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== -==================================================================================================== -LIBRARY: tonic -ORIGIN: ../../../garnet/LICENSE -TYPE: LicenseType.bsd -FILE: ../../../third_party/tonic/dart_list.cc -FILE: ../../../third_party/tonic/dart_list.h -FILE: ../../../third_party/tonic/file_loader/file_loader_fuchsia.cc -FILE: ../../../third_party/tonic/file_loader/file_loader_posix.cc -FILE: ../../../third_party/tonic/file_loader/file_loader_win.cc -FILE: ../../../third_party/tonic/filesystem/filesystem/path_win.cc -FILE: ../../../third_party/tonic/filesystem/filesystem/portable_unistd.h -FILE: ../../../third_party/tonic/platform/platform_utils.h -FILE: ../../../third_party/tonic/platform/platform_utils_posix.cc -FILE: ../../../third_party/tonic/platform/platform_utils_win.cc ----------------------------------------------------------------------------------------------------- -Copyright 2017 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. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -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: tonic ORIGIN: ../../../third_party/tonic/LICENSE @@ -16842,6 +16797,50 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== +==================================================================================================== +LIBRARY: tonic +ORIGIN: ../../../third_party/tonic/file_loader/file_loader_fuchsia.cc + ../../../third_party/tonic/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../third_party/tonic/dart_list.cc +FILE: ../../../third_party/tonic/dart_list.h +FILE: ../../../third_party/tonic/file_loader/file_loader_fuchsia.cc +FILE: ../../../third_party/tonic/file_loader/file_loader_posix.cc +FILE: ../../../third_party/tonic/file_loader/file_loader_win.cc +FILE: ../../../third_party/tonic/filesystem/filesystem/path_win.cc +FILE: ../../../third_party/tonic/filesystem/filesystem/portable_unistd.h +FILE: ../../../third_party/tonic/platform/platform_utils.h +FILE: ../../../third_party/tonic/platform/platform_utils_posix.cc +FILE: ../../../third_party/tonic/platform/platform_utils_win.cc +---------------------------------------------------------------------------------------------------- +Copyright 2017 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. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +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: tonic ORIGIN: ../../../third_party/tonic/typed_data/dart_byte_data.cc + ../../../third_party/tonic/LICENSE diff --git a/frontend_server/lib/server.dart b/frontend_server/lib/server.dart index 572087e9d1..804c5699eb 100644 --- a/frontend_server/lib/server.dart +++ b/frontend_server/lib/server.dart @@ -39,11 +39,6 @@ class _FlutterFrontendCompiler implements frontend.CompilerInterface{ _compiler.acceptLastDelta(); } - @override - Future rejectLastDelta() async { - return _compiler.rejectLastDelta(); - } - @override void invalidate(Uri uri) { _compiler.invalidate(uri); -- GitLab