Reland "Bump version to 3.3."

Please prefer not to revert this change. Any tests that fail are release
blockers and need to be approved and urgently fixed forward. Dart 3.2
has already been cut and the version number must be updated. It is
acceptable for rolls to be blocked until the release blockers have been
resolved as P0 issues.

Remove needless version number comment from experimental_features to
remove duplicated information and simplify version updates.

Update dartdoc to a version that supports 3.3.

Change-Id: I1a19aa86e185c99e61374665f18cf24c498935a5
Tested: CQ
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/329588
Commit-Queue: Slava Egorov <vegorov@google.com>
Auto-Submit: Jonas Termansen <sortie@google.com>
Reviewed-by: Slava Egorov <vegorov@google.com>
This commit is contained in:
Jonas Termansen
2023-10-06 19:00:58 +00:00
committed by Commit Queue
parent 2d0985340b
commit e743910b18
17 changed files with 20 additions and 28 deletions
+1 -1
View File
@@ -142,7 +142,7 @@ vars = {
#
# For more details, see https://github.com/dart-lang/sdk/issues/30164.
"dart_style_rev": "1a2def95a3c04dafd27b85d17e6e828bd4afa1a3", # disable rev_sdk_deps.dart
"dartdoc_rev": "59947b1495f6fc30fb106ae1a0a8d60d86c82f14",
"dartdoc_rev": "524b2b677d977b3ef1b25a7fcefaa1f0b82bef20",
"ecosystem_rev": "dcbd2ee5aeed0515204c76d6ba04f340fdc33161",
"ffi_rev": "2faec288966d8f564049adb86a7ca43fd6e01fbf",
"file_rev": "a18ad1ce88eaeb5a11a13ef8fc25d1e78b546c59",
@@ -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, 2);
const Version defaultLanguageVersion = const Version(3, 3);
/// Enum for experimental flags shared between the CFE and the analyzer.
enum ExperimentalFlag {
@@ -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.2.0';
const _currentVersion = '3.3.0';
/// A map containing information about all known experimental flags.
final _knownFeatures = <String, ExperimentalFeature>{
@@ -148,7 +148,7 @@ void runNullSafeSharedTests(
group('JS interop with extension types', () {
const interopSource = r'''
// @dart=3.2
// @dart=3.3
@JS()
library debug_static_interop;
@@ -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.2 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.3 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.2 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.3 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.
@@ -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.2 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.3 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.2 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.3 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.
@@ -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.2 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.3 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.2 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.3 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.
@@ -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.2 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.3 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.2 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.3 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.
@@ -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.2 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.3 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.2 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.3 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.
@@ -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.2 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.3 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.2 or higher.
// Try removing the `@dart=` annotation or setting the language version to 3.3 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.
+1 -1
View File
@@ -9,4 +9,4 @@
import "ast.dart";
const Version defaultLanguageVersion = const Version(3, 2);
const Version defaultLanguageVersion = const Version(3, 3);
@@ -3,7 +3,7 @@
// BSD-style license that can be found in the LICENSE file.
// VMOptions=--enable-experiment=inline-class
// @dart=3.2
// @dart=3.3
// ignore_for_file: experiment_not_enabled,undefined_class,undefined_function
import 'package:test/test.dart';
-2
View File
@@ -5,8 +5,6 @@
//
// 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"
-2
View File
@@ -5,8 +5,6 @@
//
// 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_
+1 -1
View File
@@ -25,7 +25,7 @@
#
CHANNEL be
MAJOR 3
MINOR 2
MINOR 3
PATCH 0
PRERELEASE 0
PRERELEASE_PATCH 0
+1 -1
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.2.0'
current-version: '3.3.0'
features:
variance:
-4
View File
@@ -36,8 +36,6 @@ 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_
@@ -63,8 +61,6 @@ 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"