From 71ed0eb496e3c251b92cffe49dffe13192614c29 Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Wed, 17 Oct 2018 21:06:35 +0200
Subject: [PATCH] vscode-dotty: proper version for auto-configured projects

We cannot rely on dottyVersion and sbtDottyVersion for the default
versions since by definition these correspond to unpublished releases.
---
 project/Build.scala | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/project/Build.scala b/project/Build.scala
index d275744e30df..41ab20a1f191 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -34,13 +34,23 @@ object ExposedValues extends AutoPlugin {
 }
 
 object Build {
+  val scalacVersion = "2.12.7"
 
   val baseVersion = "0.11.0"
-  val scalacVersion = "2.12.7"
+  val baseSbtDottyVersion = "0.2.6"
+
+  // Versions used by the vscode extension to create a new project
+  // This should be the latest published releases.
+  // TODO: Have the vscode extension fetch these numbers from the Internet
+  // instead of hardcoding them ?
+  val publishedDottyVersion = "0.11.0-bin-20181017-3253921-NIGHTLY" // Using a nightly for now to get worksheet support
+  val publishedSbtDottyVersion = "0.2.5"
+
 
   val dottyOrganization = "ch.epfl.lamp"
   val dottyGithubUrl = "https://github.com/lampepfl/dotty"
 
+
   val isRelease = sys.env.get("RELEASEBUILD") == Some("yes")
 
   val dottyVersion = {
@@ -56,8 +66,7 @@ object Build {
 
   val sbtDottyName = "sbt-dotty"
   val sbtDottyVersion = {
-    val base = "0.2.6"
-    if (isRelease) base else base + "-SNAPSHOT"
+    if (isRelease) baseSbtDottyVersion else baseSbtDottyVersion + "-SNAPSHOT"
   }
 
   val agentOptions = List(
@@ -992,9 +1001,11 @@ object Build {
       resourceGenerators in Compile += Def.task {
         // Resources that will be copied when bootstrapping a new project
         val buildSbtFile = baseDirectory.value / "out" / "build.sbt"
-        IO.write(buildSbtFile, s"""scalaVersion := "$dottyVersion"""")
+        IO.write(buildSbtFile,
+          s"""scalaVersion := "$publishedDottyVersion"""")
         val dottyPluginSbtFile = baseDirectory.value / "out" / "dotty-plugin.sbt"
-        IO.write(dottyPluginSbtFile, s"""addSbtPlugin("$dottyOrganization" % "$sbtDottyName" % "$sbtDottyVersion")""")
+        IO.write(dottyPluginSbtFile,
+          s"""addSbtPlugin("$dottyOrganization" % "$sbtDottyName" % "$publishedSbtDottyVersion")""")
         Seq(buildSbtFile, dottyPluginSbtFile)
       },
       compile in Compile := Def.task {