From 7e0d92d69db953fb8bae451b52a5d80e9f1a1c4a Mon Sep 17 00:00:00 2001 From: Alexander Thomas Date: Tue, 6 Dec 2022 02:40:36 +0000 Subject: [PATCH] [3.0 alpha] Bump version to 3.0.0 Tested: Standard CQ. Bug: https://github.com/dart-lang/sdk/issues/49529 Change-Id: I329b9940db7309c7e48f17eecd7a66d5b853a484 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/271922 Commit-Queue: Siva Annamalai Reviewed-by: Siva Annamalai Reviewed-by: Brian Wilkerson Reviewed-by: Johnni Winther --- .../lib/src/experiments/flags.dart | 42 ++++++------ .../lib/src/dart/analysis/experiments.g.dart | 2 +- .../dart/resolution/library_element_test.dart | 18 +++--- ...precated_colon_for_default_value_test.dart | 6 +- ...nvalid_language_override_greater_test.dart | 2 +- .../invalid_language_override_test.dart | 4 +- .../test/verify_diagnostics_test.dart | 4 +- pkg/dartdev/test/analytics_test.dart | 12 ++-- pkg/dartdev/test/commands/run_test.dart | 2 +- pkg/dartdev/test/commands/test_test.dart | 2 +- pkg/dartdev/test/utils.dart | 2 +- .../experimental_flags_generated.dart | 64 +++++++++---------- .../general/if_case_disabled.dart.weak.expect | 2 +- .../if_case_disabled.dart.weak.modular.expect | 2 +- ...case_disabled.dart.weak.transformed.expect | 2 +- pkg/kernel/lib/default_language_version.dart | 2 +- pkg/vm_service/test/get_object_rpc_test.dart | 2 +- runtime/observatory/tests/ui/inspector.dart | 2 +- .../observatory/tests/ui/inspector_part.dart | 2 +- runtime/vm/experimental_features.cc | 2 +- runtime/vm/experimental_features.h | 2 +- tests/standalone/io/platform_test.dart | 3 +- tests/standalone_2/io/platform_test.dart | 3 +- tools/VERSION | 4 +- tools/experimental_features.yaml | 4 +- 25 files changed, 98 insertions(+), 94 deletions(-) diff --git a/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart b/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart index 417e37fa594..1478811353e 100644 --- a/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart +++ b/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart @@ -13,8 +13,8 @@ enum ExperimentalFlag { name: 'const-functions', isEnabledByDefault: false, isExpired: false, - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)), constantUpdate2018( name: 'constant-update-2018', @@ -55,8 +55,8 @@ enum ExperimentalFlag { name: 'extension-types', isEnabledByDefault: false, isExpired: false, - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)), genericMetadata( name: 'generic-metadata', @@ -76,15 +76,15 @@ enum ExperimentalFlag { name: 'inference-update-2', isEnabledByDefault: false, isExpired: false, - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)), macros( name: 'macros', isEnabledByDefault: false, isExpired: false, - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)), namedArgumentsAnywhere( name: 'named-arguments-anywhere', @@ -111,22 +111,22 @@ enum ExperimentalFlag { name: 'patterns', isEnabledByDefault: false, isExpired: false, - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)), records( name: 'records', isEnabledByDefault: false, isExpired: false, - experimentEnabledVersion: const Version(2, 19), + experimentEnabledVersion: const Version(3, 0), experimentReleasedVersion: const Version(2, 19)), sealedClass( name: 'sealed-class', isEnabledByDefault: false, isExpired: false, - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)), setLiterals( name: 'set-literals', @@ -153,8 +153,8 @@ enum ExperimentalFlag { name: 'test-experiment', isEnabledByDefault: false, isExpired: false, - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)), tripleShift( name: 'triple-shift', @@ -174,22 +174,22 @@ enum ExperimentalFlag { name: 'value-class', isEnabledByDefault: false, isExpired: false, - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)), variance( name: 'variance', isEnabledByDefault: false, isExpired: false, - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)), views( name: 'views', isEnabledByDefault: false, isExpired: false, - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)), ; final String name; diff --git a/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart b/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart index 2b1bade649e..b4f8d2f0340 100644 --- a/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart +++ b/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart @@ -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 = '2.19.0'; +const _currentVersion = '3.0.0'; /// A map containing information about all known experimental flags. final _knownFeatures = { diff --git a/pkg/analyzer/test/src/dart/resolution/library_element_test.dart b/pkg/analyzer/test/src/dart/resolution/library_element_test.dart index 27de8e920eb..6dbdea51e29 100644 --- a/pkg/analyzer/test/src/dart/resolution/library_element_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/library_element_test.dart @@ -106,17 +106,17 @@ class LibraryElementTest_featureSet extends PubPackageResolutionTest { ]); } - test_language209_override299() async { + test_language212_override399() async { writeTestPackageConfig( PackageConfigFileBuilder(), - languageVersion: '2.9', + languageVersion: '2.12', ); - await resolveTestCode('// @dart = 2.99'); + await resolveTestCode('// @dart = 3.99'); // Invalid override: minor is greater than the latest minor. _assertLanguageVersion( - package: Version.parse('2.9.0'), + package: Version.parse('2.12.0'), override: null, ); @@ -124,22 +124,23 @@ class LibraryElementTest_featureSet extends PubPackageResolutionTest { Feature.constant_update_2018, Feature.control_flow_collections, Feature.extension_methods, + Feature.non_nullable, Feature.set_literals, Feature.spread_collections, ]); } - test_language209_override300() async { + test_language212_override400() async { writeTestPackageConfig( PackageConfigFileBuilder(), - languageVersion: '2.9', + languageVersion: '2.12', ); - await resolveTestCode('// @dart = 3.00'); + await resolveTestCode('// @dart = 4.00'); // Invalid override: major is greater than the latest major. _assertLanguageVersion( - package: Version.parse('2.9.0'), + package: Version.parse('2.12.0'), override: null, ); @@ -147,6 +148,7 @@ class LibraryElementTest_featureSet extends PubPackageResolutionTest { Feature.constant_update_2018, Feature.control_flow_collections, Feature.extension_methods, + Feature.non_nullable, Feature.set_literals, Feature.spread_collections, ]); diff --git a/pkg/analyzer/test/src/diagnostics/deprecated_colon_for_default_value_test.dart b/pkg/analyzer/test/src/diagnostics/deprecated_colon_for_default_value_test.dart index f9427e30f4b..1e38393df21 100644 --- a/pkg/analyzer/test/src/diagnostics/deprecated_colon_for_default_value_test.dart +++ b/pkg/analyzer/test/src/diagnostics/deprecated_colon_for_default_value_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:analyzer/src/dart/error/hint_codes.g.dart'; +import 'package:analyzer/src/error/codes.g.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../dart/resolution/context_collection_resolution.dart'; @@ -31,13 +31,13 @@ class A { class B extends A { B({super.a : ''}); } -''', [error(HintCode.DEPRECATED_COLON_FOR_DEFAULT_VALUE, 74, 1)]); +''', [error(CompileTimeErrorCode.OBSOLETE_COLON_FOR_DEFAULT_VALUE, 74, 1)]); } test_usesColon() async { await assertErrorsInCode(''' void f({int x : 0}) {} -''', [error(HintCode.DEPRECATED_COLON_FOR_DEFAULT_VALUE, 14, 1)]); +''', [error(CompileTimeErrorCode.OBSOLETE_COLON_FOR_DEFAULT_VALUE, 14, 1)]); } test_usesEqual() async { diff --git a/pkg/analyzer/test/src/diagnostics/invalid_language_override_greater_test.dart b/pkg/analyzer/test/src/diagnostics/invalid_language_override_greater_test.dart index ef045c8fc5e..67c1c0845b0 100644 --- a/pkg/analyzer/test/src/diagnostics/invalid_language_override_greater_test.dart +++ b/pkg/analyzer/test/src/diagnostics/invalid_language_override_greater_test.dart @@ -28,7 +28,7 @@ class InvalidLanguageOverrideGreaterTest extends PubPackageResolutionTest { // @dart = ${latestVersion.major}.${latestVersion.minor + 1} class A {} ''', [ - error(HintCode.INVALID_LANGUAGE_VERSION_OVERRIDE_GREATER, 0, 15), + error(HintCode.INVALID_LANGUAGE_VERSION_OVERRIDE_GREATER, 0, 14), ]); _assertUnitLanguageVersion( package: latestVersion, diff --git a/pkg/analyzer/test/src/diagnostics/invalid_language_override_test.dart b/pkg/analyzer/test/src/diagnostics/invalid_language_override_test.dart index 156e6d237a7..d6b76ce30d7 100644 --- a/pkg/analyzer/test/src/diagnostics/invalid_language_override_test.dart +++ b/pkg/analyzer/test/src/diagnostics/invalid_language_override_test.dart @@ -24,9 +24,9 @@ int i = 0; ]); } - test_correct_2_190() async { + test_correct_3_190() async { await assertErrorsInCode(r''' -// @dart = 2.190 +// @dart = 3.190 int i = 0; ''', [ error(HintCode.INVALID_LANGUAGE_VERSION_OVERRIDE_GREATER, 0, 16), diff --git a/pkg/analyzer/test/verify_diagnostics_test.dart b/pkg/analyzer/test/verify_diagnostics_test.dart index 80d4cf79307..080f681d96d 100644 --- a/pkg/analyzer/test/verify_diagnostics_test.dart +++ b/pkg/analyzer/test/verify_diagnostics_test.dart @@ -58,8 +58,6 @@ class DocumentationValidator { 'CompileTimeErrorCode.MULTIPLE_SUPER_INITIALIZERS', // Produces two diagnostics when it should only produce one. 'CompileTimeErrorCode.NON_SYNC_FACTORY', - // This isn't enabled yet, but will be enabled in 3.0. - 'CompileTimeErrorCode.OBSOLETE_COLON_FOR_DEFAULT_VALUE', // Need a way to make auxiliary files that (a) are not included in the // generated docs or (b) can be made persistent for fixes. 'CompileTimeErrorCode.PART_OF_NON_PART', @@ -88,6 +86,8 @@ class DocumentationValidator { // 'CompileTimeErrorCode.NON_CONSTANT_CASE_EXPRESSION', // 'CompileTimeErrorCode.NON_CONSTANT_CASE_EXPRESSION_FROM_DEFERRED_LIBRARY', // 'CompileTimeErrorCode.SWITCH_CASE_COMPLETES_NORMALLY', + // This no longer works in 3.0. + 'HintCode.DEPRECATED_COLON_FOR_DEFAULT_VALUE', // The code has been replaced but is not yet removed. 'HintCode.DEPRECATED_MEMBER_USE', // Produces more than one error range by design. diff --git a/pkg/dartdev/test/analytics_test.dart b/pkg/dartdev/test/analytics_test.dart index 450db6429a4..475f7514ca2 100644 --- a/pkg/dartdev/test/analytics_test.dart +++ b/pkg/dartdev/test/analytics_test.dart @@ -132,8 +132,8 @@ Future main() async { test('pub get dry run', () async { final p = project(logAnalytics: true, pubspec: { 'name': 'foo', - 'environment': {'sdk': '>=2.10.0 <3.0.0'}, - 'dependencies': {'_dummy_pkg': '0.0.1'} + 'environment': {'sdk': '>=2.12.0 <3.0.0'}, + 'dependencies': {'lints': '2.0.1'} }); final result = await p.run(['pub', 'get', '--dry-run']); expect(extractAnalytics(result), [ @@ -167,8 +167,8 @@ Future main() async { test('pub get', () async { final p = project(logAnalytics: true, pubspec: { 'name': 'foo', - 'environment': {'sdk': '>=2.10.0 <3.0.0'}, - 'dependencies': {'_dummy_pkg': '0.0.1'} + 'environment': {'sdk': '>=2.12.0 <3.0.0'}, + 'dependencies': {'lints': '2.0.1'} }); final result = await p.run(['pub', 'get']); expect(extractAnalytics(result), [ @@ -180,8 +180,8 @@ Future main() async { 'hitType': 'event', 'message': { 'category': 'pub-get', - 'action': '_dummy_pkg', - 'label': '0.0.1', + 'action': 'lints', + 'label': '2.0.1', 'value': 1, 'ni': '1', 'cd4': 'direct' diff --git a/pkg/dartdev/test/commands/run_test.dart b/pkg/dartdev/test/commands/run_test.dart index 97389e95dd6..9f990280314 100644 --- a/pkg/dartdev/test/commands/run_test.dart +++ b/pkg/dartdev/test/commands/run_test.dart @@ -167,7 +167,7 @@ void run() { p.file('pubspec.yaml', ''' name: foo environment: - sdk: '>=2.9.0<3.0.0' + sdk: '>=2.12.0<3.0.0' dependencies: { 'bar': {'path': '${bar.dir.path}'}} '''); diff --git a/pkg/dartdev/test/commands/test_test.dart b/pkg/dartdev/test/commands/test_test.dart index c6cb3dfdf66..b4dfe7784a6 100644 --- a/pkg/dartdev/test/commands/test_test.dart +++ b/pkg/dartdev/test/commands/test_test.dart @@ -101,7 +101,7 @@ void main() { p.file('pubspec.yaml', ''' name: ${p.name} environment: - sdk: '>=2.10.0 <3.0.0' + sdk: '>=2.12.0 <3.0.0' '''); p.file('test/foo_test.dart', ''' import 'package:test/test.dart'; diff --git a/pkg/dartdev/test/utils.dart b/pkg/dartdev/test/utils.dart index cfb6e358439..6688b54e554 100644 --- a/pkg/dartdev/test/utils.dart +++ b/pkg/dartdev/test/utils.dart @@ -78,7 +78,7 @@ class TestProject { ? ''' name: $name environment: - sdk: '${sdkConstraint ?? '>=2.10.0 <3.0.0'}' + sdk: '${sdkConstraint ?? '>=2.12.0 <3.0.0'}' dev_dependencies: test: any 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 21390420340..81df5e9ed0d 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 @@ -63,9 +63,9 @@ class ExperimentalFlag { name: 'const-functions', isEnabledByDefault: false, isExpired: false, - enabledVersion: const Version(2, 19), - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)); + enabledVersion: const Version(3, 0), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)); static const ExperimentalFlag constantUpdate2018 = const ExperimentalFlag( name: 'constant-update-2018', @@ -111,9 +111,9 @@ class ExperimentalFlag { name: 'extension-types', isEnabledByDefault: false, isExpired: false, - enabledVersion: const Version(2, 19), - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)); + enabledVersion: const Version(3, 0), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)); static const ExperimentalFlag genericMetadata = const ExperimentalFlag( name: 'generic-metadata', @@ -135,17 +135,17 @@ class ExperimentalFlag { name: 'inference-update-2', isEnabledByDefault: false, isExpired: false, - enabledVersion: const Version(2, 19), - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)); + enabledVersion: const Version(3, 0), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)); static const ExperimentalFlag macros = const ExperimentalFlag( name: 'macros', isEnabledByDefault: false, isExpired: false, - enabledVersion: const Version(2, 19), - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)); + enabledVersion: const Version(3, 0), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)); static const ExperimentalFlag namedArgumentsAnywhere = const ExperimentalFlag( name: 'named-arguments-anywhere', @@ -175,25 +175,25 @@ class ExperimentalFlag { name: 'patterns', isEnabledByDefault: false, isExpired: false, - enabledVersion: const Version(2, 19), - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)); + enabledVersion: const Version(3, 0), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)); static const ExperimentalFlag records = const ExperimentalFlag( name: 'records', isEnabledByDefault: false, isExpired: false, - enabledVersion: const Version(2, 19), - experimentEnabledVersion: const Version(2, 19), + enabledVersion: const Version(3, 0), + experimentEnabledVersion: const Version(3, 0), experimentReleasedVersion: const Version(2, 19)); static const ExperimentalFlag sealedClass = const ExperimentalFlag( name: 'sealed-class', isEnabledByDefault: false, isExpired: false, - enabledVersion: const Version(2, 19), - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)); + enabledVersion: const Version(3, 0), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)); static const ExperimentalFlag setLiterals = const ExperimentalFlag( name: 'set-literals', @@ -223,9 +223,9 @@ class ExperimentalFlag { name: 'test-experiment', isEnabledByDefault: false, isExpired: false, - enabledVersion: const Version(2, 19), - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)); + enabledVersion: const Version(3, 0), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)); static const ExperimentalFlag tripleShift = const ExperimentalFlag( name: 'triple-shift', @@ -247,25 +247,25 @@ class ExperimentalFlag { name: 'value-class', isEnabledByDefault: false, isExpired: false, - enabledVersion: const Version(2, 19), - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)); + enabledVersion: const Version(3, 0), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)); static const ExperimentalFlag variance = const ExperimentalFlag( name: 'variance', isEnabledByDefault: false, isExpired: false, - enabledVersion: const Version(2, 19), - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)); + enabledVersion: const Version(3, 0), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)); static const ExperimentalFlag views = const ExperimentalFlag( name: 'views', isEnabledByDefault: false, isExpired: false, - enabledVersion: const Version(2, 19), - experimentEnabledVersion: const Version(2, 19), - experimentReleasedVersion: const Version(2, 19)); + enabledVersion: const Version(3, 0), + experimentEnabledVersion: const Version(3, 0), + experimentReleasedVersion: const Version(3, 0)); } /// Interface for accessing the global state of experimental features. diff --git a/pkg/front_end/testcases/general/if_case_disabled.dart.weak.expect b/pkg/front_end/testcases/general/if_case_disabled.dart.weak.expect index ae3eb18e2fc..7c6339d84f9 100644 --- a/pkg/front_end/testcases/general/if_case_disabled.dart.weak.expect +++ b/pkg/front_end/testcases/general/if_case_disabled.dart.weak.expect @@ -3,7 +3,7 @@ library /*isNonNullableByDefault*/; // Problems in library: // // pkg/front_end/testcases/general/if_case_disabled.dart:8:9: Error: The 'patterns' language feature is disabled for this library. -// Try removing the `@dart=` annotation or setting the language version to 2.19 or higher. +// Try removing the `@dart=` annotation or setting the language version to 3.0 or higher. // if (x case true) {} // ^^^^ // pkg/front_end/testcases/general/if_case_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'patterns' language feature. diff --git a/pkg/front_end/testcases/general/if_case_disabled.dart.weak.modular.expect b/pkg/front_end/testcases/general/if_case_disabled.dart.weak.modular.expect index ae3eb18e2fc..7c6339d84f9 100644 --- a/pkg/front_end/testcases/general/if_case_disabled.dart.weak.modular.expect +++ b/pkg/front_end/testcases/general/if_case_disabled.dart.weak.modular.expect @@ -3,7 +3,7 @@ library /*isNonNullableByDefault*/; // Problems in library: // // pkg/front_end/testcases/general/if_case_disabled.dart:8:9: Error: The 'patterns' language feature is disabled for this library. -// Try removing the `@dart=` annotation or setting the language version to 2.19 or higher. +// Try removing the `@dart=` annotation or setting the language version to 3.0 or higher. // if (x case true) {} // ^^^^ // pkg/front_end/testcases/general/if_case_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'patterns' language feature. diff --git a/pkg/front_end/testcases/general/if_case_disabled.dart.weak.transformed.expect b/pkg/front_end/testcases/general/if_case_disabled.dart.weak.transformed.expect index ae3eb18e2fc..7c6339d84f9 100644 --- a/pkg/front_end/testcases/general/if_case_disabled.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/general/if_case_disabled.dart.weak.transformed.expect @@ -3,7 +3,7 @@ library /*isNonNullableByDefault*/; // Problems in library: // // pkg/front_end/testcases/general/if_case_disabled.dart:8:9: Error: The 'patterns' language feature is disabled for this library. -// Try removing the `@dart=` annotation or setting the language version to 2.19 or higher. +// Try removing the `@dart=` annotation or setting the language version to 3.0 or higher. // if (x case true) {} // ^^^^ // pkg/front_end/testcases/general/if_case_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'patterns' language feature. diff --git a/pkg/kernel/lib/default_language_version.dart b/pkg/kernel/lib/default_language_version.dart index b959db49a64..a1550f31891 100644 --- a/pkg/kernel/lib/default_language_version.dart +++ b/pkg/kernel/lib/default_language_version.dart @@ -9,4 +9,4 @@ import "ast.dart"; -Version defaultLanguageVersion = const Version(2, 19); +Version defaultLanguageVersion = const Version(3, 0); diff --git a/pkg/vm_service/test/get_object_rpc_test.dart b/pkg/vm_service/test/get_object_rpc_test.dart index b437b65c278..34f880a0b63 100644 --- a/pkg/vm_service/test/get_object_rpc_test.dart +++ b/pkg/vm_service/test/get_object_rpc_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. // VMOptions=--enable-experiment=records -// @dart=2.19 +// @dart=3.0 // ignore_for_file: experiment_not_enabled library get_object_rpc_test; diff --git a/runtime/observatory/tests/ui/inspector.dart b/runtime/observatory/tests/ui/inspector.dart index cd012f07f6b..dce6101e4b7 100644 --- a/runtime/observatory/tests/ui/inspector.dart +++ b/runtime/observatory/tests/ui/inspector.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. // ignore_for_file: experiment_not_enabled -// @dart = 2.19 +// @dart = 3.0 // See inspector.txt for expected behavior. diff --git a/runtime/observatory/tests/ui/inspector_part.dart b/runtime/observatory/tests/ui/inspector_part.dart index 6222354a3ea..80ba1011cf9 100644 --- a/runtime/observatory/tests/ui/inspector_part.dart +++ b/runtime/observatory/tests/ui/inspector_part.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -// @dart = 2.19 +// @dart = 3.0 part of manual_inspector_test; diff --git a/runtime/vm/experimental_features.cc b/runtime/vm/experimental_features.cc index d8cb01a3942..f99b93ab8cc 100644 --- a/runtime/vm/experimental_features.cc +++ b/runtime/vm/experimental_features.cc @@ -6,7 +6,7 @@ // Instead modify 'tools/experimental_features.yaml' and run // 'dart tools/generate_experimental_flags.dart' to update. // -// Current version: 2.19.0 +// Current version: 3.0.0 #include "vm/experimental_features.h" diff --git a/runtime/vm/experimental_features.h b/runtime/vm/experimental_features.h index f3df898138c..b0b954b9e55 100644 --- a/runtime/vm/experimental_features.h +++ b/runtime/vm/experimental_features.h @@ -6,7 +6,7 @@ // Instead modify 'tools/experimental_features.yaml' and run // 'dart tools/generate_experimental_flags.dart' to update. // -// Current version: 2.19.0 +// Current version: 3.0.0 #ifndef RUNTIME_VM_EXPERIMENTAL_FEATURES_H_ #define RUNTIME_VM_EXPERIMENTAL_FEATURES_H_ diff --git a/tests/standalone/io/platform_test.dart b/tests/standalone/io/platform_test.dart index 3729439cc25..86f55ac3509 100644 --- a/tests/standalone/io/platform_test.dart +++ b/tests/standalone/io/platform_test.dart @@ -96,7 +96,7 @@ testVersion() { } var major = int.parse(match.group(1)!); // Major version. - Expect.isTrue(major == 1 || major == 2); + Expect.isTrue(major == 1 || major == 2 || major == 3); // Minor version. Expect.isTrue(int.parse(match.group(2)!) >= 0); // Patch version. @@ -131,6 +131,7 @@ testVersion() { // Ensure we can match valid versions. checkValidVersion('1.9.0'); checkValidVersion('2.0.0'); + checkValidVersion('3.0.0'); checkValidVersion('1.9.0-dev.0.0'); checkValidVersion('1.9.0-edge'); checkValidVersion('1.9.0-edge.r41234'); diff --git a/tests/standalone_2/io/platform_test.dart b/tests/standalone_2/io/platform_test.dart index e58632de438..7fd1256a926 100644 --- a/tests/standalone_2/io/platform_test.dart +++ b/tests/standalone_2/io/platform_test.dart @@ -96,7 +96,7 @@ testVersion() { Expect.isNotNull(match, version); var major = int.parse(match.group(1)); // Major version. - Expect.isTrue(major == 1 || major == 2); + Expect.isTrue(major == 1 || major == 2 || major == 3); // Minor version. Expect.isTrue(int.parse(match.group(2)) >= 0); // Patch version. @@ -131,6 +131,7 @@ testVersion() { // Ensure we can match valid versions. checkValidVersion('1.9.0'); checkValidVersion('2.0.0'); + checkValidVersion('3.0.0'); checkValidVersion('1.9.0-dev.0.0'); checkValidVersion('1.9.0-edge'); checkValidVersion('1.9.0-edge.r41234'); diff --git a/tools/VERSION b/tools/VERSION index 25c77d678f3..d34addcddd3 100644 --- a/tools/VERSION +++ b/tools/VERSION @@ -24,8 +24,8 @@ # - increase PATCH by 1 # CHANNEL be -MAJOR 2 -MINOR 19 +MAJOR 3 +MINOR 0 PATCH 0 PRERELEASE 0 PRERELEASE_PATCH 0 diff --git a/tools/experimental_features.yaml b/tools/experimental_features.yaml index 84837ad7d99..4e9508afcc4 100644 --- a/tools/experimental_features.yaml +++ b/tools/experimental_features.yaml @@ -107,7 +107,7 @@ # default 'language' "category" with code generated for both CFE and Analyzer, # while other categories can be tailored more specifically. -current-version: '2.19.0' +current-version: '3.0.0' features: variance: @@ -130,7 +130,7 @@ features: records: help: "Records" - experimentalReleaseVersion: '2.19.0' + experimentalReleaseVersion: "2.19.0" patterns: help: "Patterns"