Skip to content

Commit 6473b6a

Browse files
aamaam
authored
Roll dart 3.9.0-33.0.dev (flutter#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
1 parent 92ff6df commit 6473b6a

6 files changed

Lines changed: 17 additions & 11 deletions

File tree

‎DEPS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ vars = {
5656
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
5757
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5858
# updated revision list of existing dependencies.
59-
'dart_revision': '0cfefe2a03fb19c288d58484abb9690d7570fdeb',
59+
'dart_revision': 'e596df519dceb6c1f98c15011c41f719c35d5bc1',
6060

6161
# WARNING: DO NOT EDIT MANUALLY
6262
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
6363
'dart_binaryen_rev': 'b4bdcc33115b31758c56b83bb9de4642c411a042',
64-
'dart_boringssl_rev': 'ef839bf397fb4ecdb66ef2679a08ac7b3563c50b',
64+
'dart_boringssl_rev': '45a865d6682a7bc989143d73466ade7728959324',
6565
'dart_core_rev': '635dfa32c261ba078438b74de397f2207904ca78',
6666
'dart_devtools_rev': '1fb2f4ce5099042b7f2dfa93dec675a21861d21f',
6767
'dart_ecosystem_rev': '815d4ba2e7d11f8695a26f6cbe1262e3b8ff8d0d',

‎engine/src/flutter/ci/licenses_golden/excluded_files‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -986,6 +986,7 @@
986986
../../../flutter/third_party/boringssl/src/crypto/cipher/aead_test.cc
987987
../../../flutter/third_party/boringssl/src/crypto/cipher/cipher_test.cc
988988
../../../flutter/third_party/boringssl/src/crypto/cipher/test
989+
../../../flutter/third_party/boringssl/src/crypto/cms/cms_test.cc
989990
../../../flutter/third_party/boringssl/src/crypto/compiler_test.cc
990991
../../../flutter/third_party/boringssl/src/crypto/conf/conf_test.cc
991992
../../../flutter/third_party/boringssl/src/crypto/constant_time_test.cc
@@ -1041,6 +1042,7 @@
10411042
../../../flutter/third_party/boringssl/src/crypto/pem/pem_test.cc
10421043
../../../flutter/third_party/boringssl/src/crypto/perlasm/readme
10431044
../../../flutter/third_party/boringssl/src/crypto/pkcs7/pkcs7_test.cc
1045+
../../../flutter/third_party/boringssl/src/crypto/pkcs7/test
10441046
../../../flutter/third_party/boringssl/src/crypto/pkcs8/pkcs12_test.cc
10451047
../../../flutter/third_party/boringssl/src/crypto/pkcs8/pkcs8_test.cc
10461048
../../../flutter/third_party/boringssl/src/crypto/pkcs8/test

‎engine/src/flutter/ci/licenses_golden/licenses_dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4864,7 +4864,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
48644864
This Source Code Form is "Incompatible With Secondary Licenses", as
48654865
defined by the Mozilla Public License, v. 2.0.
48664866

4867-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/2bb85834e77ef519fed07841b875fee83073089e
4867+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/e596df519dceb6c1f98c15011c41f719c35d5bc1
48684868
/third_party/fallback_root_certificates/
48694869

48704870
====================================================================================================

‎engine/src/flutter/ci/licenses_golden/licenses_flutter‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3526,6 +3526,7 @@ ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutt
35263526
ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/crypto/cipher/get_cipher.cc
35273527
ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/crypto/cipher/internal.h
35283528
ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/crypto/cipher/tls_cbc.cc
3529+
ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/crypto/cms/cms.cc
35293530
ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/crypto/conf/conf.cc
35303531
ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/crypto/conf/internal.h
35313532
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
38913892
ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/chacha.h
38923893
ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/cipher.h
38933894
ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/cmac.h
3895+
ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/cms.h
38943896
ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/conf.h
38953897
ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/cpu.h
38963898
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
48784880
FILE: ../../../flutter/third_party/boringssl/src/crypto/cipher/get_cipher.cc
48794881
FILE: ../../../flutter/third_party/boringssl/src/crypto/cipher/internal.h
48804882
FILE: ../../../flutter/third_party/boringssl/src/crypto/cipher/tls_cbc.cc
4883+
FILE: ../../../flutter/third_party/boringssl/src/crypto/cms/cms.cc
48814884
FILE: ../../../flutter/third_party/boringssl/src/crypto/conf/conf.cc
48824885
FILE: ../../../flutter/third_party/boringssl/src/crypto/conf/internal.h
48834886
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
49184921
FILE: ../../../flutter/third_party/boringssl/src/crypto/err/bio.errordata
49194922
FILE: ../../../flutter/third_party/boringssl/src/crypto/err/bn.errordata
49204923
FILE: ../../../flutter/third_party/boringssl/src/crypto/err/cipher.errordata
4924+
FILE: ../../../flutter/third_party/boringssl/src/crypto/err/cms.errordata
49214925
FILE: ../../../flutter/third_party/boringssl/src/crypto/err/conf.errordata
49224926
FILE: ../../../flutter/third_party/boringssl/src/crypto/err/dh.errordata
49234927
FILE: ../../../flutter/third_party/boringssl/src/crypto/err/digest.errordata
@@ -5569,6 +5573,7 @@ FILE: ../../../flutter/third_party/boringssl/src/include/openssl/cast.h
55695573
FILE: ../../../flutter/third_party/boringssl/src/include/openssl/chacha.h
55705574
FILE: ../../../flutter/third_party/boringssl/src/include/openssl/cipher.h
55715575
FILE: ../../../flutter/third_party/boringssl/src/include/openssl/cmac.h
5576+
FILE: ../../../flutter/third_party/boringssl/src/include/openssl/cms.h
55725577
FILE: ../../../flutter/third_party/boringssl/src/include/openssl/conf.h
55735578
FILE: ../../../flutter/third_party/boringssl/src/include/openssl/cpu.h
55745579
FILE: ../../../flutter/third_party/boringssl/src/include/openssl/crypto.h

‎engine/src/flutter/ci/licenses_golden/tool_signature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Signature: 72079bc1edfa9c01900da12816e18f0e
1+
Signature: a61503bba42fbf5f2b012e24611417b2
22

‎engine/src/flutter/tools/licenses/lib/main.dart‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -920,12 +920,11 @@ class _RepositoryBoringSSLLicenseFile extends _RepositorySingleLicenseFile {
920920
r'(' // 2
921921
r' *Licenses for support code\n'
922922
r' *-------------------------\n+)'
923-
r'(.+?)\n+' // 3
924-
r'(BoringSSL uses the Chromium test infrastructure to run a continuous build,\n' // 4
925-
r'trybots etc\. The scripts which manage this, and the script for generating build\n'
926-
r'metadata, are under the Chromium license\. Distributing code linked against\n'
927-
r'BoringSSL does not trigger this license\.)\n+'
928-
r'(.+?)\n+$', // 5
923+
r'\n'
924+
r'Parts of the TLS test suite are under the Go license. This code is not included\n'
925+
r'in BoringSSL \(i.e. libcrypto and libssl\) when compiled, however, so\n'
926+
r'distributing code linked against BoringSSL does not trigger this license:\n'
927+
r'(.+?)\n+$', // 3
929928
dotAll: true,
930929
);
931930

@@ -934,7 +933,7 @@ class _RepositoryBoringSSLLicenseFile extends _RepositorySingleLicenseFile {
934933
if (match == null) {
935934
throw 'Failed to match BoringSSL license pattern.';
936935
}
937-
assert(match.groupCount == 5);
936+
assert(match.groupCount == 3);
938937
return License.fromBodyAndType(match.group(1)!, LicenseType.apache, origin: io.fullName);
939938
}
940939
}

0 commit comments

Comments
 (0)