Skip to content

Commit 7e0d92d

Browse files
athomasCommit Queue
athomas
authored and
Commit Queue
committed
[3.0 alpha] Bump version to 3.0.0
Tested: Standard CQ. Bug: #49529 Change-Id: I329b9940db7309c7e48f17eecd7a66d5b853a484 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/271922 Commit-Queue: Siva Annamalai <[email protected]> Reviewed-by: Siva Annamalai <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]> Reviewed-by: Johnni Winther <[email protected]>
1 parent 3a1d7c7 commit 7e0d92d

25 files changed

+98
-94
lines changed

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

+21-21
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ enum ExperimentalFlag {
1313
name: 'const-functions',
1414
isEnabledByDefault: false,
1515
isExpired: false,
16-
experimentEnabledVersion: const Version(2, 19),
17-
experimentReleasedVersion: const Version(2, 19)),
16+
experimentEnabledVersion: const Version(3, 0),
17+
experimentReleasedVersion: const Version(3, 0)),
1818

1919
constantUpdate2018(
2020
name: 'constant-update-2018',
@@ -55,8 +55,8 @@ enum ExperimentalFlag {
5555
name: 'extension-types',
5656
isEnabledByDefault: false,
5757
isExpired: false,
58-
experimentEnabledVersion: const Version(2, 19),
59-
experimentReleasedVersion: const Version(2, 19)),
58+
experimentEnabledVersion: const Version(3, 0),
59+
experimentReleasedVersion: const Version(3, 0)),
6060

6161
genericMetadata(
6262
name: 'generic-metadata',
@@ -76,15 +76,15 @@ enum ExperimentalFlag {
7676
name: 'inference-update-2',
7777
isEnabledByDefault: false,
7878
isExpired: false,
79-
experimentEnabledVersion: const Version(2, 19),
80-
experimentReleasedVersion: const Version(2, 19)),
79+
experimentEnabledVersion: const Version(3, 0),
80+
experimentReleasedVersion: const Version(3, 0)),
8181

8282
macros(
8383
name: 'macros',
8484
isEnabledByDefault: false,
8585
isExpired: false,
86-
experimentEnabledVersion: const Version(2, 19),
87-
experimentReleasedVersion: const Version(2, 19)),
86+
experimentEnabledVersion: const Version(3, 0),
87+
experimentReleasedVersion: const Version(3, 0)),
8888

8989
namedArgumentsAnywhere(
9090
name: 'named-arguments-anywhere',
@@ -111,22 +111,22 @@ enum ExperimentalFlag {
111111
name: 'patterns',
112112
isEnabledByDefault: false,
113113
isExpired: false,
114-
experimentEnabledVersion: const Version(2, 19),
115-
experimentReleasedVersion: const Version(2, 19)),
114+
experimentEnabledVersion: const Version(3, 0),
115+
experimentReleasedVersion: const Version(3, 0)),
116116

117117
records(
118118
name: 'records',
119119
isEnabledByDefault: false,
120120
isExpired: false,
121-
experimentEnabledVersion: const Version(2, 19),
121+
experimentEnabledVersion: const Version(3, 0),
122122
experimentReleasedVersion: const Version(2, 19)),
123123

124124
sealedClass(
125125
name: 'sealed-class',
126126
isEnabledByDefault: false,
127127
isExpired: false,
128-
experimentEnabledVersion: const Version(2, 19),
129-
experimentReleasedVersion: const Version(2, 19)),
128+
experimentEnabledVersion: const Version(3, 0),
129+
experimentReleasedVersion: const Version(3, 0)),
130130

131131
setLiterals(
132132
name: 'set-literals',
@@ -153,8 +153,8 @@ enum ExperimentalFlag {
153153
name: 'test-experiment',
154154
isEnabledByDefault: false,
155155
isExpired: false,
156-
experimentEnabledVersion: const Version(2, 19),
157-
experimentReleasedVersion: const Version(2, 19)),
156+
experimentEnabledVersion: const Version(3, 0),
157+
experimentReleasedVersion: const Version(3, 0)),
158158

159159
tripleShift(
160160
name: 'triple-shift',
@@ -174,22 +174,22 @@ enum ExperimentalFlag {
174174
name: 'value-class',
175175
isEnabledByDefault: false,
176176
isExpired: false,
177-
experimentEnabledVersion: const Version(2, 19),
178-
experimentReleasedVersion: const Version(2, 19)),
177+
experimentEnabledVersion: const Version(3, 0),
178+
experimentReleasedVersion: const Version(3, 0)),
179179

180180
variance(
181181
name: 'variance',
182182
isEnabledByDefault: false,
183183
isExpired: false,
184-
experimentEnabledVersion: const Version(2, 19),
185-
experimentReleasedVersion: const Version(2, 19)),
184+
experimentEnabledVersion: const Version(3, 0),
185+
experimentReleasedVersion: const Version(3, 0)),
186186

187187
views(
188188
name: 'views',
189189
isEnabledByDefault: false,
190190
isExpired: false,
191-
experimentEnabledVersion: const Version(2, 19),
192-
experimentReleasedVersion: const Version(2, 19)),
191+
experimentEnabledVersion: const Version(3, 0),
192+
experimentReleasedVersion: const Version(3, 0)),
193193
;
194194

195195
final String name;

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

+1-1
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 = '2.19.0';
15+
const _currentVersion = '3.0.0';
1616

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

‎pkg/analyzer/test/src/dart/resolution/library_element_test.dart

+10-8
Original file line numberDiff line numberDiff line change
@@ -106,47 +106,49 @@ class LibraryElementTest_featureSet extends PubPackageResolutionTest {
106106
]);
107107
}
108108

109-
test_language209_override299() async {
109+
test_language212_override399() async {
110110
writeTestPackageConfig(
111111
PackageConfigFileBuilder(),
112-
languageVersion: '2.9',
112+
languageVersion: '2.12',
113113
);
114114

115-
await resolveTestCode('// @dart = 2.99');
115+
await resolveTestCode('// @dart = 3.99');
116116

117117
// Invalid override: minor is greater than the latest minor.
118118
_assertLanguageVersion(
119-
package: Version.parse('2.9.0'),
119+
package: Version.parse('2.12.0'),
120120
override: null,
121121
);
122122

123123
_assertFeatureSet([
124124
Feature.constant_update_2018,
125125
Feature.control_flow_collections,
126126
Feature.extension_methods,
127+
Feature.non_nullable,
127128
Feature.set_literals,
128129
Feature.spread_collections,
129130
]);
130131
}
131132

132-
test_language209_override300() async {
133+
test_language212_override400() async {
133134
writeTestPackageConfig(
134135
PackageConfigFileBuilder(),
135-
languageVersion: '2.9',
136+
languageVersion: '2.12',
136137
);
137138

138-
await resolveTestCode('// @dart = 3.00');
139+
await resolveTestCode('// @dart = 4.00');
139140

140141
// Invalid override: major is greater than the latest major.
141142
_assertLanguageVersion(
142-
package: Version.parse('2.9.0'),
143+
package: Version.parse('2.12.0'),
143144
override: null,
144145
);
145146

146147
_assertFeatureSet([
147148
Feature.constant_update_2018,
148149
Feature.control_flow_collections,
149150
Feature.extension_methods,
151+
Feature.non_nullable,
150152
Feature.set_literals,
151153
Feature.spread_collections,
152154
]);

‎pkg/analyzer/test/src/diagnostics/deprecated_colon_for_default_value_test.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
import 'package:analyzer/src/dart/error/hint_codes.g.dart';
5+
import 'package:analyzer/src/error/codes.g.dart';
66
import 'package:test_reflective_loader/test_reflective_loader.dart';
77

88
import '../dart/resolution/context_collection_resolution.dart';
@@ -31,13 +31,13 @@ class A {
3131
class B extends A {
3232
B({super.a : ''});
3333
}
34-
''', [error(HintCode.DEPRECATED_COLON_FOR_DEFAULT_VALUE, 74, 1)]);
34+
''', [error(CompileTimeErrorCode.OBSOLETE_COLON_FOR_DEFAULT_VALUE, 74, 1)]);
3535
}
3636

3737
test_usesColon() async {
3838
await assertErrorsInCode('''
3939
void f({int x : 0}) {}
40-
''', [error(HintCode.DEPRECATED_COLON_FOR_DEFAULT_VALUE, 14, 1)]);
40+
''', [error(CompileTimeErrorCode.OBSOLETE_COLON_FOR_DEFAULT_VALUE, 14, 1)]);
4141
}
4242

4343
test_usesEqual() async {

‎pkg/analyzer/test/src/diagnostics/invalid_language_override_greater_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class InvalidLanguageOverrideGreaterTest extends PubPackageResolutionTest {
2828
// @dart = ${latestVersion.major}.${latestVersion.minor + 1}
2929
class A {}
3030
''', [
31-
error(HintCode.INVALID_LANGUAGE_VERSION_OVERRIDE_GREATER, 0, 15),
31+
error(HintCode.INVALID_LANGUAGE_VERSION_OVERRIDE_GREATER, 0, 14),
3232
]);
3333
_assertUnitLanguageVersion(
3434
package: latestVersion,

‎pkg/analyzer/test/src/diagnostics/invalid_language_override_test.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ int i = 0;
2424
]);
2525
}
2626

27-
test_correct_2_190() async {
27+
test_correct_3_190() async {
2828
await assertErrorsInCode(r'''
29-
// @dart = 2.190
29+
// @dart = 3.190
3030
int i = 0;
3131
''', [
3232
error(HintCode.INVALID_LANGUAGE_VERSION_OVERRIDE_GREATER, 0, 16),

‎pkg/analyzer/test/verify_diagnostics_test.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ class DocumentationValidator {
5858
'CompileTimeErrorCode.MULTIPLE_SUPER_INITIALIZERS',
5959
// Produces two diagnostics when it should only produce one.
6060
'CompileTimeErrorCode.NON_SYNC_FACTORY',
61-
// This isn't enabled yet, but will be enabled in 3.0.
62-
'CompileTimeErrorCode.OBSOLETE_COLON_FOR_DEFAULT_VALUE',
6361
// Need a way to make auxiliary files that (a) are not included in the
6462
// generated docs or (b) can be made persistent for fixes.
6563
'CompileTimeErrorCode.PART_OF_NON_PART',
@@ -88,6 +86,8 @@ class DocumentationValidator {
8886
// 'CompileTimeErrorCode.NON_CONSTANT_CASE_EXPRESSION',
8987
// 'CompileTimeErrorCode.NON_CONSTANT_CASE_EXPRESSION_FROM_DEFERRED_LIBRARY',
9088
// 'CompileTimeErrorCode.SWITCH_CASE_COMPLETES_NORMALLY',
89+
// This no longer works in 3.0.
90+
'HintCode.DEPRECATED_COLON_FOR_DEFAULT_VALUE',
9191
// The code has been replaced but is not yet removed.
9292
'HintCode.DEPRECATED_MEMBER_USE',
9393
// Produces more than one error range by design.

‎pkg/dartdev/test/analytics_test.dart

+6-6
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ Future<void> main() async {
132132
test('pub get dry run', () async {
133133
final p = project(logAnalytics: true, pubspec: {
134134
'name': 'foo',
135-
'environment': {'sdk': '>=2.10.0 <3.0.0'},
136-
'dependencies': {'_dummy_pkg': '0.0.1'}
135+
'environment': {'sdk': '>=2.12.0 <3.0.0'},
136+
'dependencies': {'lints': '2.0.1'}
137137
});
138138
final result = await p.run(['pub', 'get', '--dry-run']);
139139
expect(extractAnalytics(result), [
@@ -167,8 +167,8 @@ Future<void> main() async {
167167
test('pub get', () async {
168168
final p = project(logAnalytics: true, pubspec: {
169169
'name': 'foo',
170-
'environment': {'sdk': '>=2.10.0 <3.0.0'},
171-
'dependencies': {'_dummy_pkg': '0.0.1'}
170+
'environment': {'sdk': '>=2.12.0 <3.0.0'},
171+
'dependencies': {'lints': '2.0.1'}
172172
});
173173
final result = await p.run(['pub', 'get']);
174174
expect(extractAnalytics(result), [
@@ -180,8 +180,8 @@ Future<void> main() async {
180180
'hitType': 'event',
181181
'message': {
182182
'category': 'pub-get',
183-
'action': '_dummy_pkg',
184-
'label': '0.0.1',
183+
'action': 'lints',
184+
'label': '2.0.1',
185185
'value': 1,
186186
'ni': '1',
187187
'cd4': 'direct'

‎pkg/dartdev/test/commands/run_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ void run() {
167167
p.file('pubspec.yaml', '''
168168
name: foo
169169
environment:
170-
sdk: '>=2.9.0<3.0.0'
170+
sdk: '>=2.12.0<3.0.0'
171171
172172
dependencies: { 'bar': {'path': '${bar.dir.path}'}}
173173
''');

‎pkg/dartdev/test/commands/test_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ void main() {
101101
p.file('pubspec.yaml', '''
102102
name: ${p.name}
103103
environment:
104-
sdk: '>=2.10.0 <3.0.0'
104+
sdk: '>=2.12.0 <3.0.0'
105105
''');
106106
p.file('test/foo_test.dart', '''
107107
import 'package:test/test.dart';

‎pkg/dartdev/test/utils.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class TestProject {
7878
? '''
7979
name: $name
8080
environment:
81-
sdk: '${sdkConstraint ?? '>=2.10.0 <3.0.0'}'
81+
sdk: '${sdkConstraint ?? '>=2.12.0 <3.0.0'}'
8282
8383
dev_dependencies:
8484
test: any

0 commit comments

Comments
 (0)