From 140b892dab0bec95d4bfa5b44f56415536985915 Mon Sep 17 00:00:00 2001 From: Mario Siegenthaler Date: Fri, 26 Nov 2021 08:37:40 +0100 Subject: [PATCH] chore: update to sbt 1.5.5 --- .gitignore | 1 + Dockerfile | 10 ++++++---- init_deps/project/build.properties | 2 +- init_deps/project/plugins.sbt | 8 +++----- init_scala-2.13/project/build.properties | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index ad5dcbe..e837f7d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .metals target +.vscode diff --git a/Dockerfile b/Dockerfile index b6d46c5..5582e88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,17 @@ -FROM openjdk:13 +FROM openjdk:11-jdk LABEL maintainer="mario.siegenthaler@linkyard.ch" -ENV SBT_VERSION 1.3.8 +ENV SBT_VERSION 1.5.5 # add deps # - libatomic: needed by protoc # - git: needed by sbt when we use source dependency -RUN yum install -y -q libatomic git +RUN apt-get update && \ + apt-get install -y libatomic1 git && \ + rm -rf /var/lib/apt/lists/* -RUN curl -sL https://github.com/sbt/sbt/releases/download/v1.3.8/sbt-1.3.8.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 diff --git a/init_deps/project/build.properties b/init_deps/project/build.properties index 35b49ae..bb5389d 100644 --- a/init_deps/project/build.properties +++ b/init_deps/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.8 \ No newline at end of file +sbt.version=1.5.5 \ No newline at end of file diff --git a/init_deps/project/plugins.sbt b/init_deps/project/plugins.sbt index ef7f41c..1734d9b 100644 --- a/init_deps/project/plugins.sbt +++ b/init_deps/project/plugins.sbt @@ -3,10 +3,8 @@ logLevel := Level.Info //common plugins -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0") -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") -addSbtPlugin("org.duhemm" % "sbt-errors-summary" % "0.6.3") - -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.2") diff --git a/init_scala-2.13/project/build.properties b/init_scala-2.13/project/build.properties index 35b49ae..bb5389d 100644 --- a/init_scala-2.13/project/build.properties +++ b/init_scala-2.13/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.8 \ No newline at end of file +sbt.version=1.5.5 \ No newline at end of file