Merge branch 'chalin-max-sdk-to-3-0714' of https://github.com/chalin/dart_style into chalin-chalin-max-sdk-to-3-0714
# Conflicts:
# CHANGELOG.md
# analysis_options.yaml
# pubspec.lock
# pubspec.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f87722..63bbed8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
**Note!** This bug means that dart_style 1.1.2 may make semantics changes to
your strings. You should avoid that version and use 1.1.3.
+* Set max SDK version to <3.0.0, and adjusted other dependencies.
+
# 1.1.2
* Don't split inside string interpolations.
diff --git a/pubspec.lock b/pubspec.lock
index b648322..9c24470 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,7 +7,7 @@
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
- version: "0.32.1"
+ version: "0.32.3"
args:
dependency: "direct main"
description:
@@ -28,7 +28,7 @@
name: boolean_selector
url: "https://pub.dartlang.org"
source: hosted
- version: "1.0.3"
+ version: "1.0.4"
browser:
dependency: "direct dev"
description:
@@ -42,14 +42,14 @@
name: charcode
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.1"
+ version: "1.1.2"
cli_util:
dependency: transitive
description:
name: cli_util
url: "https://pub.dartlang.org"
source: hosted
- version: "0.1.3"
+ version: "0.1.3+2"
collection:
dependency: transitive
description:
@@ -70,28 +70,28 @@
name: crypto
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.3"
+ version: "2.0.6"
csslib:
dependency: transitive
description:
name: csslib
url: "https://pub.dartlang.org"
source: hosted
- version: "0.14.4"
+ version: "0.14.4+1"
front_end:
dependency: transitive
description:
name: front_end
url: "https://pub.dartlang.org"
source: hosted
- version: "0.1.1"
+ version: "0.1.3"
glob:
dependency: transitive
description:
name: glob
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.5"
+ version: "1.1.6"
grinder:
dependency: "direct dev"
description:
@@ -112,7 +112,7 @@
name: http
url: "https://pub.dartlang.org"
source: hosted
- version: "0.11.3+16"
+ version: "0.11.3+17"
http_multi_server:
dependency: transitive
description:
@@ -133,7 +133,7 @@
name: io
url: "https://pub.dartlang.org"
source: hosted
- version: "0.3.2+1"
+ version: "0.3.3"
js:
dependency: "direct dev"
description:
@@ -141,13 +141,20 @@
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.1"
+ json_rpc_2:
+ dependency: transitive
+ description:
+ name: json_rpc_2
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "2.0.8"
kernel:
dependency: transitive
description:
name: kernel
url: "https://pub.dartlang.org"
source: hosted
- version: "0.3.1"
+ version: "0.3.3"
logging:
dependency: transitive
description:
@@ -161,7 +168,7 @@
name: matcher
url: "https://pub.dartlang.org"
source: hosted
- version: "0.12.2+1"
+ version: "0.12.3+1"
meta:
dependency: transitive
description:
@@ -189,7 +196,7 @@
name: node_preamble
url: "https://pub.dartlang.org"
source: hosted
- version: "1.4.2"
+ version: "1.4.3"
package_config:
dependency: transitive
description:
@@ -238,7 +245,7 @@
name: shelf
url: "https://pub.dartlang.org"
source: hosted
- version: "0.7.3+1"
+ version: "0.7.3+3"
shelf_packages_handler:
dependency: transitive
description:
@@ -252,7 +259,7 @@
name: shelf_static
url: "https://pub.dartlang.org"
source: hosted
- version: "0.2.7+1"
+ version: "0.2.8"
shelf_web_socket:
dependency: transitive
description:
@@ -273,7 +280,7 @@
name: source_maps
url: "https://pub.dartlang.org"
source: hosted
- version: "0.10.5"
+ version: "0.10.6"
source_span:
dependency: "direct main"
description:
@@ -315,21 +322,21 @@
name: test
url: "https://pub.dartlang.org"
source: hosted
- version: "0.12.40"
+ version: "1.3.0"
test_descriptor:
dependency: "direct dev"
description:
name: test_descriptor
url: "https://pub.dartlang.org"
source: hosted
- version: "1.0.3"
+ version: "1.1.1"
test_process:
dependency: "direct dev"
description:
name: test_process
url: "https://pub.dartlang.org"
source: hosted
- version: "1.0.2"
+ version: "1.0.3"
typed_data:
dependency: transitive
description:
@@ -343,14 +350,21 @@
name: utf
url: "https://pub.dartlang.org"
source: hosted
- version: "0.9.0+4"
+ version: "0.9.0+5"
+ vm_service_client:
+ dependency: transitive
+ description:
+ name: vm_service_client
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.2.5"
watcher:
dependency: transitive
description:
name: watcher
url: "https://pub.dartlang.org"
source: hosted
- version: "0.9.7+8"
+ version: "0.9.7+9"
web_socket_channel:
dependency: transitive
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 37f5a8d..476b11c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,13 +4,16 @@
author: Dart Team <misc@dartlang.org>
description: Opinionated, automatic Dart source code formatter.
homepage: https://github.com/dart-lang/dart_style
+
environment:
- sdk: '>=2.0.0-dev.62.0 <2.0.0'
+ sdk: '>=2.0.0-dev.62.0 <3.0.0'
+
dependencies:
analyzer: '>0.31.2-alpha.0 <0.33.0'
args: '>=0.12.1 <2.0.0'
path: ^1.0.0
source_span: ^1.4.0
+
dev_dependencies:
async: '>=1.0.0 <=3.0.0'
browser: ^0.10.0
@@ -18,10 +21,11 @@
js: ^0.6.0
node_preamble: ^1.0.0
pub_semver: ^1.2.3
- test: ^0.12.0
+ test: ^1.2.0
test_descriptor: ^1.0.0
test_process: ^1.0.0
yaml: ^2.0.0
+
executables:
dartfmt: format
dartformat: format # Allow the old name for compatibility.
