Merge branch '1.10.x' into master

Author: nex3

.travis.yml

@@ -5,15 +5,17 @@ language: ruby
 
 env:
   global:
-  - DART_CHANNEL=dev
+  - DART_CHANNEL=stable
   - DART_VERSION=latest
   matrix:
   # Language specs, defined in sass/sass-spec
   - TASK=specs
+  - TASK=specs DART_CHANNEL=dev
   - TASK=specs ASYNC=true
 
   # Unit tests, defined in test/.
   - TASK=tests
+  - TASK=tests DART_CHANNEL=dev
   - TASK=tests NODE_VERSION=stable
 
   # Keep these up-to-date with the latest LTA Node releases. They next need to be
@@ -30,7 +32,12 @@ rvm:
 
 # Only building master means that we don't run two builds for each pull request.
 branches:
-  only: [master, "/^feature\\..*/", "/^\\d+\\.\\d+\\.\\d+([+-].*)?$/"]
+  only:
+    - master
+    # Feature branches beginning with "feature."
+    - "/^feature\\..*/"
+    # Semantic version tags and legacy branches of the form "1.2.x".
+    - "/^\\d+\\.\\d+\\.(\\d+([+-].*)?|x)$/"
 
 cache:
   directories:

CHANGELOG.md

@@ -24,6 +24,12 @@
 * The `--watch` command now continues to recompile a file after a syntax error
   has been detected.
 
+## 1.10.4
+
+### Command-Line Interface
+
+* Fix a Homebrew installation failure.
+
 ## 1.10.3
 
 ### Command-Line Interface

appveyor.yml

@@ -1,7 +1,12 @@
 build: off
 
 branches:
-  only: [master, /^features\..*]
+  only:
+    - master
+    # Feature branches beginning with "feature."
+    - "/^feature\\..*/"
+    # Semantic version tags and legacy branches of the form "1.2.x".
+    - "/^\\d+\\.\\d+\\.(\\d+([+-].*)?|x)$/"
 
 # Don't run specs because sass-spec doesn't support Windows. They're also
 # supposed to be platform-independent.
@@ -11,7 +16,7 @@ environment:
   - {TASK: tests, NODE: true}
 
 install:
-- choco install --pre dart-sdk
+- choco install dart-sdk
 - refreshenv
 - pub get
 - ps: >-

pubspec.yaml

@@ -41,6 +41,6 @@ dev_dependencies:
   stream_channel: "^1.0.0"
   test_descriptor: "^1.1.0"
   test_process: "^1.0.0-rc.1"
-  test: "^0.12.42"
+  test: ">=0.12.42 <2.0.0"
   xml: ">=2.4.0 <4.0.0"
   yaml: "^2.0.0"