From 09f467b557a2bf84c052e152df80f7b43ba41a7e Mon Sep 17 00:00:00 2001 From: Ivan Inozemtsev Date: Thu, 10 Apr 2025 09:50:11 -0700 Subject: [PATCH] Update prebuilt Dart SDK to 3.9.0-3.0.dev Revert changes to experimental_features.yaml. Change-Id: Ic0ee592d8ceb72cf9c450b8bb898e01e93e6dbdb Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/421840 Commit-Queue: Alexander Thomas Reviewed-by: Paul Berry Reviewed-by: Alexander Thomas Auto-Submit: Ivan Inozemtsev --- DEPS | 2 +- pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart | 10 +++++----- pkg/analyzer/lib/src/dart/analysis/experiments.g.dart | 10 +++++----- .../api_prototype/experimental_flags_generated.dart | 10 +++++----- pkg/front_end/testcases/pubspec.yaml | 4 ++-- pubspec.yaml | 2 +- tools/experimental_features.yaml | 5 ----- 7 files changed, 19 insertions(+), 24 deletions(-) diff --git a/DEPS b/DEPS index dfa3b4d4f2b..0fe4cfcbeb7 100644 --- a/DEPS +++ b/DEPS @@ -50,7 +50,7 @@ vars = { # Checked-in SDK version. The checked-in SDK is a Dart SDK distribution # in a cipd package used to run Dart scripts in the build and test # infrastructure, which is automatically built on the release commits. - "sdk_tag": "git_revision:4a4ff9fba9ca67e9406743a24a3c47ad64d9e9c2", + "sdk_tag": "git_revision:5a8921e0042c662ea2adbac35ea051dec20a5341", # co19 is a cipd package automatically generated for each co19 commit. # Use tests/co19/update.sh to update this hash. diff --git a/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart b/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart index 0f552d24df7..c4c3db64351 100644 --- a/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart +++ b/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart @@ -29,7 +29,7 @@ enum ExperimentalFlag { isEnabledByDefault: false, isExpired: false, experimentEnabledVersion: defaultLanguageVersion, - experimentReleasedVersion: const Version(3, 8)), + experimentReleasedVersion: defaultLanguageVersion), constantUpdate2018( name: 'constant-update-2018', @@ -64,7 +64,7 @@ enum ExperimentalFlag { isEnabledByDefault: false, isExpired: false, experimentEnabledVersion: defaultLanguageVersion, - experimentReleasedVersion: const Version(3, 8)), + experimentReleasedVersion: defaultLanguageVersion), enhancedEnums( name: 'enhanced-enums', @@ -99,7 +99,7 @@ enum ExperimentalFlag { isEnabledByDefault: false, isExpired: false, experimentEnabledVersion: defaultLanguageVersion, - experimentReleasedVersion: const Version(3, 8)), + experimentReleasedVersion: defaultLanguageVersion), inferenceUpdate1( name: 'inference-update-1', @@ -127,7 +127,7 @@ enum ExperimentalFlag { isEnabledByDefault: false, isExpired: false, experimentEnabledVersion: defaultLanguageVersion, - experimentReleasedVersion: const Version(3, 8)), + experimentReleasedVersion: defaultLanguageVersion), inferenceUsingBounds( name: 'inference-using-bounds', @@ -274,7 +274,7 @@ enum ExperimentalFlag { isEnabledByDefault: false, isExpired: false, experimentEnabledVersion: defaultLanguageVersion, - experimentReleasedVersion: const Version(3, 8)), + experimentReleasedVersion: defaultLanguageVersion), wildcardVariables( name: 'wildcard-variables', diff --git a/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart b/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart index c50ac00eedc..29226f9a31e 100644 --- a/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart +++ b/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart @@ -212,7 +212,7 @@ class ExperimentalFeatures { isExpired: IsExpired.const_functions, documentation: 'Allow more of the Dart language to be executed in const expressions.', - experimentalReleaseVersion: Version.parse('3.8.0'), + experimentalReleaseVersion: null, releaseVersion: null, channels: ["stable", "beta", "dev", "main"], ); @@ -268,7 +268,7 @@ class ExperimentalFeatures { isEnabledByDefault: IsEnabledByDefault.dot_shorthands, isExpired: IsExpired.dot_shorthands, documentation: 'Shorter dot syntax for static accesses.', - experimentalReleaseVersion: Version.parse('3.8.0'), + experimentalReleaseVersion: null, releaseVersion: null, channels: ["stable", "beta", "dev", "main"], ); @@ -325,7 +325,7 @@ class ExperimentalFeatures { isExpired: IsExpired.getter_setter_error, documentation: 'Stop reporting errors about mismatching types in a getter/setter pair.', - experimentalReleaseVersion: Version.parse('3.8.0'), + experimentalReleaseVersion: null, releaseVersion: null, channels: ["stable", "beta", "dev", "main"], ); @@ -371,7 +371,7 @@ class ExperimentalFeatures { isEnabledByDefault: IsEnabledByDefault.inference_update_4, isExpired: IsExpired.inference_update_4, documentation: 'A bundle of updates to type inference.', - experimentalReleaseVersion: Version.parse('3.8.0'), + experimentalReleaseVersion: null, releaseVersion: null, channels: ["stable", "beta", "dev", "main"], ); @@ -605,7 +605,7 @@ class ExperimentalFeatures { isEnabledByDefault: IsEnabledByDefault.variance, isExpired: IsExpired.variance, documentation: 'Sound variance', - experimentalReleaseVersion: Version.parse('3.8.0'), + experimentalReleaseVersion: null, releaseVersion: null, channels: ["stable", "beta", "dev", "main"], ); 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 fe107fe9ffe..19d097f17ab 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 @@ -81,7 +81,7 @@ class ExperimentalFlag { isExpired: false, enabledVersion: defaultLanguageVersion, experimentEnabledVersion: defaultLanguageVersion, - experimentReleasedVersion: const Version(3, 8)); + experimentReleasedVersion: defaultLanguageVersion); static const ExperimentalFlag constantUpdate2018 = const ExperimentalFlag( name: 'constant-update-2018', @@ -121,7 +121,7 @@ class ExperimentalFlag { isExpired: false, enabledVersion: defaultLanguageVersion, experimentEnabledVersion: defaultLanguageVersion, - experimentReleasedVersion: const Version(3, 8)); + experimentReleasedVersion: defaultLanguageVersion); static const ExperimentalFlag enhancedEnums = const ExperimentalFlag( name: 'enhanced-enums', @@ -161,7 +161,7 @@ class ExperimentalFlag { isExpired: false, enabledVersion: defaultLanguageVersion, experimentEnabledVersion: defaultLanguageVersion, - experimentReleasedVersion: const Version(3, 8)); + experimentReleasedVersion: defaultLanguageVersion); static const ExperimentalFlag inferenceUpdate1 = const ExperimentalFlag( name: 'inference-update-1', @@ -193,7 +193,7 @@ class ExperimentalFlag { isExpired: false, enabledVersion: defaultLanguageVersion, experimentEnabledVersion: defaultLanguageVersion, - experimentReleasedVersion: const Version(3, 8)); + experimentReleasedVersion: defaultLanguageVersion); static const ExperimentalFlag inferenceUsingBounds = const ExperimentalFlag( name: 'inference-using-bounds', @@ -361,7 +361,7 @@ class ExperimentalFlag { isExpired: false, enabledVersion: defaultLanguageVersion, experimentEnabledVersion: defaultLanguageVersion, - experimentReleasedVersion: const Version(3, 8)); + experimentReleasedVersion: defaultLanguageVersion); static const ExperimentalFlag wildcardVariables = const ExperimentalFlag( name: 'wildcard-variables', diff --git a/pkg/front_end/testcases/pubspec.yaml b/pkg/front_end/testcases/pubspec.yaml index 6e0649e9205..a40f5b5c449 100644 --- a/pkg/front_end/testcases/pubspec.yaml +++ b/pkg/front_end/testcases/pubspec.yaml @@ -2,5 +2,5 @@ name: front_end_testcases # This package is not intended for consumption on pub.dev. DO NOT publish. publish_to: none environment: - sdk: ^3.8.0-0 -resolution: workspace \ No newline at end of file + sdk: ^3.9.0-0 +resolution: workspace diff --git a/pubspec.yaml b/pubspec.yaml index e1522e886f5..8df4ba36323 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ environment: # # It needs to be updated before testing language features introduced in the # next language version. - sdk: ^3.8.0-0 + sdk: ^3.9.0-0 # These are the packages that are contained in the SDK. workspace: diff --git a/tools/experimental_features.yaml b/tools/experimental_features.yaml index 8b72cf3736d..07d1fe9285e 100644 --- a/tools/experimental_features.yaml +++ b/tools/experimental_features.yaml @@ -114,11 +114,9 @@ current-version: '3.9.0' features: variance: - experimentalReleaseVersion: '3.8.0' help: "Sound variance" const-functions: - experimentalReleaseVersion: '3.8.0' help: "Allow more of the Dart language to be executed in const expressions." macros: @@ -145,15 +143,12 @@ features: help: "Augmentations - enhancing declarations from outside" inference-update-4: - experimentalReleaseVersion: '3.8.0' help: "A bundle of updates to type inference." dot-shorthands: - experimentalReleaseVersion: '3.8.0' help: "Shorter dot syntax for static accesses." getter-setter-error: - experimentalReleaseVersion: '3.8.0' help: "Stop reporting errors about mismatching types in a getter/setter pair." sound-flow-analysis: