Skip to content

Commit

Permalink
[release] Bump version on main to 3.2
Browse files Browse the repository at this point in the history
Tested: CQ
Change-Id: I16210697b47dd85aec8743b457e773b044cab81f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/316200
Reviewed-by: William Hesse <[email protected]>
Commit-Queue: Alexander Thomas <[email protected]>
  • Loading branch information
athomas authored and Commit Queue committed Jul 25, 2023
1 parent d166023 commit a3d4888
Show file tree
Hide file tree
Showing 9 changed files with 48 additions and 71 deletions.
32 changes: 16 additions & 16 deletions pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -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',
Expand All @@ -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;
Expand Down
27 changes: 2 additions & 25 deletions pkg/analyzer/lib/src/dart/analysis/experiments.g.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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 = <String, ExperimentalFeature>{
Expand Down Expand Up @@ -45,7 +45,6 @@ final _knownFeatures = <String, ExperimentalFeature>{
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,
};

Expand Down Expand Up @@ -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';
}
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -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',
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/kernel/lib/default_language_version.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@

import "ast.dart";

Version defaultLanguageVersion = const Version(3, 1);
Version defaultLanguageVersion = const Version(3, 2);
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion runtime/vm/experimental_features.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion runtime/vm/experimental_features.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_
Expand Down
2 changes: 1 addition & 1 deletion tools/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#
CHANNEL be
MAJOR 3
MINOR 1
MINOR 2
PATCH 0
PRERELEASE 0
PRERELEASE_PATCH 0
2 changes: 1 addition & 1 deletion tools/experimental_features.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit a3d4888

Please sign in to comment.