Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ 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': 'fb546f313557602aa828d3121501a58ffd251e0e',
'dart_revision': '797d3df745d1fee5edd74461545f471147ad60d7',

# 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': '654ee6e2504f11fb0e982a2cf276bafa750f694b',
'dart_boringssl_gen_rev': '9c7294fd58261a79794f5afaa26598cf1442ad20',
'dart_boringssl_rev': 'd24a38200fef19150eef00cad35b138936c08767',
'dart_boringssl_gen_rev': 'fef055e8d2749b82c79c8f043be1cbe5e8e4b40c',
'dart_boringssl_rev': '2db0eb3f96a5756298dcd7f9319e56a98585bd10',
'dart_browser_launcher_rev': '60126904a26b761d29b4f2d76292ff3c089160de',
'dart_clock_rev': 'ad428ea8b75fa0d7ba629791552d40478745c54a',
'dart_collection_rev': '0c1f829c29da1d63488be774f430b2035a565d6f',
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses.sh
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ function verify_licenses() (

local actualLicenseCount
actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
local expectedLicenseCount=903 # When changing this number: Update the error message below as well describing the newly expected license types.
local expectedLicenseCount=904 # When changing this number: Update the error message below as well describing the newly expected license types.

if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
echo "=============================== ERROR ==============================="
Expand Down
32 changes: 14 additions & 18 deletions ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -937,21 +937,15 @@
../../../flutter/third_party/boringssl/.gitignore
../../../flutter/third_party/boringssl/OWNERS
../../../flutter/third_party/boringssl/README
../../../flutter/third_party/boringssl/apple-aarch64/crypto/test
../../../flutter/third_party/boringssl/apple-arm/crypto/test
../../../flutter/third_party/boringssl/apple-x86/crypto/test
../../../flutter/third_party/boringssl/apple-x86_64/crypto/test
../../../flutter/third_party/boringssl/codereview.settings
../../../flutter/third_party/boringssl/linux-aarch64/crypto/test
../../../flutter/third_party/boringssl/linux-arm/crypto/test
../../../flutter/third_party/boringssl/linux-x86/crypto/test
../../../flutter/third_party/boringssl/linux-x86_64/crypto/test
../../../flutter/third_party/boringssl/src/.bazelrc
../../../flutter/third_party/boringssl/src/.clang-format
../../../flutter/third_party/boringssl/src/.git
../../../flutter/third_party/boringssl/src/.github
../../../flutter/third_party/boringssl/src/.gitignore
../../../flutter/third_party/boringssl/src/API-CONVENTIONS.md
../../../flutter/third_party/boringssl/src/BREAKING-CHANGES.md
../../../flutter/third_party/boringssl/src/BUILD.bazel
../../../flutter/third_party/boringssl/src/BUILDING.md
../../../flutter/third_party/boringssl/src/CMakeLists.txt
../../../flutter/third_party/boringssl/src/CONTRIBUTING.md
Expand All @@ -963,7 +957,6 @@
../../../flutter/third_party/boringssl/src/STYLE.md
../../../flutter/third_party/boringssl/src/cmake
../../../flutter/third_party/boringssl/src/codereview.settings
../../../flutter/third_party/boringssl/src/crypto/CMakeLists.txt
../../../flutter/third_party/boringssl/src/crypto/abi_self_test.cc
../../../flutter/third_party/boringssl/src/crypto/asn1/asn1_test.cc
../../../flutter/third_party/boringssl/src/crypto/base64/base64_test.cc
Expand All @@ -988,13 +981,11 @@
../../../flutter/third_party/boringssl/src/crypto/digest_extra/digest_test.cc
../../../flutter/third_party/boringssl/src/crypto/dsa/dsa_test.cc
../../../flutter/third_party/boringssl/src/crypto/ecdh_extra/ecdh_test.cc
../../../flutter/third_party/boringssl/src/crypto/err/err_data_generate.go
../../../flutter/third_party/boringssl/src/crypto/err/err_test.cc
../../../flutter/third_party/boringssl/src/crypto/evp/evp_extra_test.cc
../../../flutter/third_party/boringssl/src/crypto/evp/evp_test.cc
../../../flutter/third_party/boringssl/src/crypto/evp/pbkdf_test.cc
../../../flutter/third_party/boringssl/src/crypto/evp/scrypt_test.cc
../../../flutter/third_party/boringssl/src/crypto/fipsmodule/CMakeLists.txt
../../../flutter/third_party/boringssl/src/crypto/fipsmodule/FIPS.md
../../../flutter/third_party/boringssl/src/crypto/fipsmodule/aes/aes_test.cc
../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/bn_test.cc
Expand All @@ -1009,6 +1000,7 @@
../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/make_p256-nistz-tests.go
../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/make_tables.go
../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/p256-nistz_test.cc
../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/p256_test.cc
../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ecdsa/ecdsa_test.cc
../../../flutter/third_party/boringssl/src/crypto/fipsmodule/hkdf/hkdf_test.cc
../../../flutter/third_party/boringssl/src/crypto/fipsmodule/md5/md5_test.cc
Expand All @@ -1023,6 +1015,7 @@
../../../flutter/third_party/boringssl/src/crypto/hpke/translate_test_vectors.py
../../../flutter/third_party/boringssl/src/crypto/hrss/hrss_test.cc
../../../flutter/third_party/boringssl/src/crypto/impl_dispatch_test.cc
../../../flutter/third_party/boringssl/src/crypto/keccak/keccak_test.cc
../../../flutter/third_party/boringssl/src/crypto/kyber/kyber_test.cc
../../../flutter/third_party/boringssl/src/crypto/lhash/lhash_test.cc
../../../flutter/third_party/boringssl/src/crypto/obj/README
Expand All @@ -1041,26 +1034,32 @@
../../../flutter/third_party/boringssl/src/crypto/rsa_extra/rsa_test.cc
../../../flutter/third_party/boringssl/src/crypto/self_test.cc
../../../flutter/third_party/boringssl/src/crypto/siphash/siphash_test.cc
../../../flutter/third_party/boringssl/src/crypto/spx/spx_test.cc
../../../flutter/third_party/boringssl/src/crypto/stack/stack_test.cc
../../../flutter/third_party/boringssl/src/crypto/test
../../../flutter/third_party/boringssl/src/crypto/thread_test.cc
../../../flutter/third_party/boringssl/src/crypto/trust_token/trust_token_test.cc
../../../flutter/third_party/boringssl/src/crypto/x509/tab_test.cc
../../../flutter/third_party/boringssl/src/crypto/x509/test
../../../flutter/third_party/boringssl/src/crypto/x509/x509_test.cc
../../../flutter/third_party/boringssl/src/crypto/x509/x509_time_test.cc
../../../flutter/third_party/boringssl/src/crypto/x509v3/tab_test.cc
../../../flutter/third_party/boringssl/src/decrepit/CMakeLists.txt
../../../flutter/third_party/boringssl/src/decrepit/blowfish/blowfish_test.cc
../../../flutter/third_party/boringssl/src/decrepit/cast/cast_test.cc
../../../flutter/third_party/boringssl/src/decrepit/cfb/cfb_test.cc
../../../flutter/third_party/boringssl/src/decrepit/des/des_test.cc
../../../flutter/third_party/boringssl/src/decrepit/evp/evp_test.cc
../../../flutter/third_party/boringssl/src/decrepit/ripemd/ripemd_test.cc
../../../flutter/third_party/boringssl/src/decrepit/xts/xts_test.cc
../../../flutter/third_party/boringssl/src/fuzz
../../../flutter/third_party/boringssl/src/gen/README.md
../../../flutter/third_party/boringssl/src/gen/sources.bzl
../../../flutter/third_party/boringssl/src/gen/sources.cmake
../../../flutter/third_party/boringssl/src/gen/test_support
../../../flutter/third_party/boringssl/src/pki/README.md
../../../flutter/third_party/boringssl/src/pki/cert_issuer_source_static_unittest.cc
../../../flutter/third_party/boringssl/src/pki/cert_issuer_source_sync_unittest.h
../../../flutter/third_party/boringssl/src/pki/certificate_policies_unittest.cc
../../../flutter/third_party/boringssl/src/pki/certificate_unittest.cc
../../../flutter/third_party/boringssl/src/pki/crl_unittest.cc
../../../flutter/third_party/boringssl/src/pki/encode_values_unittest.cc
../../../flutter/third_party/boringssl/src/pki/extended_key_usage_unittest.cc
Expand All @@ -1079,19 +1078,19 @@
../../../flutter/third_party/boringssl/src/pki/path_builder_pkits_unittest.cc
../../../flutter/third_party/boringssl/src/pki/path_builder_unittest.cc
../../../flutter/third_party/boringssl/src/pki/path_builder_verify_certificate_chain_unittest.cc
../../../flutter/third_party/boringssl/src/pki/pem_unittest.cc
../../../flutter/third_party/boringssl/src/pki/signature_algorithm_unittest.cc
../../../flutter/third_party/boringssl/src/pki/simple_path_builder_delegate_unittest.cc
../../../flutter/third_party/boringssl/src/pki/string_util_unittest.cc
../../../flutter/third_party/boringssl/src/pki/testdata
../../../flutter/third_party/boringssl/src/pki/trust_store_collection_unittest.cc
../../../flutter/third_party/boringssl/src/pki/trust_store_in_memory_unittest.cc
../../../flutter/third_party/boringssl/src/pki/verify_certificate_chain_pkits_unittest.cc
../../../flutter/third_party/boringssl/src/pki/verify_certificate_chain_typed_unittest.h
../../../flutter/third_party/boringssl/src/pki/verify_certificate_chain_unittest.cc
../../../flutter/third_party/boringssl/src/pki/verify_name_match_unittest.cc
../../../flutter/third_party/boringssl/src/pki/verify_signed_data_unittest.cc
../../../flutter/third_party/boringssl/src/rust
../../../flutter/third_party/boringssl/src/sources.cmake
../../../flutter/third_party/boringssl/src/ssl/CMakeLists.txt
../../../flutter/third_party/boringssl/src/ssl/span_test.cc
../../../flutter/third_party/boringssl/src/ssl/ssl_c_test.c
../../../flutter/third_party/boringssl/src/ssl/ssl_test.cc
Expand Down Expand Up @@ -1335,9 +1334,6 @@
../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/xchacha20_poly1305_test.json
../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/xchacha20_poly1305_test.txt
../../../flutter/third_party/boringssl/src/util
../../../flutter/third_party/boringssl/win-aarch64/crypto/test
../../../flutter/third_party/boringssl/win-x86/crypto/test
../../../flutter/third_party/boringssl/win-x86_64/crypto/test
../../../flutter/third_party/cpu_features/src/.clang-format
../../../flutter/third_party/cpu_features/src/.git
../../../flutter/third_party/cpu_features/src/.github
Expand Down
14 changes: 12 additions & 2 deletions ci/licenses_golden/licenses_dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 3c97c0676a4d04c30f3a74f182da0c97
Signature: 6b99fd5e80824d1e9741f7f1ed2ada0c

====================================================================================================
LIBRARY: dart
Expand Down Expand Up @@ -4074,6 +4074,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: dart
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/concurrent.cc + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/concurrent_natives.cc + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/concurrent_natives.h + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/ifaddrs.cc + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/ifaddrs.h + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/native_assets_api_impl.cc + ../../../flutter/third_party/dart/LICENSE
Expand All @@ -4094,10 +4097,15 @@ ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/dart2
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/array_flags.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/invocation_mirror_constants.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_shared/lib/date_time_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/vm/lib/concurrent_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/compact_hash.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/js_helper_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/js_helper_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/concurrent/concurrent.dart + ../../../flutter/third_party/dart/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../flutter/third_party/dart/runtime/bin/concurrent.cc
FILE: ../../../flutter/third_party/dart/runtime/bin/concurrent_natives.cc
FILE: ../../../flutter/third_party/dart/runtime/bin/concurrent_natives.h
FILE: ../../../flutter/third_party/dart/runtime/bin/ifaddrs.cc
FILE: ../../../flutter/third_party/dart/runtime/bin/ifaddrs.h
FILE: ../../../flutter/third_party/dart/runtime/bin/native_assets_api_impl.cc
Expand All @@ -4118,9 +4126,11 @@ FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/dart2js
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/array_flags.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/invocation_mirror_constants.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_shared/lib/date_time_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/vm/lib/concurrent_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/compact_hash.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/js_helper_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/js_helper_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/concurrent/concurrent.dart
----------------------------------------------------------------------------------------------------
Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file
for details. All rights reserved.
Expand Down Expand Up @@ -4759,7 +4769,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/+/fb546f313557602aa828d3121501a58ffd251e0e
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/797d3df745d1fee5edd74461545f471147ad60d7
/third_party/fallback_root_certificates/

====================================================================================================
Expand Down
Loading