From 601d3d4c676f786a27b51763a6d5cf7f6b5fd760 Mon Sep 17 00:00:00 2001
From: Mario Siegenthaler <mario.siegenthaler@linkyard.ch>
Date: Fri, 2 Feb 2018 09:41:22 +0100
Subject: [PATCH] Update to sbt 1.1.0

---
 Dockerfile                               | 15 ++++-----------
 init_deps/build.sbt                      |  7 ++++---
 init_deps/project/build.properties       |  1 +
 init_deps/project/plugins.sbt            |  6 +++---
 init_scala-2.12/build.sbt                |  2 +-
 init_scala-2.12/project/build.properties |  1 +
 6 files changed, 14 insertions(+), 18 deletions(-)
 create mode 100644 init_deps/project/build.properties
 create mode 100644 init_scala-2.12/project/build.properties

diff --git a/Dockerfile b/Dockerfile
index db7285f..b6b6679 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,16 @@
-FROM openjdk:8u141
-MAINTAINER Mario Siegenthaler <mario.siegenthaler@linkyard.ch>
+FROM openjdk:8u151
+LABEL maintainer="mario.siegenthaler@linkyard.ch"
 
-ENV SBT_VERSION 0.13.16
+ENV SBT_VERSION 1.1.0
 
-COPY enable-letsencrypt.sh /usr/local/enable-letsencrypt.sh
-RUN /usr/local/enable-letsencrypt.sh $JAVA_HOME
-
-RUN curl -sL "https://cocl.us/sbt-${SBT_VERSION}.tgz" | \
+RUN curl -sL https://github.com/sbt/sbt/releases/download/v${SBT_VERSION}/sbt-${SBT_VERSION}.tgz | \
     tar -xz -C /usr/local
 
 RUN useradd --create-home -s /bin/bash scala
-USER scala
 
 ENV SBT_HOME /usr/local/sbt
 ENV PATH ${PATH}:${SBT_HOME}/bin
 
-# Already run sbt here - in the next steps we'll run it again, but they change more often
-RUN sbt
-
 # This will build the compiler interface (which is really slow)
 # - for Scala 2.12
 COPY init_scala-2.12 /tmp/init
diff --git a/init_deps/build.sbt b/init_deps/build.sbt
index 58c7d57..b02b0f5 100644
--- a/init_deps/build.sbt
+++ b/init_deps/build.sbt
@@ -1,8 +1,9 @@
 
-scalaVersion := "2.12.3"
+scalaVersion := "2.12.4"
 
 addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.patch)
 addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.4")
-addCompilerPlugin("io.tryp" %% "splain" % "0.2.6")
+addCompilerPlugin("io.tryp" % "splain" % "0.2.7" cross CrossVersion.patch)
 
-libraryDependencies += "com.chuusai" %% "shapeless" % "2.3.2"
+libraryDependencies += "org.typelevel" %% "cats-core" % "1.0.1"
+libraryDependencies += "com.chuusai" %% "shapeless" % "2.3.3"
diff --git a/init_deps/project/build.properties b/init_deps/project/build.properties
new file mode 100644
index 0000000..66fe511
--- /dev/null
+++ b/init_deps/project/build.properties
@@ -0,0 +1 @@
+sbt.version=1.1.0
\ No newline at end of file
diff --git a/init_deps/project/plugins.sbt b/init_deps/project/plugins.sbt
index 6d6ae8c..a7e3936 100644
--- a/init_deps/project/plugins.sbt
+++ b/init_deps/project/plugins.sbt
@@ -3,8 +3,8 @@ logLevel := Level.Info
 
 //common plugins
 
-addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC3")
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0")
 
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6")
 
-addSbtPlugin("org.duhemm" % "sbt-errors-summary" % "0.4.0")
+addSbtPlugin("org.duhemm" % "sbt-errors-summary" % "0.6.0")
diff --git a/init_scala-2.12/build.sbt b/init_scala-2.12/build.sbt
index 805d1bd..1a166be 100644
--- a/init_scala-2.12/build.sbt
+++ b/init_scala-2.12/build.sbt
@@ -1 +1 @@
-scalaVersion := "2.12.3"
+scalaVersion := "2.12.4"
diff --git a/init_scala-2.12/project/build.properties b/init_scala-2.12/project/build.properties
new file mode 100644
index 0000000..66fe511
--- /dev/null
+++ b/init_scala-2.12/project/build.properties
@@ -0,0 +1 @@
+sbt.version=1.1.0
\ No newline at end of file