From b7359f6d3265dbda3ad2682c034c7d049c934d07 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sat, 17 Oct 2020 16:59:50 +0200 Subject: [PATCH 1/2] Bump sbt-dotty to 0.4.4-SNAPSHOT --- project/Build.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 16127b9eaec9..15f10c6a0bc4 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -56,14 +56,14 @@ object Build { val referenceVersion = "0.27.0-RC1" val baseVersion = "3.0.0-M1" - val baseSbtDottyVersion = "0.4.3" + val baseSbtDottyVersion = "0.4.4" // 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 = referenceVersion - val publishedSbtDottyVersion = "0.4.2" + val publishedSbtDottyVersion = "0.4.3" /** scala-library version required to compile Dotty. * From deb987ffc2006f3f2e347a1f70a685a60a7963f4 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sat, 17 Oct 2020 14:24:12 +0200 Subject: [PATCH 2/2] Fix dottyLatestNightlyBuild following scala3 renaming The regexp was too specific. Also restore the shapeless build before its use of dottyLatestNightlyBuild was disabled in https://github.com/lampepfl/dotty/pull/10021 --- community-build/community-projects/shapeless | 2 +- sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/community-build/community-projects/shapeless b/community-build/community-projects/shapeless index bf335eb9900c..b4c2d61ac785 160000 --- a/community-build/community-projects/shapeless +++ b/community-build/community-projects/shapeless @@ -1 +1 @@ -Subproject commit bf335eb9900c0c8d4a8946867769c3fa1a1abfdf +Subproject commit b4c2d61ac785720c8ea33eda51104af15fb007d8 diff --git a/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala b/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala index 2861685e09a3..125dbebab2e3 100644 --- a/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala +++ b/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala @@ -49,7 +49,7 @@ object DottyPlugin extends AutoPlugin { else fetchSource(s"$major.${minor.toInt - 1}") } val (source1, majorVersion) = fetchSource(majorVersionFromWebsite) - val Version = s" ($majorVersion\\..*-bin.*)".r + val Version = s" ($majorVersion.*-bin.*)".r val nightly = source1 .getLines() .collect { case Version(version) => version }