From 22890b6e9f7ec44e99319340ab5484488c07d313 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Tue, 27 Jan 2015 09:20:19 +0000
Subject: [PATCH 1/3] Add TravisCI badge.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 0015d84b..243b9a72 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 Configuration library for JVM languages.
 
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.typesafe/config/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.typesafe/config)
+[![Build Status](https://travis-ci.org/typesafehub/config.svg?branch=master)](https://travis-ci.org/typesafehub/config)
 
 
 ## Overview

From a8e23430867498f48f80ce1ce5b0e747dc9c7325 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Tue, 27 Jan 2015 09:28:40 +0000
Subject: [PATCH 2/3] Switch to Travis' docker infrastructure.

---
 .travis.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index f5cf6fa5..ad742f26 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1 +1,22 @@
+# use Docker-based container (instead of OpenVZ)
+sudo: false
+
+cache:
+  directories:
+    - $HOME/.ivy2/cache
+    # Cache the sbt launcher, currently the Travis VM preinstalls 0.13.5
+    - $HOME/.sbt/launchers/0.13.7
+    # Cache scala, currently the Travis VM preinstalls 2.11.2 & 2.10.4
+    #- $HOME/.sbt/boot/scala-$TRAVIS_SCALA_VERSION
+
+    # Updates regarding Travis VM preinstalls:
+    # https://github.com/travis-ci/travis-cookbooks/blob/master/changes.md
+
 language: scala
+
+script:
+  - sbt ++$TRAVIS_SCALA_VERSION test
+
+  # Remove to avoid unnecessary cache updates
+  - find $HOME/.sbt -name "*.lock" -delete
+  - find $HOME/.ivy2 -name "ivydata-*.properties" -delete

From 137050a69cbb8baef1b3051bf3e0b4a50ed59e9b Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Tue, 27 Jan 2015 09:49:35 +0000
Subject: [PATCH 3/3] Specify openjdk6.

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

diff --git a/.travis.yml b/.travis.yml
index ad742f26..01a6738c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,9 @@ cache:
 
 language: scala
 
+jdk:
+  - openjdk6
+
 script:
   - sbt ++$TRAVIS_SCALA_VERSION test