Revert "Bump version to 3.3."

This reverts commit 81aaf6c6c4.

Reason for revert: regression in G3: b/303734572

Original change's description:
> Bump version to 3.3.
>
> Remove needless version number comment from experimental_features to
> remove duplicated information and simplify version updates.
>
> Tested: CQ
> Change-Id: I864bfc44070136406e95fdaf4d83f491b2c95943
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/329460
> Reviewed-by: Alexander Thomas <athom@google.com>

Change-Id: Ie7dca3106345ee7949ccd13ab4765998926c0abc
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/329603
Commit-Queue: Ilya Yanok <yanok@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Alexander Thomas <athom@google.com>
This commit is contained in:
Ilya Yanok 2023-10-06 13:34:56 +00:00 committed by Commit Queue
parent 6f090565aa
commit 85fd1b8f43
16 changed files with 27 additions and 19 deletions

View file

@ -6,7 +6,7 @@
//
// Instead modify 'tools/experimental_features.yaml' and run
// 'dart pkg/front_end/tool/fasta.dart generate-experimental-flags' to update.
const Version defaultLanguageVersion = const Version(3, 3);
const Version defaultLanguageVersion = const Version(3, 2);
/// Enum for experimental flags shared between the CFE and the analyzer.
enum ExperimentalFlag {

View file

@ -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.3.0';
const _currentVersion = '3.2.0';
/// A map containing information about all known experimental flags.
final _knownFeatures = <String, ExperimentalFeature>{

View file

@ -148,7 +148,7 @@ void runNullSafeSharedTests(
group('JS interop with extension types', () {
const interopSource = r'''
// @dart=3.3
// @dart=3.2
@JS()
library debug_static_interop;

View file

@ -3,7 +3,7 @@ library;
// Problems in library:
//
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:7:11: Error: The 'inline-class' language feature is disabled for this library.
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
// extension type ExtensionType1(int it) {}
// ^^^^
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature.
@ -11,7 +11,7 @@ library;
// ^^^^^^^^^^^^^
//
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:8:11: Error: The 'inline-class' language feature is disabled for this library.
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
// extension type ExtensionType2<T>._(int it) implements int, ExtensionType1 {}
// ^^^^
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature.

View file

@ -3,7 +3,7 @@ library;
// Problems in library:
//
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:7:11: Error: The 'inline-class' language feature is disabled for this library.
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
// extension type ExtensionType1(int it) {}
// ^^^^
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature.
@ -11,7 +11,7 @@ library;
// ^^^^^^^^^^^^^
//
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:8:11: Error: The 'inline-class' language feature is disabled for this library.
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
// extension type ExtensionType2<T>._(int it) implements int, ExtensionType1 {}
// ^^^^
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature.

View file

@ -3,7 +3,7 @@ library;
// Problems in library:
//
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:7:11: Error: The 'inline-class' language feature is disabled for this library.
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
// extension type ExtensionType1(int it) {}
// ^^^^
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature.
@ -11,7 +11,7 @@ library;
// ^^^^^^^^^^^^^
//
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:8:11: Error: The 'inline-class' language feature is disabled for this library.
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
// extension type ExtensionType2<T>._(int it) implements int, ExtensionType1 {}
// ^^^^
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature.

View file

@ -3,7 +3,7 @@ library;
// Problems in library:
//
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:7:11: Error: The 'inline-class' language feature is disabled for this library.
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
// extension type ExtensionType1(int it) {}
// ^^^^
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature.
@ -11,7 +11,7 @@ library;
// ^^^^^^^^^^^^^
//
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:8:11: Error: The 'inline-class' language feature is disabled for this library.
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
// extension type ExtensionType2<T>._(int it) implements int, ExtensionType1 {}
// ^^^^
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature.

View file

@ -3,7 +3,7 @@ library;
// Problems in library:
//
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:7:11: Error: The 'inline-class' language feature is disabled for this library.
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
// extension type ExtensionType1(int it) {}
// ^^^^
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature.
@ -11,7 +11,7 @@ library;
// ^^^^^^^^^^^^^
//
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:8:11: Error: The 'inline-class' language feature is disabled for this library.
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
// extension type ExtensionType2<T>._(int it) implements int, ExtensionType1 {}
// ^^^^
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature.

View file

@ -3,7 +3,7 @@ library;
// Problems in library:
//
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:7:11: Error: The 'inline-class' language feature is disabled for this library.
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
// extension type ExtensionType1(int it) {}
// ^^^^
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature.
@ -11,7 +11,7 @@ library;
// ^^^^^^^^^^^^^
//
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:8:11: Error: The 'inline-class' language feature is disabled for this library.
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
// extension type ExtensionType2<T>._(int it) implements int, ExtensionType1 {}
// ^^^^
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature.

View file

@ -9,4 +9,4 @@
import "ast.dart";
const Version defaultLanguageVersion = const Version(3, 3);
const Version defaultLanguageVersion = const Version(3, 2);

View file

@ -3,7 +3,7 @@
// BSD-style license that can be found in the LICENSE file.
// VMOptions=--enable-experiment=inline-class
// @dart=3.3
// @dart=3.2
// ignore_for_file: experiment_not_enabled,undefined_class,undefined_function
import 'package:test/test.dart';

View file

@ -5,6 +5,8 @@
//
// Instead modify 'tools/experimental_features.yaml' and run
// 'dart tools/generate_experimental_flags.dart' to update.
//
// Current version: 3.2.0
#include "vm/experimental_features.h"

View file

@ -5,6 +5,8 @@
//
// Instead modify 'tools/experimental_features.yaml' and run
// 'dart tools/generate_experimental_flags.dart' to update.
//
// Current version: 3.2.0
#ifndef RUNTIME_VM_EXPERIMENTAL_FEATURES_H_
#define RUNTIME_VM_EXPERIMENTAL_FEATURES_H_

View file

@ -25,7 +25,7 @@
#
CHANNEL be
MAJOR 3
MINOR 3
MINOR 2
PATCH 0
PRERELEASE 0
PRERELEASE_PATCH 0

View file

@ -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.3.0'
current-version: '3.2.0'
features:
variance:

View file

@ -36,6 +36,8 @@ void main() {
//
// Instead modify 'tools/experimental_features.yaml' and run
// 'dart tools/generate_experimental_flags.dart' to update.
//
// Current version: ${currentVersion.join('.')}
#ifndef RUNTIME_VM_EXPERIMENTAL_FEATURES_H_
#define RUNTIME_VM_EXPERIMENTAL_FEATURES_H_
@ -61,6 +63,8 @@ const char* GetExperimentalFeatureName(ExperimentalFeature feature);
//
// Instead modify 'tools/experimental_features.yaml' and run
// 'dart tools/generate_experimental_flags.dart' to update.
//
// Current version: ${currentVersion.join('.')}
#include "vm/experimental_features.h"