Skip to content

Commit e743910

Browse files
sortieCommit Queue
sortie
authored and
Commit Queue
committed
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 <[email protected]> Auto-Submit: Jonas Termansen <[email protected]> Reviewed-by: Slava Egorov <[email protected]>
1 parent 2d09853 commit e743910

17 files changed

+20
-28
lines changed

‎DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ vars = {
142142
#
143143
# For more details, see https://github.com/dart-lang/sdk/issues/30164.
144144
"dart_style_rev": "1a2def95a3c04dafd27b85d17e6e828bd4afa1a3", # disable rev_sdk_deps.dart
145-
"dartdoc_rev": "59947b1495f6fc30fb106ae1a0a8d60d86c82f14",
145+
"dartdoc_rev": "524b2b677d977b3ef1b25a7fcefaa1f0b82bef20",
146146
"ecosystem_rev": "dcbd2ee5aeed0515204c76d6ba04f340fdc33161",
147147
"ffi_rev": "2faec288966d8f564049adb86a7ca43fd6e01fbf",
148148
"file_rev": "a18ad1ce88eaeb5a11a13ef8fc25d1e78b546c59",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
// Instead modify 'tools/experimental_features.yaml' and run
88
// 'dart pkg/front_end/tool/fasta.dart generate-experimental-flags' to update.
9-
const Version defaultLanguageVersion = const Version(3, 2);
9+
const Version defaultLanguageVersion = const Version(3, 3);
1010

1111
/// Enum for experimental flags shared between the CFE and the analyzer.
1212
enum ExperimentalFlag {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ part of 'experiments.dart';
1212

1313
/// The current version of the Dart language (or, for non-stable releases, the
1414
/// version of the language currently in the process of being developed).
15-
const _currentVersion = '3.2.0';
15+
const _currentVersion = '3.3.0';
1616

1717
/// A map containing information about all known experimental flags.
1818
final _knownFeatures = <String, ExperimentalFeature>{

‎pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_shared.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ void runNullSafeSharedTests(
148148

149149
group('JS interop with extension types', () {
150150
const interopSource = r'''
151-
// @dart=3.2
151+
// @dart=3.3
152152
153153
@JS()
154154
library debug_static_interop;

‎pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.strong.expect

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ library;
33
// Problems in library:
44
//
55
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:7:11: Error: The 'inline-class' language feature is disabled for this library.
6-
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
6+
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
77
// extension type ExtensionType1(int it) {}
88
// ^^^^
99
// 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.
1010
// // @dart=2.18
1111
// ^^^^^^^^^^^^^
1212
//
1313
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:8:11: Error: The 'inline-class' language feature is disabled for this library.
14-
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
14+
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
1515
// extension type ExtensionType2<T>._(int it) implements int, ExtensionType1 {}
1616
// ^^^^
1717
// 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.

‎pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.strong.transformed.expect

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ library;
33
// Problems in library:
44
//
55
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:7:11: Error: The 'inline-class' language feature is disabled for this library.
6-
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
6+
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
77
// extension type ExtensionType1(int it) {}
88
// ^^^^
99
// 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.
1010
// // @dart=2.18
1111
// ^^^^^^^^^^^^^
1212
//
1313
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:8:11: Error: The 'inline-class' language feature is disabled for this library.
14-
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
14+
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
1515
// extension type ExtensionType2<T>._(int it) implements int, ExtensionType1 {}
1616
// ^^^^
1717
// 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.

‎pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.expect

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ library;
33
// Problems in library:
44
//
55
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:7:11: Error: The 'inline-class' language feature is disabled for this library.
6-
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
6+
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
77
// extension type ExtensionType1(int it) {}
88
// ^^^^
99
// 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.
1010
// // @dart=2.18
1111
// ^^^^^^^^^^^^^
1212
//
1313
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:8:11: Error: The 'inline-class' language feature is disabled for this library.
14-
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
14+
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
1515
// extension type ExtensionType2<T>._(int it) implements int, ExtensionType1 {}
1616
// ^^^^
1717
// 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.

‎pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.modular.expect

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ library;
33
// Problems in library:
44
//
55
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:7:11: Error: The 'inline-class' language feature is disabled for this library.
6-
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
6+
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
77
// extension type ExtensionType1(int it) {}
88
// ^^^^
99
// 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.
1010
// // @dart=2.18
1111
// ^^^^^^^^^^^^^
1212
//
1313
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:8:11: Error: The 'inline-class' language feature is disabled for this library.
14-
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
14+
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
1515
// extension type ExtensionType2<T>._(int it) implements int, ExtensionType1 {}
1616
// ^^^^
1717
// 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.

‎pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.outline.expect

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ library;
33
// Problems in library:
44
//
55
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:7:11: Error: The 'inline-class' language feature is disabled for this library.
6-
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
6+
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
77
// extension type ExtensionType1(int it) {}
88
// ^^^^
99
// 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.
1010
// // @dart=2.18
1111
// ^^^^^^^^^^^^^
1212
//
1313
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:8:11: Error: The 'inline-class' language feature is disabled for this library.
14-
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
14+
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
1515
// extension type ExtensionType2<T>._(int it) implements int, ExtensionType1 {}
1616
// ^^^^
1717
// 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.

‎pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.transformed.expect

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ library;
33
// Problems in library:
44
//
55
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:7:11: Error: The 'inline-class' language feature is disabled for this library.
6-
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
6+
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
77
// extension type ExtensionType1(int it) {}
88
// ^^^^
99
// 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.
1010
// // @dart=2.18
1111
// ^^^^^^^^^^^^^
1212
//
1313
// pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:8:11: Error: The 'inline-class' language feature is disabled for this library.
14-
// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher.
14+
// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher.
1515
// extension type ExtensionType2<T>._(int it) implements int, ExtensionType1 {}
1616
// ^^^^
1717
// 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.

‎pkg/kernel/lib/default_language_version.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99

1010
import "ast.dart";
1111

12-
const Version defaultLanguageVersion = const Version(3, 2);
12+
const Version defaultLanguageVersion = const Version(3, 3);

‎pkg/vm_service/test/step_through_extension_type_method_call_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
// VMOptions=--enable-experiment=inline-class
6-
// @dart=3.2
6+
// @dart=3.3
77
// ignore_for_file: experiment_not_enabled,undefined_class,undefined_function
88

99
import 'package:test/test.dart';

‎runtime/vm/experimental_features.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
//
66
// Instead modify 'tools/experimental_features.yaml' and run
77
// 'dart tools/generate_experimental_flags.dart' to update.
8-
//
9-
// Current version: 3.2.0
108

119
#include "vm/experimental_features.h"
1210

‎runtime/vm/experimental_features.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
//
66
// Instead modify 'tools/experimental_features.yaml' and run
77
// 'dart tools/generate_experimental_flags.dart' to update.
8-
//
9-
// Current version: 3.2.0
108

119
#ifndef RUNTIME_VM_EXPERIMENTAL_FEATURES_H_
1210
#define RUNTIME_VM_EXPERIMENTAL_FEATURES_H_

‎tools/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#
2626
CHANNEL be
2727
MAJOR 3
28-
MINOR 2
28+
MINOR 3
2929
PATCH 0
3030
PRERELEASE 0
3131
PRERELEASE_PATCH 0

‎tools/experimental_features.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
# default 'language' "category" with code generated for both CFE and Analyzer,
110110
# while other categories can be tailored more specifically.
111111

112-
current-version: '3.2.0'
112+
current-version: '3.3.0'
113113

114114
features:
115115
variance:

‎tools/generate_experimental_flags.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ void main() {
3636
//
3737
// Instead modify 'tools/experimental_features.yaml' and run
3838
// 'dart tools/generate_experimental_flags.dart' to update.
39-
//
40-
// Current version: ${currentVersion.join('.')}
4139
4240
#ifndef RUNTIME_VM_EXPERIMENTAL_FEATURES_H_
4341
#define RUNTIME_VM_EXPERIMENTAL_FEATURES_H_
@@ -63,8 +61,6 @@ const char* GetExperimentalFeatureName(ExperimentalFeature feature);
6361
//
6462
// Instead modify 'tools/experimental_features.yaml' and run
6563
// 'dart tools/generate_experimental_flags.dart' to update.
66-
//
67-
// Current version: ${currentVersion.join('.')}
6864
6965
#include "vm/experimental_features.h"
7066

0 commit comments

Comments
 (0)