Skip to content

Commit 18774fc

Browse files
jakemac53Commit Queue
authored andcommitted
Revert package:json sdk constraint, add experimental release version of 3.6 for enhanced parts and augmentations.
Bug: #56867 Change-Id: I6d1c190b71e5492d620682cf8ff9cb003b8917c0 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/389240 Auto-Submit: Jake Macdonald <[email protected]> Reviewed-by: Samuel Rawlins <[email protected]> Reviewed-by: Nate Bosch <[email protected]> Reviewed-by: Johnni Winther <[email protected]> Commit-Queue: Johnni Winther <[email protected]>
1 parent 8a9fb7c commit 18774fc

File tree

6 files changed

+10
-7
lines changed

6 files changed

+10
-7
lines changed

pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ enum ExperimentalFlag {
1515
isEnabledByDefault: false,
1616
isExpired: false,
1717
experimentEnabledVersion: defaultLanguageVersion,
18-
experimentReleasedVersion: defaultLanguageVersion),
18+
experimentReleasedVersion: const Version(3, 6)),
1919

2020
classModifiers(
2121
name: 'class-modifiers',
@@ -71,7 +71,7 @@ enum ExperimentalFlag {
7171
isEnabledByDefault: false,
7272
isExpired: false,
7373
experimentEnabledVersion: defaultLanguageVersion,
74-
experimentReleasedVersion: defaultLanguageVersion),
74+
experimentReleasedVersion: const Version(3, 6)),
7575

7676
extensionMethods(
7777
name: 'extension-methods',

pkg/analyzer/lib/src/dart/analysis/experiments.g.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ class ExperimentalFeatures {
177177
isEnabledByDefault: IsEnabledByDefault.augmentations,
178178
isExpired: IsExpired.augmentations,
179179
documentation: 'Augmentations - enhancing declarations from outside',
180-
experimentalReleaseVersion: null,
180+
experimentalReleaseVersion: Version.parse('3.6.0'),
181181
releaseVersion: null,
182182
);
183183

@@ -259,7 +259,7 @@ class ExperimentalFeatures {
259259
isEnabledByDefault: IsEnabledByDefault.enhanced_parts,
260260
isExpired: IsExpired.enhanced_parts,
261261
documentation: 'Generalize parts to be nested and have exports/imports.',
262-
experimentalReleaseVersion: null,
262+
experimentalReleaseVersion: Version.parse('3.6.0'),
263263
releaseVersion: null,
264264
);
265265

pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class ExperimentalFlag {
6565
isExpired: false,
6666
enabledVersion: defaultLanguageVersion,
6767
experimentEnabledVersion: defaultLanguageVersion,
68-
experimentReleasedVersion: defaultLanguageVersion);
68+
experimentReleasedVersion: const Version(3, 6));
6969

7070
static const ExperimentalFlag classModifiers = const ExperimentalFlag(
7171
name: 'class-modifiers',
@@ -129,7 +129,7 @@ class ExperimentalFlag {
129129
isExpired: false,
130130
enabledVersion: defaultLanguageVersion,
131131
experimentEnabledVersion: defaultLanguageVersion,
132-
experimentReleasedVersion: defaultLanguageVersion);
132+
experimentReleasedVersion: const Version(3, 6));
133133

134134
static const ExperimentalFlag extensionMethods = const ExperimentalFlag(
135135
name: 'extension-methods',

pkg/json/analysis_options.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ analyzer:
44
errors:
55
deprecated_member_use_from_same_package: ignore
66
enable-experiment:
7+
- augmentations
78
- enhanced-parts
89
- macros

pkg/json/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: >
77
repository: https://github.com/dart-lang/sdk/tree/main/pkg/json
88
version: 0.20.2
99
environment:
10-
sdk: ^3.7.0-edge
10+
sdk: ^3.6.0-edge
1111
dependencies:
1212
macros: ^0.1.0-main.5
1313
dev_dependencies:

tools/experimental_features.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,14 @@ features:
135135
help: "Null-aware elements and map entries in collections."
136136

137137
enhanced-parts:
138+
experimentalReleaseVersion: '3.6.0'
138139
help: "Generalize parts to be nested and have exports/imports."
139140

140141
unquoted-imports:
141142
help: "Shorter import syntax."
142143

143144
augmentations:
145+
experimentalReleaseVersion: '3.6.0'
144146
help: "Augmentations - enhancing declarations from outside"
145147

146148
inference-using-bounds:

0 commit comments

Comments
 (0)