From bc46bb78886bc7d82a066a2e18a27dd459dead82 Mon Sep 17 00:00:00 2001
From: Maksim Logvinenko <mlogvinenko@gmail.com>
Date: Thu, 9 Mar 2017 13:25:49 +0300
Subject: [PATCH] Update project to use scala 2.12

---
 build.sbt           | 13 +++++++++++--
 project/plugins.sbt |  2 +-
 sbt                 |  8 +++-----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/build.sbt b/build.sbt
index d73d640..cff9df7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,12 +4,21 @@ organization := "org.scalaj"
 
 version := "0.8"
 
-crossScalaVersions := Seq("2.10.5", "2.11.7")
+crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.1")
 
-scalacOptions <++= scalaVersion map { (v: String) => 
+javacOptions ++= Seq("-source", "1.7", "-target", "1.7")
+
+scalacOptions ++= {
   Seq("-deprecation", "-unchecked", "-feature", "-language:implicitConversions", "-language:higherKinds")
 }
 
+scalacOptions ++= {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, 12)) => Seq()
+    case _ => Seq("-target:jvm-1.7")
+  }
+}
+
 libraryDependencies ++= Seq(
   "joda-time" % "joda-time" % "2.2",
   "org.joda" % "joda-convert" % "1.2"
diff --git a/project/plugins.sbt b/project/plugins.sbt
index e267d69..d092b4d 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1")
\ No newline at end of file
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
\ No newline at end of file
diff --git a/sbt b/sbt
index 97d7a03..b2fd625 100755
--- a/sbt
+++ b/sbt
@@ -1,19 +1,17 @@
 #!/bin/sh
 
-VERSION=0.13.6
-LATEST=http://typesafe.artifactoryonline.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${VERSION}/sbt-launch.jar
+VERSION=0.13.13
+LATEST=http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${VERSION}/sbt-launch.jar
 JAR=.sbtlib/sbt-launch-${VERSION}.jar
 
 if [ ! -d .sbtlib ]; then
   mkdir .sbtlib
 fi
 
-
-
 if [ ! -f ${JAR} ]; then
   rm .sbtlib/*
   echo "Fetching sbt"
-  curl --progress-bar ${LATEST} > ${JAR}
+  curl -# -L "${LATEST}" -o "${JAR}"
 fi
 
 java \