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]>
dart-lang · Oct 11, 2024 · 18774fc · 18774fc
1 parent 8a9fb7c
commit 18774fc
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart b/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart
@@ -15,7 +15,7 @@ enum ExperimentalFlag {
       isEnabledByDefault: false,
       isExpired: false,
       experimentEnabledVersion: defaultLanguageVersion,
-      experimentReleasedVersion: defaultLanguageVersion),
+      experimentReleasedVersion: const Version(3, 6)),
 
   classModifiers(
       name: 'class-modifiers',
@@ -71,7 +71,7 @@ enum ExperimentalFlag {
       isEnabledByDefault: false,
       isExpired: false,
       experimentEnabledVersion: defaultLanguageVersion,
-      experimentReleasedVersion: defaultLanguageVersion),
+      experimentReleasedVersion: const Version(3, 6)),
 
   extensionMethods(
       name: 'extension-methods',

diff --git a/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart b/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart
@@ -177,7 +177,7 @@ class ExperimentalFeatures {
     isEnabledByDefault: IsEnabledByDefault.augmentations,
     isExpired: IsExpired.augmentations,
     documentation: 'Augmentations - enhancing declarations from outside',
-    experimentalReleaseVersion: null,
+    experimentalReleaseVersion: Version.parse('3.6.0'),
     releaseVersion: null,
   );
 
@@ -259,7 +259,7 @@ class ExperimentalFeatures {
     isEnabledByDefault: IsEnabledByDefault.enhanced_parts,
     isExpired: IsExpired.enhanced_parts,
     documentation: 'Generalize parts to be nested and have exports/imports.',
-    experimentalReleaseVersion: null,
+    experimentalReleaseVersion: Version.parse('3.6.0'),
     releaseVersion: null,
   );
 

diff --git a/pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart b/pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart
@@ -65,7 +65,7 @@ class ExperimentalFlag {
       isExpired: false,
       enabledVersion: defaultLanguageVersion,
       experimentEnabledVersion: defaultLanguageVersion,
-      experimentReleasedVersion: defaultLanguageVersion);
+      experimentReleasedVersion: const Version(3, 6));
 
   static const ExperimentalFlag classModifiers = const ExperimentalFlag(
       name: 'class-modifiers',
@@ -129,7 +129,7 @@ class ExperimentalFlag {
       isExpired: false,
       enabledVersion: defaultLanguageVersion,
       experimentEnabledVersion: defaultLanguageVersion,
-      experimentReleasedVersion: defaultLanguageVersion);
+      experimentReleasedVersion: const Version(3, 6));
 
   static const ExperimentalFlag extensionMethods = const ExperimentalFlag(
       name: 'extension-methods',

diff --git a/pkg/json/analysis_options.yaml b/pkg/json/analysis_options.yaml
@@ -4,5 +4,6 @@ analyzer:
   errors:
     deprecated_member_use_from_same_package: ignore
   enable-experiment:
+    - augmentations
     - enhanced-parts
     - macros
diff --git a/pkg/json/pubspec.yaml b/pkg/json/pubspec.yaml
@@ -7,7 +7,7 @@ description: >
 repository: https://github.com/dart-lang/sdk/tree/main/pkg/json
 version: 0.20.2
 environment:
-  sdk: ^3.7.0-edge
+  sdk: ^3.6.0-edge
 dependencies:
   macros: ^0.1.0-main.5
 dev_dependencies:

diff --git a/tools/experimental_features.yaml b/tools/experimental_features.yaml
@@ -135,12 +135,14 @@ features:
     help: "Null-aware elements and map entries in collections."
 
   enhanced-parts:
+    experimentalReleaseVersion: '3.6.0'
     help: "Generalize parts to be nested and have exports/imports."
 
   unquoted-imports:
     help: "Shorter import syntax."
 
   augmentations:
+    experimentalReleaseVersion: '3.6.0'
     help: "Augmentations - enhancing declarations from outside"
 
   inference-using-bounds: