From 47375c1795220c8e29040f9220b2e48dc2feb329 Mon Sep 17 00:00:00 2001
From: Lauri Lehmijoki <lauri.lehmijoki@iki.fi>
Date: Mon, 9 Jun 2014 09:23:16 +0300
Subject: [PATCH] Target JVM 1.6

---
 build.sbt                 | 4 ++++
 changelog.md              | 4 ++++
 lib/s3_website/version.rb | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index e95e83ef..c9950c33 100644
--- a/build.sbt
+++ b/build.sbt
@@ -12,6 +12,10 @@ scalacOptions += "-language:implicitConversions"
 
 scalacOptions += "-language:postfixOps"
 
+scalacOptions += "-target:jvm-1.6"
+
+javacOptions in Compile ++= Seq("-source", "1.6", "-target", "1.6")
+
 libraryDependencies += "org.yaml" % "snakeyaml" % "1.13"
 
 libraryDependencies += "org.jruby" % "jruby" % "1.7.11"
diff --git a/changelog.md b/changelog.md
index a341bd96..572f2884 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.1.5
+
+* Target JVM 1.6 in build.sbt
+
 ## 2.1.4
 
 * Fix reason-for-upload message
diff --git a/lib/s3_website/version.rb b/lib/s3_website/version.rb
index 817e1ce9..1fa5ea1a 100644
--- a/lib/s3_website/version.rb
+++ b/lib/s3_website/version.rb
@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.1.4'
+  VERSION = '2.1.5'
 end