Upgrade to analyzer 0.34.0 and get ready to publish 1.2.1.
Also fix imports to deprecated analyzer library.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 867efed..a5a79df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 1.2.1-dev
+# 1.2.1
* Add `--fix-function-typedefs` to convert the old typedef syntax for function
types to the new preferred syntax.
diff --git a/bin/format.dart b/bin/format.dart
index aefafb6..2aba2fd 100644
--- a/bin/format.dart
+++ b/bin/format.dart
@@ -15,7 +15,7 @@
import 'package:dart_style/src/style_fix.dart';
// Note: The following line of code is modified by tool/grind.dart.
-const version = "1.2.0";
+const version = "1.2.1";
void main(List<String> args) {
var parser = new ArgParser(allowTrailingOptions: true);
diff --git a/lib/src/argument_list_visitor.dart b/lib/src/argument_list_visitor.dart
index f59dd71..06c159e 100644
--- a/lib/src/argument_list_visitor.dart
+++ b/lib/src/argument_list_visitor.dart
@@ -6,7 +6,7 @@
import 'dart:math' as math;
-import 'package:analyzer/analyzer.dart';
+import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/token.dart';
import 'chunk.dart';
diff --git a/lib/src/call_chain_visitor.dart b/lib/src/call_chain_visitor.dart
index 94dddd3..066656b 100644
--- a/lib/src/call_chain_visitor.dart
+++ b/lib/src/call_chain_visitor.dart
@@ -4,7 +4,7 @@
library dart_style.src.call_chain_visitor;
-import 'package:analyzer/analyzer.dart';
+import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/token.dart';
import 'argument_list_visitor.dart';
diff --git a/lib/src/dart_formatter.dart b/lib/src/dart_formatter.dart
index e34b20c..afd0626 100644
--- a/lib/src/dart_formatter.dart
+++ b/lib/src/dart_formatter.dart
@@ -6,8 +6,9 @@
import 'dart:math' as math;
-import 'package:analyzer/analyzer.dart';
+import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/token.dart';
+import 'package:analyzer/error/error.dart';
import 'package:analyzer/src/dart/scanner/reader.dart';
import 'package:analyzer/src/dart/scanner/scanner.dart';
import 'package:analyzer/src/generated/parser.dart';
diff --git a/lib/src/error_listener.dart b/lib/src/error_listener.dart
index 2a02430..19e4076 100644
--- a/lib/src/error_listener.dart
+++ b/lib/src/error_listener.dart
@@ -4,7 +4,8 @@
library dart_style.src.error_listener;
-import 'package:analyzer/analyzer.dart';
+import 'package:analyzer/error/error.dart';
+import 'package:analyzer/error/listener.dart';
import 'exceptions.dart';
diff --git a/lib/src/exceptions.dart b/lib/src/exceptions.dart
index 0474466..5494183 100644
--- a/lib/src/exceptions.dart
+++ b/lib/src/exceptions.dart
@@ -4,7 +4,7 @@
library dart_style.src.formatter_exception;
-import 'package:analyzer/analyzer.dart';
+import 'package:analyzer/error/error.dart';
import 'package:source_span/source_span.dart';
/// Thrown when one or more errors occurs while parsing the code to be
diff --git a/lib/src/source_visitor.dart b/lib/src/source_visitor.dart
index e744dd6..1233b01 100644
--- a/lib/src/source_visitor.dart
+++ b/lib/src/source_visitor.dart
@@ -4,8 +4,9 @@
library dart_style.src.source_visitor;
-import 'package:analyzer/analyzer.dart';
+import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/token.dart';
+import 'package:analyzer/dart/ast/visitor.dart';
import 'package:analyzer/src/generated/source.dart';
import 'argument_list_visitor.dart';
diff --git a/pubspec.lock b/pubspec.lock
index c2de317..c6f0505 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,7 +7,7 @@
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
- version: "0.33.0-alpha.0"
+ version: "0.34.0"
args:
dependency: "direct main"
description:
@@ -77,7 +77,7 @@
name: front_end
url: "https://pub.dartlang.org"
source: hosted
- version: "0.1.5"
+ version: "0.1.7"
glob:
dependency: transitive
description:
@@ -147,7 +147,7 @@
name: kernel
url: "https://pub.dartlang.org"
source: hosted
- version: "0.3.5"
+ version: "0.3.7"
logging:
dependency: transitive
description:
@@ -315,7 +315,21 @@
name: test
url: "https://pub.dartlang.org"
source: hosted
- version: "1.3.2"
+ version: "1.5.1+1"
+ test_api:
+ dependency: transitive
+ description:
+ name: test_api
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.2.1"
+ test_core:
+ dependency: transitive
+ description:
+ name: test_core
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.2.0+1"
test_descriptor:
dependency: "direct dev"
description:
@@ -373,4 +387,4 @@
source: hosted
version: "2.1.15"
sdks:
- dart: ">=2.0.0-dev.62.0 <3.0.0"
+ dart: ">=2.1.0-dev.5.0 <3.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 3785aea..5ec4fbd 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.2.1-dev
+version: 1.2.1
author: Dart Team <misc@dartlang.org>
description: Opinionated, automatic Dart source code formatter.
homepage: https://github.com/dart-lang/dart_style
@@ -9,7 +9,7 @@
sdk: '>=2.0.0-dev.62.0 <3.0.0'
dependencies:
- analyzer: '>=0.33.0-alpha.0 <0.34.0'
+ analyzer: '^0.34.0'
args: '>=0.12.1 <2.0.0'
path: ^1.0.0
source_span: ^1.4.0
