From 6473b6abef269ee2cd816ef4a2a345613928fd2a Mon Sep 17 00:00:00 2001 From: Alexander Aprelev Date: Tue, 22 Apr 2025 08:57:29 -0700 Subject: [PATCH] Roll dart 3.9.0-33.0.dev (#167513) Roll dart sdk to 3.9.0-33.0.dev Changes since last roll ``` e596df519dc (HEAD) Version 3.9.0-33.0.dev 4d298786022 Elements. Remove V1 MultiplyDefinedElement. 1b22cd0b15b Elements. Stop implementing V1 TypeDefiningElement in DynamicElementImpl and NeverElementImpl. 84be07364b1 Roll Fuchsia SDK from 27.20250417.3.1 to 27.20250418.3.1 5b123390cdc Elements. Remove V1 AugmentedXyz classes. 4f7eca8cc9b Elements. Remove V1 DartType.element 9fbed46b139 [DAS] Removes operators suggestions from `.` access and more considerations from extension suggestions 801b545cdbd Elements. Remove V1 lookupXyz methods. 04ec005e1e3 Elements. Remove V1 ConstructorElement. 969eeaadfb8 Roll BoringSSL from ef839bf397fb to 45a865d6682a (15 revisions) ``` Update license script to accommodate boringssl license change --- DEPS | 4 ++-- .../src/flutter/ci/licenses_golden/excluded_files | 2 ++ engine/src/flutter/ci/licenses_golden/licenses_dart | 2 +- .../src/flutter/ci/licenses_golden/licenses_flutter | 5 +++++ .../src/flutter/ci/licenses_golden/tool_signature | 2 +- engine/src/flutter/tools/licenses/lib/main.dart | 13 ++++++------- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/DEPS b/DEPS index b2918129d12..b87ffd8f52f 100644 --- a/DEPS +++ b/DEPS @@ -56,12 +56,12 @@ 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': '0cfefe2a03fb19c288d58484abb9690d7570fdeb', + 'dart_revision': 'e596df519dceb6c1f98c15011c41f719c35d5bc1', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py 'dart_binaryen_rev': 'b4bdcc33115b31758c56b83bb9de4642c411a042', - 'dart_boringssl_rev': 'ef839bf397fb4ecdb66ef2679a08ac7b3563c50b', + 'dart_boringssl_rev': '45a865d6682a7bc989143d73466ade7728959324', 'dart_core_rev': '635dfa32c261ba078438b74de397f2207904ca78', 'dart_devtools_rev': '1fb2f4ce5099042b7f2dfa93dec675a21861d21f', 'dart_ecosystem_rev': '815d4ba2e7d11f8695a26f6cbe1262e3b8ff8d0d', diff --git a/engine/src/flutter/ci/licenses_golden/excluded_files b/engine/src/flutter/ci/licenses_golden/excluded_files index 44651534e4d..ea55f526e4f 100644 --- a/engine/src/flutter/ci/licenses_golden/excluded_files +++ b/engine/src/flutter/ci/licenses_golden/excluded_files @@ -986,6 +986,7 @@ ../../../flutter/third_party/boringssl/src/crypto/cipher/aead_test.cc ../../../flutter/third_party/boringssl/src/crypto/cipher/cipher_test.cc ../../../flutter/third_party/boringssl/src/crypto/cipher/test +../../../flutter/third_party/boringssl/src/crypto/cms/cms_test.cc ../../../flutter/third_party/boringssl/src/crypto/compiler_test.cc ../../../flutter/third_party/boringssl/src/crypto/conf/conf_test.cc ../../../flutter/third_party/boringssl/src/crypto/constant_time_test.cc @@ -1041,6 +1042,7 @@ ../../../flutter/third_party/boringssl/src/crypto/pem/pem_test.cc ../../../flutter/third_party/boringssl/src/crypto/perlasm/readme ../../../flutter/third_party/boringssl/src/crypto/pkcs7/pkcs7_test.cc +../../../flutter/third_party/boringssl/src/crypto/pkcs7/test ../../../flutter/third_party/boringssl/src/crypto/pkcs8/pkcs12_test.cc ../../../flutter/third_party/boringssl/src/crypto/pkcs8/pkcs8_test.cc ../../../flutter/third_party/boringssl/src/crypto/pkcs8/test diff --git a/engine/src/flutter/ci/licenses_golden/licenses_dart b/engine/src/flutter/ci/licenses_golden/licenses_dart index 5fa106ff1c0..fa9cffbacc2 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_dart +++ b/engine/src/flutter/ci/licenses_golden/licenses_dart @@ -4864,7 +4864,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. -You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/2bb85834e77ef519fed07841b875fee83073089e +You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/e596df519dceb6c1f98c15011c41f719c35d5bc1 /third_party/fallback_root_certificates/ ==================================================================================================== diff --git a/engine/src/flutter/ci/licenses_golden/licenses_flutter b/engine/src/flutter/ci/licenses_golden/licenses_flutter index 044200c24e5..8ec6a0251f0 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_flutter +++ b/engine/src/flutter/ci/licenses_golden/licenses_flutter @@ -3526,6 +3526,7 @@ ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutt ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/crypto/cipher/get_cipher.cc ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/crypto/cipher/internal.h ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/crypto/cipher/tls_cbc.cc +ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/crypto/cms/cms.cc ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/crypto/conf/conf.cc ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/crypto/conf/internal.h ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/crypto/cpu_aarch64_apple.cc @@ -3891,6 +3892,7 @@ ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutt ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/chacha.h ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/cipher.h ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/cmac.h +ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/cms.h ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/conf.h ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/cpu.h ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/crypto.h @@ -4878,6 +4880,7 @@ FILE: ../../../flutter/third_party/boringssl/src/crypto/cipher/e_tls.cc FILE: ../../../flutter/third_party/boringssl/src/crypto/cipher/get_cipher.cc FILE: ../../../flutter/third_party/boringssl/src/crypto/cipher/internal.h FILE: ../../../flutter/third_party/boringssl/src/crypto/cipher/tls_cbc.cc +FILE: ../../../flutter/third_party/boringssl/src/crypto/cms/cms.cc FILE: ../../../flutter/third_party/boringssl/src/crypto/conf/conf.cc FILE: ../../../flutter/third_party/boringssl/src/crypto/conf/internal.h FILE: ../../../flutter/third_party/boringssl/src/crypto/cpu_aarch64_apple.cc @@ -4918,6 +4921,7 @@ FILE: ../../../flutter/third_party/boringssl/src/crypto/err/asn1.errordata FILE: ../../../flutter/third_party/boringssl/src/crypto/err/bio.errordata FILE: ../../../flutter/third_party/boringssl/src/crypto/err/bn.errordata FILE: ../../../flutter/third_party/boringssl/src/crypto/err/cipher.errordata +FILE: ../../../flutter/third_party/boringssl/src/crypto/err/cms.errordata FILE: ../../../flutter/third_party/boringssl/src/crypto/err/conf.errordata FILE: ../../../flutter/third_party/boringssl/src/crypto/err/dh.errordata FILE: ../../../flutter/third_party/boringssl/src/crypto/err/digest.errordata @@ -5569,6 +5573,7 @@ FILE: ../../../flutter/third_party/boringssl/src/include/openssl/cast.h FILE: ../../../flutter/third_party/boringssl/src/include/openssl/chacha.h FILE: ../../../flutter/third_party/boringssl/src/include/openssl/cipher.h FILE: ../../../flutter/third_party/boringssl/src/include/openssl/cmac.h +FILE: ../../../flutter/third_party/boringssl/src/include/openssl/cms.h FILE: ../../../flutter/third_party/boringssl/src/include/openssl/conf.h FILE: ../../../flutter/third_party/boringssl/src/include/openssl/cpu.h FILE: ../../../flutter/third_party/boringssl/src/include/openssl/crypto.h diff --git a/engine/src/flutter/ci/licenses_golden/tool_signature b/engine/src/flutter/ci/licenses_golden/tool_signature index ece9890fea9..3894248e841 100644 --- a/engine/src/flutter/ci/licenses_golden/tool_signature +++ b/engine/src/flutter/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: 72079bc1edfa9c01900da12816e18f0e +Signature: a61503bba42fbf5f2b012e24611417b2 diff --git a/engine/src/flutter/tools/licenses/lib/main.dart b/engine/src/flutter/tools/licenses/lib/main.dart index afee99767a1..cacdeac398f 100644 --- a/engine/src/flutter/tools/licenses/lib/main.dart +++ b/engine/src/flutter/tools/licenses/lib/main.dart @@ -920,12 +920,11 @@ class _RepositoryBoringSSLLicenseFile extends _RepositorySingleLicenseFile { r'(' // 2 r' *Licenses for support code\n' r' *-------------------------\n+)' - r'(.+?)\n+' // 3 - r'(BoringSSL uses the Chromium test infrastructure to run a continuous build,\n' // 4 - r'trybots etc\. The scripts which manage this, and the script for generating build\n' - r'metadata, are under the Chromium license\. Distributing code linked against\n' - r'BoringSSL does not trigger this license\.)\n+' - r'(.+?)\n+$', // 5 + r'\n' + r'Parts of the TLS test suite are under the Go license. This code is not included\n' + r'in BoringSSL \(i.e. libcrypto and libssl\) when compiled, however, so\n' + r'distributing code linked against BoringSSL does not trigger this license:\n' + r'(.+?)\n+$', // 3 dotAll: true, ); @@ -934,7 +933,7 @@ class _RepositoryBoringSSLLicenseFile extends _RepositorySingleLicenseFile { if (match == null) { throw 'Failed to match BoringSSL license pattern.'; } - assert(match.groupCount == 5); + assert(match.groupCount == 3); return License.fromBodyAndType(match.group(1)!, LicenseType.apache, origin: io.fullName); } }