diff --git a/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart b/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart index e843d3faaa6..8c17b058102 100644 --- a/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart +++ b/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart @@ -20,8 +20,8 @@ enum ExperimentalFlag { name: 'const-functions', isEnabledByDefault: false, isExpired: false, - experimentEnabledVersion: const Version(3, 1), - experimentReleasedVersion: const Version(3, 1)), + experimentEnabledVersion: const Version(3, 2), + experimentReleasedVersion: const Version(3, 2)), constantUpdate2018( name: 'constant-update-2018', @@ -62,8 +62,8 @@ enum ExperimentalFlag { name: 'extension-types', isEnabledByDefault: false, isExpired: false, - experimentEnabledVersion: const Version(3, 1), - experimentReleasedVersion: const Version(3, 1)), + experimentEnabledVersion: const Version(3, 2), + experimentReleasedVersion: const Version(3, 2)), genericMetadata( name: 'generic-metadata', @@ -83,22 +83,22 @@ enum ExperimentalFlag { name: 'inference-update-2', isEnabledByDefault: false, isExpired: false, - experimentEnabledVersion: const Version(3, 1), - experimentReleasedVersion: const Version(3, 1)), + experimentEnabledVersion: const Version(3, 2), + experimentReleasedVersion: const Version(3, 2)), inlineClass( name: 'inline-class', isEnabledByDefault: false, isExpired: false, - experimentEnabledVersion: const Version(3, 1), - experimentReleasedVersion: const Version(3, 1)), + experimentEnabledVersion: const Version(3, 2), + experimentReleasedVersion: const Version(3, 2)), macros( name: 'macros', isEnabledByDefault: false, isExpired: false, - experimentEnabledVersion: const Version(3, 1), - experimentReleasedVersion: const Version(3, 1)), + experimentEnabledVersion: const Version(3, 2), + experimentReleasedVersion: const Version(3, 2)), namedArgumentsAnywhere( name: 'named-arguments-anywhere', @@ -111,8 +111,8 @@ enum ExperimentalFlag { name: 'native-assets', isEnabledByDefault: false, isExpired: false, - experimentEnabledVersion: const Version(3, 1), - experimentReleasedVersion: const Version(3, 1)), + experimentEnabledVersion: const Version(3, 2), + experimentReleasedVersion: const Version(3, 2)), nonNullable( name: 'non-nullable', @@ -174,8 +174,8 @@ enum ExperimentalFlag { name: 'test-experiment', isEnabledByDefault: false, isExpired: false, - experimentEnabledVersion: const Version(3, 1), - experimentReleasedVersion: const Version(3, 1)), + experimentEnabledVersion: const Version(3, 2), + experimentReleasedVersion: const Version(3, 2)), tripleShift( name: 'triple-shift', @@ -195,8 +195,8 @@ enum ExperimentalFlag { name: 'variance', isEnabledByDefault: false, isExpired: false, - experimentEnabledVersion: const Version(3, 1), - experimentReleasedVersion: const Version(3, 1)), + experimentEnabledVersion: const Version(3, 2), + experimentReleasedVersion: const Version(3, 2)), ; final String name; diff --git a/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart b/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart index 9ca8dc6c5b3..3ba750782c5 100644 --- a/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart +++ b/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart @@ -12,7 +12,7 @@ part of 'experiments.dart'; /// The current version of the Dart language (or, for non-stable releases, the /// version of the language currently in the process of being developed). -const _currentVersion = '3.1.0'; +const _currentVersion = '3.2.0'; /// A map containing information about all known experimental flags. final _knownFeatures = { @@ -45,7 +45,6 @@ final _knownFeatures = { EnableString.test_experiment: ExperimentalFeatures.test_experiment, EnableString.triple_shift: ExperimentalFeatures.triple_shift, EnableString.unnamed_libraries: ExperimentalFeatures.unnamed_libraries, - EnableString.value_class: ExperimentalFeatures.value_class, EnableString.variance: ExperimentalFeatures.variance, }; @@ -130,9 +129,6 @@ class EnableString { /// String to enable the experiment "unnamed-libraries" static const String unnamed_libraries = 'unnamed-libraries'; - /// String to enable the experiment "value-class" - static const String value_class = 'value-class'; - /// String to enable the experiment "variance" static const String variance = 'variance'; } @@ -403,18 +399,8 @@ class ExperimentalFeatures { releaseVersion: Version.parse('2.19.0'), ); - static final value_class = ExperimentalFeature( - index: 26, - enableString: EnableString.value_class, - isEnabledByDefault: IsEnabledByDefault.value_class, - isExpired: IsExpired.value_class, - documentation: 'Value class', - experimentalReleaseVersion: null, - releaseVersion: null, - ); - static final variance = ExperimentalFeature( - index: 27, + index: 26, enableString: EnableString.variance, isEnabledByDefault: IsEnabledByDefault.variance, isExpired: IsExpired.variance, @@ -505,9 +491,6 @@ class IsEnabledByDefault { /// Default state of the experiment "unnamed-libraries" static const bool unnamed_libraries = true; - /// Default state of the experiment "value-class" - static const bool value_class = false; - /// Default state of the experiment "variance" static const bool variance = false; } @@ -594,9 +577,6 @@ class IsExpired { /// Expiration status of the experiment "unnamed-libraries" static const bool unnamed_libraries = true; - /// Expiration status of the experiment "value-class" - static const bool value_class = false; - /// Expiration status of the experiment "variance" static const bool variance = false; } @@ -690,9 +670,6 @@ mixin _CurrentState { bool get unnamed_libraries => isEnabled(ExperimentalFeatures.unnamed_libraries); - /// Current state for the flag "value-class" - bool get value_class => isEnabled(ExperimentalFeatures.value_class); - /// Current state for the flag "variance" bool get variance => isEnabled(ExperimentalFeatures.variance); 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 index cc5bc45d6c5..a9d16682f5c 100644 --- a/pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart +++ b/pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart @@ -71,9 +71,9 @@ class ExperimentalFlag { name: 'const-functions', isEnabledByDefault: false, isExpired: false, - enabledVersion: const Version(3, 1), - experimentEnabledVersion: const Version(3, 1), - experimentReleasedVersion: const Version(3, 1)); + enabledVersion: const Version(3, 2), + experimentEnabledVersion: const Version(3, 2), + experimentReleasedVersion: const Version(3, 2)); static const ExperimentalFlag constantUpdate2018 = const ExperimentalFlag( name: 'constant-update-2018', @@ -119,9 +119,9 @@ class ExperimentalFlag { name: 'extension-types', isEnabledByDefault: false, isExpired: false, - enabledVersion: const Version(3, 1), - experimentEnabledVersion: const Version(3, 1), - experimentReleasedVersion: const Version(3, 1)); + enabledVersion: const Version(3, 2), + experimentEnabledVersion: const Version(3, 2), + experimentReleasedVersion: const Version(3, 2)); static const ExperimentalFlag genericMetadata = const ExperimentalFlag( name: 'generic-metadata', @@ -143,25 +143,25 @@ class ExperimentalFlag { name: 'inference-update-2', isEnabledByDefault: false, isExpired: false, - enabledVersion: const Version(3, 1), - experimentEnabledVersion: const Version(3, 1), - experimentReleasedVersion: const Version(3, 1)); + enabledVersion: const Version(3, 2), + experimentEnabledVersion: const Version(3, 2), + experimentReleasedVersion: const Version(3, 2)); static const ExperimentalFlag inlineClass = const ExperimentalFlag( name: 'inline-class', isEnabledByDefault: false, isExpired: false, - enabledVersion: const Version(3, 1), - experimentEnabledVersion: const Version(3, 1), - experimentReleasedVersion: const Version(3, 1)); + enabledVersion: const Version(3, 2), + experimentEnabledVersion: const Version(3, 2), + experimentReleasedVersion: const Version(3, 2)); static const ExperimentalFlag macros = const ExperimentalFlag( name: 'macros', isEnabledByDefault: false, isExpired: false, - enabledVersion: const Version(3, 1), - experimentEnabledVersion: const Version(3, 1), - experimentReleasedVersion: const Version(3, 1)); + enabledVersion: const Version(3, 2), + experimentEnabledVersion: const Version(3, 2), + experimentReleasedVersion: const Version(3, 2)); static const ExperimentalFlag namedArgumentsAnywhere = const ExperimentalFlag( name: 'named-arguments-anywhere', @@ -175,9 +175,9 @@ class ExperimentalFlag { name: 'native-assets', isEnabledByDefault: false, isExpired: false, - enabledVersion: const Version(3, 1), - experimentEnabledVersion: const Version(3, 1), - experimentReleasedVersion: const Version(3, 1)); + enabledVersion: const Version(3, 2), + experimentEnabledVersion: const Version(3, 2), + experimentReleasedVersion: const Version(3, 2)); static const ExperimentalFlag nonNullable = const ExperimentalFlag( name: 'non-nullable', @@ -247,9 +247,9 @@ class ExperimentalFlag { name: 'test-experiment', isEnabledByDefault: false, isExpired: false, - enabledVersion: const Version(3, 1), - experimentEnabledVersion: const Version(3, 1), - experimentReleasedVersion: const Version(3, 1)); + enabledVersion: const Version(3, 2), + experimentEnabledVersion: const Version(3, 2), + experimentReleasedVersion: const Version(3, 2)); static const ExperimentalFlag tripleShift = const ExperimentalFlag( name: 'triple-shift', @@ -271,9 +271,9 @@ class ExperimentalFlag { name: 'variance', isEnabledByDefault: false, isExpired: false, - enabledVersion: const Version(3, 1), - experimentEnabledVersion: const Version(3, 1), - experimentReleasedVersion: const Version(3, 1)); + enabledVersion: const Version(3, 2), + experimentEnabledVersion: const Version(3, 2), + experimentReleasedVersion: const Version(3, 2)); } /// Interface for accessing the global state of experimental features. diff --git a/pkg/kernel/lib/default_language_version.dart b/pkg/kernel/lib/default_language_version.dart index 380691242b2..f35e3486d19 100644 --- a/pkg/kernel/lib/default_language_version.dart +++ b/pkg/kernel/lib/default_language_version.dart @@ -9,4 +9,4 @@ import "ast.dart"; -Version defaultLanguageVersion = const Version(3, 1); +Version defaultLanguageVersion = const Version(3, 2); diff --git a/pkg/vm_service/test/step_through_inline_class_method_call_test.dart b/pkg/vm_service/test/step_through_inline_class_method_call_test.dart index 29f4fdc298f..87b7fadbd1d 100644 --- a/pkg/vm_service/test/step_through_inline_class_method_call_test.dart +++ b/pkg/vm_service/test/step_through_inline_class_method_call_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. // VMOptions=--enable-experiment=inline-class -// @dart=3.1 +// @dart=3.2 // ignore_for_file: experiment_not_enabled import 'package:test/test.dart'; diff --git a/runtime/vm/experimental_features.cc b/runtime/vm/experimental_features.cc index 5c043fb7b4c..1f8c8f318d3 100644 --- a/runtime/vm/experimental_features.cc +++ b/runtime/vm/experimental_features.cc @@ -6,7 +6,7 @@ // Instead modify 'tools/experimental_features.yaml' and run // 'dart tools/generate_experimental_flags.dart' to update. // -// Current version: 3.1.0 +// Current version: 3.2.0 #include "vm/experimental_features.h" diff --git a/runtime/vm/experimental_features.h b/runtime/vm/experimental_features.h index 78ea6982744..112d63126ce 100644 --- a/runtime/vm/experimental_features.h +++ b/runtime/vm/experimental_features.h @@ -6,7 +6,7 @@ // Instead modify 'tools/experimental_features.yaml' and run // 'dart tools/generate_experimental_flags.dart' to update. // -// Current version: 3.1.0 +// Current version: 3.2.0 #ifndef RUNTIME_VM_EXPERIMENTAL_FEATURES_H_ #define RUNTIME_VM_EXPERIMENTAL_FEATURES_H_ diff --git a/tools/VERSION b/tools/VERSION index 6c0babbdc7f..d231ac0f0b6 100644 --- a/tools/VERSION +++ b/tools/VERSION @@ -25,7 +25,7 @@ # CHANNEL be MAJOR 3 -MINOR 1 +MINOR 2 PATCH 0 PRERELEASE 0 PRERELEASE_PATCH 0 diff --git a/tools/experimental_features.yaml b/tools/experimental_features.yaml index b46729c96e4..6fcf09cc7d2 100644 --- a/tools/experimental_features.yaml +++ b/tools/experimental_features.yaml @@ -109,7 +109,7 @@ # default 'language' "category" with code generated for both CFE and Analyzer, # while other categories can be tailored more specifically. -current-version: '3.1.0' +current-version: '3.2.0' features: variance: