Skip to content

Commit

Permalink
Merge pull request scala#10029 from dotty-staging/fix-dottyLatestNigh…
Browse files Browse the repository at this point in the history
…tlyBuild

Fix dottyLatestNightlyBuild following scala3 renaming
  • Loading branch information
anatoliykmetyuk authored Oct 18, 2020
2 parents c76800d + deb987f commit 6701568
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion community-build/community-projects/shapeless
Submodule shapeless updated 1 files
+2 −2 build.sbt
4 changes: 2 additions & 2 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
2 changes: 1 addition & 1 deletion sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ object DottyPlugin extends AutoPlugin {
else fetchSource(s"$major.${minor.toInt - 1}")
}
val (source1, majorVersion) = fetchSource(majorVersionFromWebsite)
val Version = s" <version>($majorVersion\\..*-bin.*)</version>".r
val Version = s" <version>($majorVersion.*-bin.*)</version>".r
val nightly = source1
.getLines()
.collect { case Version(version) => version }
Expand Down

0 comments on commit 6701568

Please sign in to comment.