Merge pull request #977 from dart-lang/allow-latest-analyzer
allow analyzer version 0.41.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a51736f..5da05c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.3.10
+
+* Allow analyzer version 0.41.x.
+
# 1.3.9
* Don't duplicate comments on chained if elements (#966).
diff --git a/lib/src/cli/formatter_options.dart b/lib/src/cli/formatter_options.dart
index 75c67db..919307c 100644
--- a/lib/src/cli/formatter_options.dart
+++ b/lib/src/cli/formatter_options.dart
@@ -13,7 +13,7 @@
import 'summary.dart';
// Note: The following line of code is modified by tool/grind.dart.
-const dartStyleVersion = '1.3.9';
+const dartStyleVersion = '1.3.10';
/// Global options that affect how the formatter produces and uses its outputs.
class FormatterOptions {
diff --git a/pubspec.lock b/pubspec.lock
index e511a42..0771461 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,14 +7,14 @@
name: _fe_analyzer_shared
url: "https://pub.dartlang.org"
source: hosted
- version: "8.0.0"
+ version: "13.0.0"
analyzer:
dependency: "direct main"
description:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
- version: "0.40.0"
+ version: "0.41.0"
archive:
dependency: transitive
description:
@@ -35,21 +35,21 @@
name: async
url: "https://pub.dartlang.org"
source: hosted
- version: "2.5.0-nullsafety.2"
+ version: "2.5.0-nullsafety.3"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.0-nullsafety.2"
+ version: "2.1.0-nullsafety.3"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.0-nullsafety.2"
+ version: "1.2.0-nullsafety.3"
cli_util:
dependency: transitive
description:
@@ -63,7 +63,7 @@
name: collection
url: "https://pub.dartlang.org"
source: hosted
- version: "1.15.0-nullsafety.4"
+ version: "1.15.0-nullsafety.5"
convert:
dependency: transitive
description:
@@ -77,7 +77,7 @@
name: coverage
url: "https://pub.dartlang.org"
source: hosted
- version: "0.14.0"
+ version: "0.14.2"
crypto:
dependency: transitive
description:
@@ -85,13 +85,6 @@
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.5"
- csslib:
- dependency: transitive
- description:
- name: csslib
- url: "https://pub.dartlang.org"
- source: hosted
- version: "0.16.2"
glob:
dependency: transitive
description:
@@ -105,14 +98,7 @@
name: grinder
url: "https://pub.dartlang.org"
source: hosted
- version: "0.8.5"
- html:
- dependency: transitive
- description:
- name: html
- url: "https://pub.dartlang.org"
- source: hosted
- version: "0.14.0+3"
+ version: "0.8.6"
http_multi_server:
dependency: transitive
description:
@@ -140,7 +126,7 @@
name: js
url: "https://pub.dartlang.org"
source: hosted
- version: "0.6.3-nullsafety.2"
+ version: "0.6.3-nullsafety.3"
logging:
dependency: transitive
description:
@@ -154,14 +140,14 @@
name: matcher
url: "https://pub.dartlang.org"
source: hosted
- version: "0.12.10-nullsafety.2"
+ version: "0.12.10-nullsafety.3"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
- version: "1.3.0-nullsafety.5"
+ version: "1.3.0-nullsafety.6"
mime:
dependency: transitive
description:
@@ -175,7 +161,7 @@
name: node_interop
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.1"
+ version: "1.2.0"
node_io:
dependency: transitive
description:
@@ -203,21 +189,21 @@
name: path
url: "https://pub.dartlang.org"
source: hosted
- version: "1.8.0-nullsafety.2"
+ version: "1.8.0-nullsafety.3"
pedantic:
dependency: "direct dev"
description:
name: pedantic
url: "https://pub.dartlang.org"
source: hosted
- version: "1.10.0-nullsafety.2"
+ version: "1.10.0-nullsafety.3"
pool:
dependency: transitive
description:
name: pool
url: "https://pub.dartlang.org"
source: hosted
- version: "1.5.0-nullsafety.2"
+ version: "1.5.0-nullsafety.3"
pub_semver:
dependency: "direct dev"
description:
@@ -259,70 +245,70 @@
name: source_map_stack_trace
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.0-nullsafety.3"
+ version: "2.1.0-nullsafety.4"
source_maps:
dependency: transitive
description:
name: source_maps
url: "https://pub.dartlang.org"
source: hosted
- version: "0.10.10-nullsafety.2"
+ version: "0.10.10-nullsafety.3"
source_span:
dependency: "direct main"
description:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
- version: "1.8.0-nullsafety.3"
+ version: "1.8.0-nullsafety.4"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.dartlang.org"
source: hosted
- version: "1.10.0-nullsafety.5"
+ version: "1.10.0-nullsafety.6"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.0-nullsafety.2"
+ version: "2.1.0-nullsafety.3"
string_scanner:
dependency: transitive
description:
name: string_scanner
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.0-nullsafety.2"
+ version: "1.1.0-nullsafety.3"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.0-nullsafety.2"
+ version: "1.2.0-nullsafety.3"
test:
dependency: "direct dev"
description:
name: test
url: "https://pub.dartlang.org"
source: hosted
- version: "1.16.0-nullsafety.7"
+ version: "1.16.0-nullsafety.10"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
- version: "0.2.19-nullsafety.4"
+ version: "0.2.19-nullsafety.6"
test_core:
dependency: transitive
description:
name: test_core
url: "https://pub.dartlang.org"
source: hosted
- version: "0.3.12-nullsafety.7"
+ version: "0.3.12-nullsafety.10"
test_descriptor:
dependency: "direct dev"
description:
@@ -343,14 +329,14 @@
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
- version: "1.3.0-nullsafety.4"
+ version: "1.3.0-nullsafety.5"
vm_service:
dependency: transitive
description:
name: vm_service
url: "https://pub.dartlang.org"
source: hosted
- version: "4.2.0"
+ version: "5.5.0"
watcher:
dependency: transitive
description:
@@ -371,7 +357,7 @@
name: webkit_inspection_protocol
url: "https://pub.dartlang.org"
source: hosted
- version: "0.7.3"
+ version: "0.7.4"
yaml:
dependency: "direct dev"
description:
@@ -380,4 +366,4 @@
source: hosted
version: "2.2.1"
sdks:
- dart: ">=2.11.0-0.0 <=2.12.0-edge.4c4a09720c3c430915f4530ecb1d157deb0d0abe"
+ dart: ">=2.12.0-0.0 <3.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 776e52a..09aa3d6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
name: dart_style
# Note: See tool/grind.dart for how to bump the version.
-version: 1.3.10-dev
+version: 1.3.10
description: >-
Opinionated, automatic Dart source code formatter.
Provides an API and a CLI tool.
@@ -10,7 +10,7 @@
sdk: '>=2.9.0 <3.0.0'
dependencies:
- analyzer: ^0.40.0
+ analyzer: ">=0.40.0 <0.42.0"
args: ^1.0.0
path: ^1.0.0
source_span: ^1.4.0