Skip to content

Commit

Permalink
Update to sbt 1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
msiegenthaler committed Feb 2, 2018
1 parent ef7d028 commit 601d3d4
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 18 deletions.
15 changes: 4 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,16 @@
FROM openjdk:8u141
MAINTAINER Mario Siegenthaler <[email protected]>
FROM openjdk:8u151
LABEL maintainer="[email protected]"

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
Expand Down
7 changes: 4 additions & 3 deletions init_deps/build.sbt
Original file line number Diff line number Diff line change
@@ -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"
1 change: 1 addition & 0 deletions init_deps/project/build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sbt.version=1.1.0
6 changes: 3 additions & 3 deletions init_deps/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
2 changes: 1 addition & 1 deletion init_scala-2.12/build.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
scalaVersion := "2.12.3"
scalaVersion := "2.12.4"
1 change: 1 addition & 0 deletions init_scala-2.12/project/build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sbt.version=1.1.0

0 comments on commit 601d3d4

Please sign in to comment.