Merge pull request #343 from ennru/validate-before-test

Travis: rename stage; allow version branches

.travis.yml

@@ -20,11 +20,11 @@ install: jabba install "adopt@~1.$TRAVIS_JDK.0-0" && jabba use "$_" && java -Xmx
 
 jobs:
   include:
-    - stage: validations
+    - stage: test
       script: scripts/validate-code.sh
       name: "Code validations (headerCheck, scalafmt, mima)"
-   
-    - name: "Run tests with Scala 2.12 and AdoptOpenJDK 11" 
+
+    - name: "Run tests with Scala 2.12 and AdoptOpenJDK 11"
       script: scripts/test-code.sh
       env:
         - TRAVIS_SCALA_VERSION=2.12.11 
@@ -57,7 +57,7 @@ jobs:
       script: sbt +publish
 
 stages:
-  - name: validations
+  - name: test
   - name: docs
   - name: publish
     if: tag IS present AND NOT fork
@@ -87,4 +87,4 @@ notifications:
 branches:
   only:
     - master
-    - /^v\d+\.\d+(\.\d+)?(-\S*)?$/
+    - /^\d+\.\d+(\.\d+)?(-\S*)?$/

README.md

@@ -1,4 +1,4 @@
-# Twirl [![Latest version](https://index.scala-lang.org/playframework/twirl/twirl-api/latest.svg?color=orange)](https://index.scala-lang.org/playframework/twirl/twirl-api) [![Build Status](https://travis-ci.org/playframework/twirl.svg?branch=v1.1.0)](https://travis-ci.org/playframework/twirl)
+# Twirl [![Latest version](https://index.scala-lang.org/playframework/twirl/twirl-api/latest.svg?color=orange)](https://index.scala-lang.org/playframework/twirl/twirl-api) [![Build Status](https://travis-ci.org/playframework/twirl.svg)](https://travis-ci.org/playframework/twirl)
 
 Twirl is the [Play][play-site] [template engine][docs].
 
@@ -13,7 +13,7 @@ about the template syntax.
 Twirl can also be used outside of Play. An sbt plugin is provided for easy
 integration with Scala or Java projects.
 
-> sbt-twirl requires sbt 0.13.5 or higher.
+> sbt-twirl requires sbt 1.3.0 or higher.
 
 To add the sbt plugin to your project add the sbt plugin dependency in
 `project/plugins.sbt`: