Skip to content

Commit 942989e

Browse files
committed
[native_assets] Enable code assets for next stable release
Make it available on the stable branch. Fix the version numbers for when it was enabled. (3.9 as experiment enabled is not entirely correct, as the experiment was not available on the stable channel in 3.9, only on betas of 3.9.) And disable passing data assets under the same experiment flag. Note: It seems that it was accidentally still marked as 3.9 and then got swept up in https://dart-review.googlesource.com/c/sdk/+/443803. TEST=dartdev native assets tests Bug: #50565 Change-Id: I4c44ad22e32673d6a951017d0cf6d3374dd20429 Cq-Include-Trybots: luci.dart.try:pkg-linux-debug-try,pkg-linux-release-arm64-try,pkg-linux-release-try,pkg-mac-release-arm64-try,pkg-mac-release-try,pkg-win-release-arm64-try,pkg-win-release-try Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/449803 Reviewed-by: Ivan Inozemtsev <[email protected]> Reviewed-by: Michael Goderbauer <[email protected]> Reviewed-by: Johnni Winther <[email protected]>
1 parent b2fee98 commit 942989e

File tree

8 files changed

+13
-14
lines changed

8 files changed

+13
-14
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ vars = {
140140
"i18n_rev": "a62bed2cf32482e531fbc5c719dfb30680f31c0d",
141141
"leak_tracker_rev": "f5620600a5ce1c44f65ddaa02001e200b096e14c", # rolled manually
142142
"material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
143-
"native_rev": "99456dec33c4c1f8927c9948ac2138ae6961abf6", # rolled manually while native assets are experimental
143+
"native_rev": "445cb0af620328ff04aeed028a60065ec6e5c7ce", # rolled manually while native assets are experimental
144144
"protobuf_rev": "971bcae358e8c6d0246382b0b15b787e6ac0a428",
145145
"pub_rev": "469eb6193c0a49495ea2ce7432cf749f077ad596", # rolled manually
146146
"shelf_rev": "de91a5b8c1de05f622c0c6f1eab38d5f31e0113f",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ enum ExperimentalFlag {
182182
name: 'native-assets',
183183
isEnabledByDefault: true,
184184
isExpired: true,
185-
experimentEnabledVersion: const Version(3, 9),
185+
experimentEnabledVersion: const Version(3, 10),
186186
experimentReleasedVersion: const Version(3, 9),
187187
),
188188

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,9 +427,9 @@ class ExperimentalFeatures {
427427
isEnabledByDefault: IsEnabledByDefault.native_assets,
428428
isExpired: IsExpired.native_assets,
429429
documentation: 'Compile and bundle native assets.',
430-
experimentalReleaseVersion: null,
431-
releaseVersion: Version.parse('3.9.0'),
432-
channels: ["main", "dev", "beta"],
430+
experimentalReleaseVersion: Version.parse('3.9.0'),
431+
releaseVersion: Version.parse('3.10.0'),
432+
channels: ["stable", "beta", "dev", "main"],
433433
);
434434

435435
static final non_nullable = ExperimentalFeature(

pkg/dartdev/lib/src/native_assets.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'package:code_assets/code_assets.dart';
99
import 'package:dartdev/src/native_assets_bundling.dart';
1010
import 'package:dartdev/src/sdk.dart';
1111
import 'package:dartdev/src/utils.dart';
12-
import 'package:data_assets/data_assets.dart';
1312
import 'package:file/local.dart';
1413
import 'package:hooks/hooks.dart';
1514
import 'package:hooks_runner/hooks_runner.dart';
@@ -137,7 +136,7 @@ class DartNativeAssetsBuilder {
137136
),
138137
// TODO(dacoharkes,mosum): This should be gated behind a data-assets
139138
// experiment flag.
140-
DataAssetsExtension(),
139+
// DataAssetsExtension(),
141140
];
142141

143142
Future<BuildResult?> _buildNativeAssetsShared({

pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ class ExperimentalFlag {
255255
name: 'native-assets',
256256
isEnabledByDefault: true,
257257
isExpired: true,
258-
enabledVersion: const Version(3, 9),
259-
experimentEnabledVersion: const Version(3, 9),
258+
enabledVersion: const Version(3, 10),
259+
experimentEnabledVersion: const Version(3, 10),
260260
experimentReleasedVersion: const Version(3, 9),
261261
);
262262

runtime/vm/experimental_features.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ bool GetExperimentalFeatureDefault(ExperimentalFeature feature) {
2626

2727
const char* GetExperimentalFeatureName(ExperimentalFeature feature) {
2828
constexpr const char* kFeatureNames[] = {
29-
"native-assets",
3029
"dot-shorthands",
30+
"native-assets",
3131
"getter-setter-error",
3232
"sound-flow-analysis",
3333
"null-aware-elements",

runtime/vm/experimental_features.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespace dart {
1313

1414
enum class ExperimentalFeature {
15-
native_assets,
1615
dot_shorthands,
16+
native_assets,
1717
getter_setter_error,
1818
sound_flow_analysis,
1919
null_aware_elements,

tools/experimental_features.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@ features:
179179
help: "Shorter dot syntax for static accesses."
180180

181181
native-assets:
182-
help: "Compile and bundle native assets."
183-
channels: [ "main", "dev", "beta" ]
184-
enabledIn: '3.9.0'
182+
help: 'Compile and bundle native assets.'
183+
enabledIn: '3.10.0'
184+
experimentalReleaseVersion: '3.9.0'
185185
expired: true
186186

187187
getter-setter-error:

0 commit comments

Comments
 (0)