From 5542ebe2861eb69c616cc2812eebac2e482898c3 Mon Sep 17 00:00:00 2001 From: Niklas Klein Date: Tue, 8 Oct 2019 09:57:09 +0200 Subject: [PATCH] Upgrade to scala 2.13.1 --- Dockerfile | 2 +- build.sbt | 3 ++- scalaVersion.sbt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0304ea5e..a359bbb6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ RUN cd ./cache/ && sbt -v +compile ADD ./project ./cache/project/ ADD ./build.sbt ./cache/ RUN mkdir -p ./cache/core/src/test/scala/ ./cache/docs -RUN echo "class Test extends org.scalatest.flatspec.AnyFlatSpec { it should \"x\" in {} }" > ./cache/core/src/test/scala/Test.scala +RUN echo "class Test" > ./cache/core/src/test/scala/Test.scala RUN echo "Lorem ipsum" > ./cache/docs/index.md RUN cd ./cache/ && sbt -v ";set every sourceGenerators := List.empty;coverage;+test;website/makeMicrosite" diff --git a/build.sbt b/build.sbt index 3df74bec..442d3b25 100644 --- a/build.sbt +++ b/build.sbt @@ -54,6 +54,7 @@ lazy val website = project ) }, micrositeAnalyticsToken := "UA-64109905-2", - micrositeDescription := (lokal / description).value + micrositeDescription := (lokal / description).value, + scalaVersion := "2.13.0" ) .dependsOn(dsl.jvm) diff --git a/scalaVersion.sbt b/scalaVersion.sbt index ccfad508..14a74fdb 100644 --- a/scalaVersion.sbt +++ b/scalaVersion.sbt @@ -1,3 +1,3 @@ -ThisBuild / scalaVersion := "2.13.0" +ThisBuild / scalaVersion := "2.13.1" ThisBuild / crossScalaVersions := List("2.11.12", "2.12.10", scalaVersion.value)