Merge pull request #438 from sass/dart-2

Support Dart 2 stable

Author: nex3

.travis.yml

@@ -5,38 +5,44 @@ language: ruby
 
 env:
   global:
-  - DART_CHANNEL=dev
   - DART_VERSION=latest
   matrix:
   # Language specs, defined in sass/sass-spec
 
-  # These are disabled just for the 1.10.2 release, since it doesn't support the
+  # These are disabled just for the 1.10.x branch, since it doesn't support the
   # latest specs.
-  # - TASK=specs
-  # - TASK=specs ASYNC=true
+  # - DART_CHANNEL=dev TASK=specs
+  # - DART_CHANNEL=stable TASK=specs
+  # - DART_CHANNEL=stable TASK=specs ASYNC=true
 
   # Unit tests, defined in test/.
-  - TASK=tests
+  - DART_CHANNEL=dev TASK=tests
+  - DART_CHANNEL=stable TASK=tests
 
   # This should be NODE_VERSION=latest, but that's breaking due to
   # laverdet/node-fibers#378.
-  - TASK=tests NODE_VERSION=v10.1.0
+  - DART_CHANNEL=stable TASK=tests NODE_VERSION=v10.1.0
 
   # Keep these up-to-date with the latest LTA Node releases. They next need to be
   # rotated October 2018. See https://github.com/nodejs/Release.
-  - TASK=tests NODE_VERSION=lts/boron
-  - TASK=tests NODE_VERSION=lts/carbon
+  - DART_CHANNEL=stable TASK=tests NODE_VERSION=lts/boron
+  - DART_CHANNEL=stable TASK=tests NODE_VERSION=lts/carbon
 
   # Miscellaneous checks.
-  - TASK=analyze
-  - TASK=format
+  - DART_CHANNEL=stable TASK=analyze
+  - DART_CHANNEL=stable TASK=format
 
 rvm:
 - 2.3.1
 
 # 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

@@ -1,3 +1,9 @@
+## 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

@@ -1,5 +1,5 @@
 name: sass
-version: 1.10.3
+version: 1.10.4
 description: A Sass implementation in Dart.
 author: Dart Team <[email protected]>
 homepage: https://github.com/sass/dart-sass
@@ -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"