From 55fcec16383b7c20217f4e77989595e9493f2045 Mon Sep 17 00:00:00 2001 From: Zach Anderson Date: Thu, 8 Jun 2023 12:37:27 -0700 Subject: [PATCH 1/2] Revert "Roll Dart SDK from b7fe6e0c274c to 3a9145a57432 (1 revision) (#42668)" This reverts commit cc628f1e766a5f37665da2f9f1bfcab1cf3f269f. --- DEPS | 2 +- ci/licenses_golden/licenses_third_party | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 87faece3999cf..c8d24dcf31e02 100644 --- a/DEPS +++ b/DEPS @@ -53,7 +53,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': '3a9145a5743209e5aa4e25adc219a99eed3c59bc', + 'dart_revision': 'b7fe6e0c274cb512e811981bfc6de0edc7150b4e', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index ae7667fbed859..7e4860d5b45a0 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 9f88115b7eed4568e0c5f9fa5978616b +Signature: 713393d44593bbfa5cd6e40cfe916605 ==================================================================================================== LIBRARY: angle From 2a34ae63f3eede667c263c768b2b54c4ac8a583e Mon Sep 17 00:00:00 2001 From: Zach Anderson Date: Thu, 8 Jun 2023 12:38:16 -0700 Subject: [PATCH 2/2] Revert "Roll Dart SDK from f0ae96d202ca to b7fe6e0c274c (1 revision) (#42657)" This reverts commit 8b214df1667fefe140924122462e440f494e0a4e. --- DEPS | 10 +++++----- ci/licenses_golden/licenses_third_party | 6 +++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/DEPS b/DEPS index c8d24dcf31e02..9eb36249292cd 100644 --- a/DEPS +++ b/DEPS @@ -53,7 +53,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': 'b7fe6e0c274cb512e811981bfc6de0edc7150b4e', + 'dart_revision': 'f0ae96d202ca3628e6d373561265a1479fcf4a96', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py @@ -72,7 +72,7 @@ vars = { 'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50', 'dart_tools_rev': '8d6e8b82e3eef8b2f5e3ec9bdd3dd1a2ad3e13f5', 'dart_watcher_rev': '3f17faa2d09dca3e23bc07a01f2045ec0cd2837d', - 'dart_webdev_rev': '3d7f546ffd461d64ca426cedc1e732f20ed15767', + 'dart_webdev_rev': 'b10d62b83288f92560bf9c05a06c4dc0a3cf84e8', 'dart_webkit_inspection_protocol_rev': '39a3c297ff573635e7936b015ce4f3466e4739d6', 'dart_yaml_edit_rev': '87dcf31fcaada207ae7c3527f9885982534badce', 'dart_zlib_rev': '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f', @@ -371,7 +371,7 @@ deps = { Var('dart_git') + '/dart_style.git@2956b1a705953f880a5dae9d3a0969df0fc45e99', 'src/third_party/dart/third_party/pkg/dartdoc': - Var('dart_git') + '/dartdoc.git@449478c7430a4a6fa0d83ba369c7389ea2fecdc8', + Var('dart_git') + '/dartdoc.git@0c8feac6cb21cfd773dde9e4b820b519e7778e07', 'src/third_party/dart/third_party/pkg/ffi': Var('dart_git') + '/ffi.git@f582ca022042323af061f35ccd24b6c4d38f7bd1', @@ -386,7 +386,7 @@ deps = { Var('dart_git') + '/glob.git@109121d9993c1ef8d078e185160a9d477c82defd', 'src/third_party/dart/third_party/pkg/html': - Var('dart_git') + '/html.git@b3b820bc36ed17673268360d8b569bdc66c22123', + Var('dart_git') + '/html.git@92eacabadf40aa24c8f4289682ef2822c5d7e414', 'src/third_party/dart/third_party/pkg/http': Var('dart_git') + '/http.git@5312366ce3b5dc2abc19f3a649332ad21ad77892', @@ -425,7 +425,7 @@ deps = { Var('dart_git') + '/mockito.git@cca4858ad0f1e3930ebdcc6faf4a918616cca48c', 'src/third_party/dart/third_party/pkg/native': - Var('dart_git') + '/native.git@973f3ed93dace19864903e17e771a44a2d9955b7', + Var('dart_git') + '/native.git@c851e69448594b1942e62e0d9f92e47d99575b99', 'src/third_party/dart/third_party/pkg/package_config': Var('dart_git') + '/package_config.git@203de2022af26b3ab2bcec18cc49614d9e502897', diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 7e4860d5b45a0..497daf8d27eae 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 713393d44593bbfa5cd6e40cfe916605 +Signature: 745a6db24dd3d7f325e979249f11a560 ==================================================================================================== LIBRARY: angle @@ -528,6 +528,7 @@ ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_ ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/dart/runtime/vm/protos/perfetto/trace/interned_data/interned_data.proto ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/dart/runtime/vm/protos/perfetto/trace/profiling/profile_common.proto ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/dart/runtime/vm/protos/perfetto/trace/profiling/profile_packet.proto +ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/dart/runtime/vm/protos/perfetto/trace/trace.proto ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/dart/runtime/vm/protos/perfetto/trace/trace_packet.proto ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/debug_annotation.proto ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/process_descriptor.proto @@ -2560,6 +2561,7 @@ FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/clock_snapshot. FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/interned_data/interned_data.proto FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/profiling/profile_common.proto FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/profiling/profile_packet.proto +FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/trace.proto FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/trace_packet.proto FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/debug_annotation.proto FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/process_descriptor.proto @@ -42059,6 +42061,7 @@ ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/clock_snapsho ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/interned_data/interned_data.pbzero.h + ../../../third_party/dart/LICENSE ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/profiling/profile_common.pbzero.h + ../../../third_party/dart/LICENSE ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/profiling/profile_packet.pbzero.h + ../../../third_party/dart/LICENSE +ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/trace.pbzero.h + ../../../third_party/dart/LICENSE ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/trace_packet.pbzero.h + ../../../third_party/dart/LICENSE ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/debug_annotation.pbzero.h + ../../../third_party/dart/LICENSE ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/process_descriptor.pbzero.h + ../../../third_party/dart/LICENSE @@ -42073,6 +42076,7 @@ FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/clock_snapshot. FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/interned_data/interned_data.pbzero.h FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/profiling/profile_common.pbzero.h FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/profiling/profile_packet.pbzero.h +FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/trace.pbzero.h FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/trace_packet.pbzero.h FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/debug_annotation.pbzero.h FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/process_descriptor.pbzero.h