From 2b457a7ee560c317d705540119cbd669b157e16b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Tue, 13 Jul 2021 13:09:22 +0200 Subject: [PATCH 1/2] Bump scala baseVersion to 3.0.3-RC1 --- project/Build.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index d8d9236a26dd..9527c1449782 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -65,7 +65,7 @@ object DottyJSPlugin extends AutoPlugin { object Build { val referenceVersion = "3.0.0" - val baseVersion = "3.0.2-RC1" + val baseVersion = "3.0.3-RC1" // Versions used by the vscode extension to create a new project // This should be the latest published releases. From bbe63fc68650b74f7c32d2dc09dc56cc81e1f920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Wed, 14 Jul 2021 13:36:12 +0200 Subject: [PATCH 2/2] Fix hardcoded scala version in cmdScaladocTests --- project/scripts/cmdScaladocTests | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/project/scripts/cmdScaladocTests b/project/scripts/cmdScaladocTests index 38032aacf2cc..8b970417307f 100755 --- a/project/scripts/cmdScaladocTests +++ b/project/scripts/cmdScaladocTests @@ -10,8 +10,11 @@ clear_out "$OUT1" STDLIB_COMMAND="$SBT \"eval println(Build.stdlibVersion(Modes.NonBootstrapped))\"" STDLIB_VERSION=$(eval $STDLIB_COMMAND | tail -n 2 | head -n 1) -DOTTY_NONBOOTSTRAPPED_COMMAND="$SBT \"eval println(Build.dottyNonBootstrappedVersion)\"" -DOTTY_NONBOOTSTRAPPED_VERSION=$(eval $DOTTY_NONBOOTSTRAPPED_COMMAND | tail -n 2 | head -n 1) +DOTTY_NONBOOTSTRAPPED_VERSION_COMMAND="$SBT \"eval println(Build.dottyNonBootstrappedVersion)\"" +DOTTY_NONBOOTSTRAPPED_VERSION=$(eval $DOTTY_NONBOOTSTRAPPED_VERSION_COMMAND | tail -n 2 | head -n 1) + +DOTTY_BOOTSTRAPPED_VERSION_COMMAND="$SBT \"eval println(Build.dottyVersion)\"" +DOTTY_BOOTSTRAPPED_VERSION=$(eval $DOTTY_BOOTSTRAPPED_VERSION_COMMAND | tail -n 2 | head -n 1) "$SBT" "scaladoc/generateTestcasesDocumentation" > "$tmp" 2>&1 || echo "generated testcases project with sbt" dist/target/pack/bin/scaladoc \ @@ -29,6 +32,6 @@ dist/target/pack/bin/scaladoc \ "-skip-by-id:scala.runtime.stdLibPatches" \ "-skip-by-id:scala.runtime.MatchCase" \ -project-footer "Copyright (c) 2002-2021, LAMP/EPFL" \ - -author -groups -revision master -project-version 3.0.2-RC1-bin-SNAPSHOT \ - out/bootstrap/scaladoc-testcases/scala-3.0.2-RC1-bin-SNAPSHOT-nonbootstrapped/classes > "$tmp" 2>&1 || echo "generated testcases project with scripts" + -author -groups -revision master -project-version "${DOTTY_BOOTSTRAPPED_VERSION}" \ + out/bootstrap/scaladoc-testcases/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/classes > "$tmp" 2>&1 || echo "generated testcases project with scripts" diff -rq "$OUT1" "scaladoc/output/testcases"