From bc83b19d0c74d9070e0b5029121814e1d372ddee Mon Sep 17 00:00:00 2001
From: Enno Runne <458526+ennru@users.noreply.github.com>
Date: Thu, 28 May 2020 13:26:01 +0200
Subject: [PATCH 1/3] Travis: run validations before testing; allow version
 branches

---
 .travis.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5186aa78..b681fbe7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,8 +23,9 @@ jobs:
     - stage: validations
       script: scripts/validate-code.sh
       name: "Code validations (headerCheck, scalafmt, mima)"
-   
-    - name: "Run tests with Scala 2.12 and AdoptOpenJDK 11" 
+
+    - stage: test
+      name: "Run tests with Scala 2.12 and AdoptOpenJDK 11"
       script: scripts/test-code.sh
       env:
         - TRAVIS_SCALA_VERSION=2.12.11 
@@ -58,6 +59,7 @@ jobs:
 
 stages:
   - name: validations
+  - name: test
   - name: docs
   - name: publish
     if: tag IS present AND NOT fork
@@ -87,4 +89,4 @@ notifications:
 branches:
   only:
     - master
-    - /^v\d+\.\d+(\.\d+)?(-\S*)?$/
\ No newline at end of file
+    - /^\d+\.\d+(\.\d+)?(-\S*)?$/

From fbe3e1fe97c5b46f008706847c114a8d906f5365 Mon Sep 17 00:00:00 2001
From: Enno Runne <458526+ennru@users.noreply.github.com>
Date: Thu, 28 May 2020 13:34:18 +0200
Subject: [PATCH 2/3] Readme: sbt 1.3, master build status

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b620516a..873a9335 100644
--- a/README.md
+++ b/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`:

From 75ef7581bda41dbbed12b460fd5bfde46a1892bd Mon Sep 17 00:00:00 2001
From: Enno Runne <458526+ennru@users.noreply.github.com>
Date: Wed, 3 Jun 2020 13:58:33 +0200
Subject: [PATCH 3/3] No separate validations stage

---
 .travis.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b681fbe7..5a13e27f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,12 +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)"
 
-    - stage: test
-      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 
@@ -58,7 +57,6 @@ jobs:
       script: sbt +publish
 
 stages:
-  - name: validations
   - name: test
   - name: docs
   - name: publish