Skip to content

Commit bb5d1d9

Browse files
authored
Merge pull request #13060 from lampepfl/after-release-3.0.2-RC1
Bump scala baseVersion to 3.0.3-RC1
2 parents 2aa2551 + bbe63fc commit bb5d1d9

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ object DottyJSPlugin extends AutoPlugin {
6565
object Build {
6666
val referenceVersion = "3.0.0"
6767

68-
val baseVersion = "3.0.2-RC1"
68+
val baseVersion = "3.0.3-RC1"
6969

7070
// Versions used by the vscode extension to create a new project
7171
// This should be the latest published releases.

project/scripts/cmdScaladocTests

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ clear_out "$OUT1"
1010
STDLIB_COMMAND="$SBT \"eval println(Build.stdlibVersion(Modes.NonBootstrapped))\""
1111
STDLIB_VERSION=$(eval $STDLIB_COMMAND | tail -n 2 | head -n 1)
1212

13-
DOTTY_NONBOOTSTRAPPED_COMMAND="$SBT \"eval println(Build.dottyNonBootstrappedVersion)\""
14-
DOTTY_NONBOOTSTRAPPED_VERSION=$(eval $DOTTY_NONBOOTSTRAPPED_COMMAND | tail -n 2 | head -n 1)
13+
DOTTY_NONBOOTSTRAPPED_VERSION_COMMAND="$SBT \"eval println(Build.dottyNonBootstrappedVersion)\""
14+
DOTTY_NONBOOTSTRAPPED_VERSION=$(eval $DOTTY_NONBOOTSTRAPPED_VERSION_COMMAND | tail -n 2 | head -n 1)
15+
16+
DOTTY_BOOTSTRAPPED_VERSION_COMMAND="$SBT \"eval println(Build.dottyVersion)\""
17+
DOTTY_BOOTSTRAPPED_VERSION=$(eval $DOTTY_BOOTSTRAPPED_VERSION_COMMAND | tail -n 2 | head -n 1)
1518

1619
"$SBT" "scaladoc/generateTestcasesDocumentation" > "$tmp" 2>&1 || echo "generated testcases project with sbt"
1720
dist/target/pack/bin/scaladoc \
@@ -29,6 +32,6 @@ dist/target/pack/bin/scaladoc \
2932
"-skip-by-id:scala.runtime.stdLibPatches" \
3033
"-skip-by-id:scala.runtime.MatchCase" \
3134
-project-footer "Copyright (c) 2002-2021, LAMP/EPFL" \
32-
-author -groups -revision master -project-version 3.0.2-RC1-bin-SNAPSHOT \
33-
out/bootstrap/scaladoc-testcases/scala-3.0.2-RC1-bin-SNAPSHOT-nonbootstrapped/classes > "$tmp" 2>&1 || echo "generated testcases project with scripts"
35+
-author -groups -revision master -project-version "${DOTTY_BOOTSTRAPPED_VERSION}" \
36+
out/bootstrap/scaladoc-testcases/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/classes > "$tmp" 2>&1 || echo "generated testcases project with scripts"
3437
diff -rq "$OUT1" "scaladoc/output/testcases"

0 commit comments

Comments
 (0)