use latest travis config
diff --git a/.travis.yml b/.travis.yml
index beba759..b70d6ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,27 @@
- stable
- dev
- 1.22.1
-env:
- - TEST_PLATFORM=vm
- - TEST_PLATFORM=firefox
-script: ./tool/presubmit.sh
+addons:
+ # otherwise a number of tests in test/security/html_sanitizer_test.dart fail
+ firefox: "latest"
+dart_task:
+ - test: --platform vm
+ # Disable parallelism on Firefox (-j 1)
+ # Causes flakiness – need to investigate
+ - test: --platform firefox -j 1
+matrix:
+ include:
+ # Only validate formatting using the dev release
+ # Formatted with 1.23.0-dev.10.0 which has (good) changes since 1.22.1
+ - dart: dev
+ dart_task: dartfmt
+ # Only care about being analyzer clean for dev and stable
+ - dart: dev
+ dart_task:
+ dartanalyzer: --fatal-warnings lib
+ - dart: stable
+ dart_task:
+ dartanalyzer: --fatal-warnings lib
+cache:
+ directories:
+ - $HOME/.pub-cache
diff --git a/pubspec.yaml b/pubspec.yaml
index 41ec037..d4647cf 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -10,5 +10,4 @@
meta: '^1.0.4'
quiver: '^0.24.0'
dev_dependencies:
- dart_style: '^0.2.0'
test: '^0.12.17'
diff --git a/tool/presubmit.sh b/tool/presubmit.sh
deleted file mode 100755
index 8446b90..0000000
--- a/tool/presubmit.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-# Make sure dartfmt is run on everything
-# This assumes you have dart_style as a dev_dependency
-echo "Checking dartfmt..."
-NEEDS_DARTFMT="$(find lib test -name "*.dart" | xargs pub run dart_style:format -n)"
-if [[ ${NEEDS_DARTFMT} != "" ]]
-then
- echo "FAILED"
- echo "${NEEDS_DARTFMT}"
- exit 1
-fi
-echo "PASSED"
-
-# Make sure we pass the analyzer
-echo "Checking dartanalyzer..."
-FAILS_ANALYZER="$(find lib test -name "*.dart" | xargs dartanalyzer --options .analysis_options)"
-if [[ $FAILS_ANALYZER == *"[error]"* ]]
-then
- echo "FAILED"
- echo "${FAILS_ANALYZER}"
- exit 1
-fi
-echo "PASSED"
-
-# Fail on anything that fails going forward.
-set -e
-
-# Allow running this script locally, otherwise it fails outside of travis.
-if [[ ${TEST_PLATFORM} == "" ]]
-then
- TEST_PLATFORM="vm"
-fi
-
-THE_COMMAND="pub run test -p $TEST_PLATFORM"
-if [[ ${TEST_PLATFORM} == "firefox" ]]
-then
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- t=0; until (xdpyinfo -display :99 &> /dev/null || test $t -gt 10); do sleep 1; let t=$t+1; done
-fi
-echo $THE_COMMAND
-exec $THE_COMMAND