Skip to content

Commit 66598d3

Browse files
scheglovcommit-bot@chromium.org
authored andcommitted
Switch analysis_server_client to language 2.12, so null safety, but opt-out files.
Protocol files are generated, so should be updated together with analysis_server protocol files. Change-Id: I8c3c7a5aecd2f7ff70c531bb794df3aed21888b0 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/193620 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 1ba3711 commit 66598d3

16 files changed

+34
-5
lines changed

.dart_tool/package_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"name": "analysis_server_client",
7777
"rootUri": "../pkg/analysis_server_client",
7878
"packageUri": "lib/",
79-
"languageVersion": "2.8"
79+
"languageVersion": "2.12"
8080
},
8181
{
8282
"name": "analyzer",

pkg/analysis_server_client/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 2.0.0-dev
2+
* Stable null safety release.
3+
14
# 1.1.3
25
* Supports changes made to the Analysis Server protocol through Dart 2.8.0
36
* Updates to use pedantic 1.9.0 and some internal refactoring.

pkg/analysis_server_client/example/example.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
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+
// @dart = 2.9
6+
57
import 'dart:async';
68
import 'dart:io' show Directory, Platform, ProcessSignal, exit;
79

pkg/analysis_server_client/lib/handler/connection_handler.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
// To regenerate the file, use the script
77
// "pkg/analysis_server/tool/spec/generate_files".
88

9+
// @dart = 2.9
10+
911
import 'dart:async';
1012

1113
import 'package:analysis_server_client/handler/notification_handler.dart';

pkg/analysis_server_client/lib/protocol.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
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+
// @dart = 2.9
6+
57
export 'package:analysis_server_client/src/protocol/protocol_base.dart';
68
export 'package:analysis_server_client/src/protocol/protocol_common.dart';
79
export 'package:analysis_server_client/src/protocol/protocol_constants.dart';

pkg/analysis_server_client/lib/server.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
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+
// @dart = 2.9
6+
57
import 'dart:async';
68
import 'dart:convert';
79
import 'dart:io';

pkg/analysis_server_client/lib/src/protocol/protocol_base.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
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+
// @dart = 2.9
6+
57
/// Support for client code that needs to interact with the requests, responses
68
/// and notifications that are part of the analysis server's wire protocol.
79
import 'dart:convert' hide JsonDecoder;

pkg/analysis_server_client/lib/src/protocol/protocol_common.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
// To regenerate the file, use the script
77
// "pkg/analysis_server/tool/spec/generate_files".
88

9+
// @dart = 2.9
10+
911
import 'dart:convert' hide JsonDecoder;
1012

1113
import 'package:analysis_server_client/src/protocol/protocol_util.dart';

pkg/analysis_server_client/lib/src/protocol/protocol_internal.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
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+
// @dart = 2.9
6+
57
import 'dart:collection';
68
import 'dart:convert' hide JsonDecoder;
79

pkg/analysis_server_client/lib/src/protocol/protocol_util.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
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+
// @dart = 2.9
6+
57
/// Jenkins hash function, optimized for small integers.
68
///
79
/// Static methods borrowed from sdk/lib/math/jenkins_smi_hash.dart. Non-static

pkg/analysis_server_client/lib/src/server_base.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
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+
// @dart = 2.9
6+
57
import 'dart:async';
68
import 'dart:convert';
79
import 'dart:io';

pkg/analysis_server_client/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
name: analysis_server_client
2-
version: 1.1.3
2+
version: 2.0.0-dev
33
description:
44
A client wrapper over analysis_server.
55
Instances of the class [Server] manage a connection to a server process,
66
and facilitate communication to and from the server.
77
homepage: https://github.com/dart-lang/sdk/tree/master/pkg/analysis_server_client
88
environment:
9-
sdk: '>=2.8.0 <3.0.0'
9+
sdk: '>=2.12.0 <3.0.0'
1010
dependencies:
11-
path: ^1.7.0
12-
pub_semver: ^1.4.4
11+
path: ^1.8.0
12+
pub_semver: ^2.0.0
1313
dev_dependencies:
1414
analyzer:
1515
path: ../analyzer

pkg/analysis_server_client/test/all.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
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+
// @dart = 2.9
6+
57
import 'live_test.dart' as live;
68
import 'server_test.dart' as server;
79
import 'verify_sorted_test.dart' as verify_sorted;

pkg/analysis_server_client/test/live_test.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
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+
// @dart = 2.9
6+
57
import 'package:analysis_server_client/handler/connection_handler.dart';
68
import 'package:analysis_server_client/handler/notification_handler.dart';
79
import 'package:analysis_server_client/listener/server_listener.dart';

pkg/analysis_server_client/test/server_test.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
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+
// @dart = 2.9
6+
57
import 'dart:async';
68
import 'dart:convert';
79
import 'dart:io';

pkg/analysis_server_client/test/verify_sorted_test.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
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+
// @dart = 2.9
6+
57
import 'package:analysis_server/src/services/correction/sort_members.dart';
68
import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
79
import 'package:analyzer/dart/analysis/results.dart';

0 commit comments

Comments
 (0)