Skip to content

Commit a901a60

Browse files
authored
Merge pull request scala#10407 from SethTisue/scala-3.3.0
Scala 3.3.0 (was -RC6)
2 parents d542045 + 38ace4c commit a901a60

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

project/DottySupport.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import sbt.librarymanagement.{
1212
* Settings to support validation of TastyUnpickler against the release of dotty with the matching TASTy version
1313
*/
1414
object TastySupport {
15-
val supportedTASTyRelease = "3.3.0-RC6" // TASTy version 28.4-1
15+
val supportedTASTyRelease = "3.3.0" // TASTy version 28.4-1
1616
val scala3Compiler = "org.scala-lang" % "scala3-compiler_3" % supportedTASTyRelease
1717
val scala3Library = "org.scala-lang" % "scala3-library_3" % supportedTASTyRelease
1818

@@ -26,7 +26,7 @@ object TastySupport {
2626
* Dotty in .travis.yml.
2727
*/
2828
object DottySupport {
29-
val dottyVersion = "3.3.0-RC6"
29+
val dottyVersion = "3.3.0"
3030
val compileWithDotty: Boolean =
3131
Option(System.getProperty("scala.build.compileWithDotty")).exists(_.toBoolean)
3232
lazy val commonSettings = Seq(

src/compiler/scala/tools/tasty/TastyHeaderUnpickler.scala

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,7 @@ class TastyHeaderUnpickler(reader: TastyReader) {
5353
compilerExperimental = ExperimentalVersion
5454
)
5555

56-
// TODO: remove this exception once we have a 3.3.0
57-
val dottyRCexception = validVersion ||
58-
(fileMajor == 28 && fileMinor == 3 && fileExperimental == 1
59-
&& MajorVersion == 28 && MinorVersion == 3 && ExperimentalVersion == 0)
60-
61-
check(dottyRCexception, {
56+
check(validVersion, {
6257
val signature = signatureString(fileMajor, fileMinor, fileExperimental)
6358
val toolingVersion = new String(bytes, toolingStart.index, toolingLength)
6459
val producedByAddendum = s"\nThe TASTy file was produced by $toolingVersion.$toolingAddendum"

0 commit comments

Comments
 (0)