From 67b3f72117ba9f20a6e5cee96c1ff1799119858d Mon Sep 17 00:00:00 2001 From: Allan Renucci Date: Tue, 11 Dec 2018 15:47:11 +0100 Subject: [PATCH 1/2] Bump sbt, scala and zinc version --- project/Build.scala | 2 +- project/Dependencies.scala | 2 +- project/build.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index a9e45326036e..eae35709fde0 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -37,7 +37,7 @@ object ExposedValues extends AutoPlugin { } object Build { - val scalacVersion = "2.12.7" + val scalacVersion = "2.12.8" val baseVersion = "0.12.0" val baseSbtDottyVersion = "0.2.7" diff --git a/project/Dependencies.scala b/project/Dependencies.scala index bd835b00b2d9..e9cd6bc31f6e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,7 +10,7 @@ object Dependencies { val `jackson-dataformat-yaml` = "com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % jacksonVersion - private val zincVersion = "1.2.2" + private val zincVersion = "1.2.5" val `compiler-interface` = "org.scala-sbt" % "compiler-interface" % zincVersion val `zinc-api-info` = "org.scala-sbt" %% "zinc-apiinfo" % zincVersion } diff --git a/project/build.properties b/project/build.properties index 0cd8b07982e1..72f902892a13 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.3 +sbt.version=1.2.7 From ebbb54aad516e905c5d2115f2a3c0dcbe521b02b Mon Sep 17 00:00:00 2001 From: Allan Renucci Date: Tue, 11 Dec 2018 17:40:25 +0100 Subject: [PATCH 2/2] Update docker image --- .drone.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index c67afae1b7c0..1f9398844568 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,7 +23,7 @@ pipeline: # We run tests in parallel. Tests run in a copy of the working directory to avoid conflict test: group: test - image: lampepfl/dotty:2018-10-01 + image: lampepfl/dotty:2018-12-12 commands: - cp -R . /tmp/1/ && cd /tmp/1/ - ./project/scripts/sbt ";compile ;test" @@ -31,7 +31,7 @@ pipeline: test_bootstrapped: group: test - image: lampepfl/dotty:2018-10-01 + image: lampepfl/dotty:2018-12-12 commands: - cp -R . /tmp/2/ && cd /tmp/2/ - ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test ;sjsSandbox/run" @@ -39,7 +39,7 @@ pipeline: test_sbt: group: test - image: lampepfl/dotty:2018-10-01 + image: lampepfl/dotty:2018-12-12 commands: - cp -R . /tmp/4/ && cd /tmp/4/ - ./project/scripts/sbt sbt-dotty/scripted @@ -49,7 +49,7 @@ pipeline: # DOCUMENTATION: documentation: - image: lampepfl/dotty:2018-10-01 + image: lampepfl/dotty:2018-12-12 commands: - ./project/scripts/genDocs secrets: [ bot_token ] @@ -61,7 +61,7 @@ pipeline: # PUBLISHING: # Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala publish_nightly: - image: lampepfl/dotty:2018-10-01 + image: lampepfl/dotty:2018-12-12 environment: - NIGHTLYBUILD=yes commands: @@ -72,7 +72,7 @@ pipeline: environment: nightly publish_release: - image: lampepfl/dotty:2018-10-01 + image: lampepfl/dotty:2018-12-12 environment: - RELEASEBUILD=yes commands: @@ -96,7 +96,7 @@ pipeline: event: tag publish_sbt_release: - image: lampepfl/dotty:2018-10-01 + image: lampepfl/dotty:2018-12-12 environment: - RELEASEBUILD=yes commands: