From a653d8c9eadf74aa7bf5e8b85db11a1f66fc87db Mon Sep 17 00:00:00 2001
From: Allan Renucci <allan.renucci@gmail.com>
Date: Fri, 20 Oct 2017 14:01:07 +0200
Subject: [PATCH 1/2] Bump Scala version to 2.12.4

---
 project/Build.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/Build.scala b/project/Build.scala
index bcdb46c0f339..d3ee4f0d01a0 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -36,7 +36,7 @@ object ExposedValues extends AutoPlugin {
 
 object Build {
 
-  val scalacVersion = "2.12.3"
+  val scalacVersion = "2.12.4"
 
   val dottyOrganization = "ch.epfl.lamp"
   val dottyGithubUrl = "https://github.com/lampepfl/dotty"

From b35c7654799072b3d238974ab1fec71c103eb784 Mon Sep 17 00:00:00 2001
From: Allan Renucci <allan.renucci@gmail.com>
Date: Fri, 20 Oct 2017 14:23:48 +0200
Subject: [PATCH 2/2] Update Docker image following Scala version update

---
 .drone.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 66b79aa7c706..696e64040d6f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,14 +3,14 @@ pipeline:
   # We run tests in parallel. Tests run in a copy of the working directory to avoid conflict
   test_legacy:
     group: test
-    image: lampepfl/dotty:2017-10-07
+    image: lampepfl/dotty:2017-10-20
     commands:
       - cp -R . /tmp/0/ && cd /tmp/0/
       - ./project/scripts/sbt legacyTests
 
   test:
     group: test
-    image: lampepfl/dotty:2017-10-07
+    image: lampepfl/dotty:2017-10-20
     commands:
       - cp -R . /tmp/1/ && cd /tmp/1/
       - ./project/scripts/sbt testAll
@@ -18,7 +18,7 @@ pipeline:
 
   test_bootstrapped:
     group: test
-    image: lampepfl/dotty:2017-10-07
+    image: lampepfl/dotty:2017-10-20
     commands:
       - cp -R . /tmp/2/ && cd /tmp/2/
       - ./project/scripts/sbt dotty-bootstrapped/testAll
@@ -26,14 +26,14 @@ pipeline:
 
   test_optimised:
     group: test
-    image: lampepfl/dotty:2017-10-07
+    image: lampepfl/dotty:2017-10-20
     commands:
       - cp -R . /tmp/3/ && cd /tmp/3/
       - ./project/scripts/sbt dotty-optimised/testAll
 
   test_sbt:
     group: test
-    image: lampepfl/dotty:2017-10-07
+    image: lampepfl/dotty:2017-10-20
     commands:
       - cp -R . /tmp/4/ && cd /tmp/4/
       - ./project/scripts/sbt sbt-dotty/scripted
@@ -43,7 +43,7 @@ pipeline:
 
   # DOCUMENTATION:
   documentation:
-    image: lampepfl/dotty:2017-10-07
+    image: lampepfl/dotty:2017-10-20
     commands:
       - ./project/scripts/genDocs
     secrets: [ bot_pass ]
@@ -55,7 +55,7 @@ pipeline:
   # PUBLISHING:
   # Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala
   publish_nightly:
-    image: lampepfl/dotty:2017-10-07
+    image: lampepfl/dotty:2017-10-20
     environment:
       - NIGHTLYBUILD=yes
     commands:
@@ -68,7 +68,7 @@ pipeline:
       environment: nightly
 
   publish_release:
-    image: lampepfl/dotty:2017-10-07
+    image: lampepfl/dotty:2017-10-20
     environment:
       - RELEASEBUILD=yes
     commands:
@@ -94,7 +94,7 @@ pipeline:
       event: tag
 
   publish_sbt_release:
-    image: lampepfl/dotty:2017-10-07
+    image: lampepfl/dotty:2017-10-20
     environment:
       - RELEASEBUILD=yes
     commands: