Skip to content

Commit f864509

Browse files
author
Dart CI
committed
Version 2.18.0-110.0.dev
Merge commit '1e04fe1fd0507e86d84e516fd809a9370519b1d5' into 'dev'
2 parents 90c1cce + 1e04fe1 commit f864509

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1631
-1097
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ Updated the Linter to `1.23.0`, which includes changes that
3030

3131
#### Pub
3232

33+
* Breaking: `dart pub get` and `dart pub upgrade` no longer creates the
34+
[deprecated](https://github.com/dart-lang/sdk/issues/47431) `.packages` file.
35+
It can still be created with the `--legacy-packages-file` flag.
3336
* `dart pub outdated` now shows which of your dependencies are discontinued.
3437

3538
## 2.17.0

DEPS

+5-19
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ vars = {
3939

4040
# Checked-in SDK version. The checked-in SDK is a Dart SDK distribution in a
4141
# cipd package used to run Dart scripts in the build and test infrastructure.
42-
"sdk_tag": "version:2.17.0-266.1.beta",
42+
"sdk_tag": "version:2.17.0",
4343

4444
# co19 is a cipd package. Use update.sh in tests/co19[_2] to update these
4545
# hashes. It requires access to the dart-build-access group, which EngProd
@@ -135,18 +135,14 @@ vars = {
135135
"path_rev": "3d41ea582f5b0b18de3d90008809b877ff3f69bc",
136136
"platform_rev": "1ffad63428bbd1b3ecaa15926bacfb724023648c",
137137
"ply_rev": "604b32590ffad5cbb82e4afef1d305512d06ae93",
138-
"pool_rev": "7abe634002a1ba8a0928eded086062f1307ccfae",
138+
"pool_rev": "c40cc32eabecb9d60f1045d1403108d968805f9a",
139139
"process_rev": "56ece43b53b64c63ae51ec184b76bd5360c28d0b",
140140
"protobuf_rev": "c1eb6cb51af39ccbaa1a8e19349546586a5c8e31",
141-
"pub_rev": "1e3c17ea871e6a80c720aa998f37cbd3913bc287",
141+
"pub_rev": "51435efcd574b7bc18d47a5dd620cb9759dea8f8",
142142
"pub_semver_rev": "ea6c54019948dc03042c595ce9413e17aaf7aa38",
143143
"root_certificates_rev": "692f6d6488af68e0121317a9c2c9eb393eb0ee50",
144144
"rust_revision": "b7856f695d65a8ebc846754f97d15814bcb1c244",
145-
"shelf_packages_handler_rev": "78302e67c035047e6348e692b0c1182131f0fe35",
146-
"shelf_proxy_rev": "124615d0614b38814970aa9638725d9d6b435268",
147-
"shelf_rev": "78ac724a7944700340a3cef28c84bccbe62e9367",
148-
"shelf_static_rev": "202ec1a53c9a830c17cf3b718d089cf7eba568ad",
149-
"shelf_web_socket_rev": "24fb8a04befa75a94ac63a27047b231d1a22aab4",
145+
"shelf_rev": "fadca320b04689be9ec960013843a0d9ee6c4fc4",
150146
"source_map_stack_trace_rev": "8eabd96b1811e30a11d3c54c9b4afae4fb72e98f",
151147
"source_maps_rev": "c07a01b8d5547ce3a47ee7a7a2b938a2bc09afe3",
152148
"source_span_rev": "8ae724c3e67f5afaacead44e93ff145bfb8775c7",
@@ -172,7 +168,7 @@ vars = {
172168
"webkit_inspection_protocol_rev": "dd6fb5d8b536e19cedb384d0bbf1f5631923f1e8",
173169
"yaml_edit_rev": "0b74d85fac10b4fbf7d1a347debcf16c8f7b0e9c",
174170
"yaml_rev": "0971c06490b9670add644ed62182acd6a5536946",
175-
"zlib_rev": "faff052b6b6edcd6dd548513fe44ac0941427bf0",
171+
"zlib_rev": "27c2f474b71d0d20764f86f60ef8b00da1a16cda",
176172

177173
# Windows deps
178174
"crashpad_rev": "bf327d8ceb6a669607b0dbab5a83a275d03f99ed",
@@ -393,16 +389,6 @@ deps = {
393389
Var("dart_git") + "pub.git" + "@" + Var("pub_rev"),
394390
Var("dart_root") + "/third_party/pkg/shelf":
395391
Var("dart_git") + "shelf.git" + "@" + Var("shelf_rev"),
396-
Var("dart_root") + "/third_party/pkg/shelf_packages_handler":
397-
Var("dart_git") + "shelf_packages_handler.git"
398-
+ "@" + Var("shelf_packages_handler_rev"),
399-
Var("dart_root") + "/third_party/pkg/shelf_proxy":
400-
Var("dart_git") + "shelf_proxy.git" + "@" + Var("shelf_proxy_rev"),
401-
Var("dart_root") + "/third_party/pkg/shelf_static":
402-
Var("dart_git") + "shelf_static.git" + "@" + Var("shelf_static_rev"),
403-
Var("dart_root") + "/third_party/pkg/shelf_web_socket":
404-
Var("dart_git") + "shelf_web_socket.git" +
405-
"@" + Var("shelf_web_socket_rev"),
406392
Var("dart_root") + "/third_party/pkg/source_maps":
407393
Var("dart_git") + "source_maps.git" + "@" + Var("source_maps_rev"),
408394
Var("dart_root") + "/third_party/pkg/source_span":

pkg/_fe_analyzer_shared/lib/src/macros/api/introspection.dart

+11-6
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,15 @@ abstract class ClassMemberDeclaration implements Declaration {
100100
bool get isStatic;
101101
}
102102

103-
/// A declaration that defines a new type in the program.
103+
/// Marker interface for a declaration that defines a new type in the program.
104+
///
105+
/// See [ParameterizedTypeDeclaration] and [TypeParameterDeclaration].
106+
abstract class TypeDeclaration implements Declaration {}
107+
108+
/// A [TypeDeclaration] which may have type parameters.
104109
///
105110
/// See subtypes [ClassDeclaration] and [TypeAliasDeclaration].
106-
abstract class TypeDeclaration implements Declaration {
111+
abstract class ParameterizedTypeDeclaration implements TypeDeclaration {
107112
/// The type parameters defined for this type declaration.
108113
Iterable<TypeParameterDeclaration> get typeParameters;
109114
}
@@ -112,7 +117,7 @@ abstract class TypeDeclaration implements Declaration {
112117
///
113118
/// Information about fields, methods, and constructors must be retrieved from
114119
/// the `builder` objects.
115-
abstract class ClassDeclaration implements TypeDeclaration {
120+
abstract class ClassDeclaration implements ParameterizedTypeDeclaration {
116121
/// Whether this class has an `abstract` modifier.
117122
bool get isAbstract;
118123

@@ -133,7 +138,7 @@ abstract class ClassDeclaration implements TypeDeclaration {
133138
}
134139

135140
/// Type alias introspection information.
136-
abstract class TypeAliasDeclaration extends TypeDeclaration {
141+
abstract class TypeAliasDeclaration implements ParameterizedTypeDeclaration {
137142
/// The type annotation this is an alias for.
138143
TypeAnnotation get aliasedType;
139144
}
@@ -227,8 +232,8 @@ abstract class FunctionTypeParameter implements Parameter {
227232
String? get name;
228233
}
229234

230-
/// Type parameter introspection information.
231-
abstract class TypeParameterDeclaration implements Declaration {
235+
/// Generic type parameter introspection information.
236+
abstract class TypeParameterDeclaration implements TypeDeclaration {
232237
/// The bound for this type parameter, if it has any.
233238
TypeAnnotation? get bound;
234239

pkg/_fe_analyzer_shared/lib/src/macros/executor/executor_base.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ abstract class ExternalMacroExecutorBase extends MacroExecutor {
172172
responseType: MessageType.remoteInstance,
173173
response: (await resolver.declarationOf(request.identifier)
174174
// TODO: Consider refactoring to avoid the need for
175-
// this.
176-
as TypeDeclarationImpl),
175+
// this cast.
176+
as Serializable),
177177
serializationZoneId: zoneId);
178178
} on ArgumentError catch (error) {
179179
response = new SerializableResponse(

pkg/_fe_analyzer_shared/lib/src/macros/executor/introspection_impls.dart

+5-5
Original file line numberDiff line numberDiff line change
@@ -564,12 +564,12 @@ class FieldDeclarationImpl extends VariableDeclarationImpl
564564
}
565565
}
566566

567-
abstract class TypeDeclarationImpl extends DeclarationImpl
568-
implements TypeDeclaration {
567+
abstract class ParameterizedTypeDeclarationImpl extends DeclarationImpl
568+
implements ParameterizedTypeDeclaration {
569569
@override
570570
final List<TypeParameterDeclarationImpl> typeParameters;
571571

572-
TypeDeclarationImpl({
572+
ParameterizedTypeDeclarationImpl({
573573
required int id,
574574
required IdentifierImpl identifier,
575575
required this.typeParameters,
@@ -588,7 +588,7 @@ abstract class TypeDeclarationImpl extends DeclarationImpl
588588
}
589589
}
590590

591-
class ClassDeclarationImpl extends TypeDeclarationImpl
591+
class ClassDeclarationImpl extends ParameterizedTypeDeclarationImpl
592592
implements ClassDeclaration {
593593
@override
594594
final List<TypeAnnotationImpl> interfaces;
@@ -645,7 +645,7 @@ class ClassDeclarationImpl extends TypeDeclarationImpl
645645
}
646646
}
647647

648-
class TypeAliasDeclarationImpl extends TypeDeclarationImpl
648+
class TypeAliasDeclarationImpl extends ParameterizedTypeDeclarationImpl
649649
implements TypeAliasDeclaration {
650650
/// The type being aliased.
651651
final TypeAnnotationImpl aliasedType;

0 commit comments

Comments
 (0)