Skip to content

Commit 26a35cc

Browse files
authored
Set baseVersion to 3.6.0 instead of 3.6.0-RC1 (#21011)
In #20547, to be able to build an msi installer, the version needs to have the following pattern `A.B.C.D`. This change should be fine but the release procedure of RC1 will have to take it into account.
2 parents 466676c + b62b53c commit 26a35cc

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

project/Build.scala

+5-3
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ object Build {
8888

8989
val referenceVersion = "3.4.2-RC1"
9090

91-
val baseVersion = "3.6.0-RC1"
91+
val baseVersion = "3.6.0"
92+
// Will be required by some automation later
93+
val prereleaseVersion = s"$baseVersion-RC1"
9294

9395
// LTS or Next
9496
val versionLine = "Next"
@@ -169,9 +171,9 @@ object Build {
169171
if (isRelease)
170172
baseVersion
171173
else if (isNightly)
172-
baseVersion + "-bin-" + VersionUtil.commitDate + "-" + VersionUtil.gitHash + "-NIGHTLY"
174+
baseVersion + "-RC1-bin-" + VersionUtil.commitDate + "-" + VersionUtil.gitHash + "-NIGHTLY"
173175
else
174-
baseVersion + "-bin-SNAPSHOT"
176+
baseVersion + "-RC1-bin-SNAPSHOT"
175177
}
176178
val dottyNonBootstrappedVersion = {
177179
// Make sure sbt always computes the scalaBinaryVersion correctly

0 commit comments

Comments
 (0)