Skip to content

Commit

Permalink
Merge pull request scala#10407 from SethTisue/scala-3.3.0
Browse files Browse the repository at this point in the history
Scala 3.3.0 (was -RC6)
  • Loading branch information
bishabosha authored May 24, 2023
2 parents d542045 + 38ace4c commit a901a60
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
4 changes: 2 additions & 2 deletions project/DottySupport.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import sbt.librarymanagement.{
* Settings to support validation of TastyUnpickler against the release of dotty with the matching TASTy version
*/
object TastySupport {
val supportedTASTyRelease = "3.3.0-RC6" // TASTy version 28.4-1
val supportedTASTyRelease = "3.3.0" // TASTy version 28.4-1
val scala3Compiler = "org.scala-lang" % "scala3-compiler_3" % supportedTASTyRelease
val scala3Library = "org.scala-lang" % "scala3-library_3" % supportedTASTyRelease

Expand All @@ -26,7 +26,7 @@ object TastySupport {
* Dotty in .travis.yml.
*/
object DottySupport {
val dottyVersion = "3.3.0-RC6"
val dottyVersion = "3.3.0"
val compileWithDotty: Boolean =
Option(System.getProperty("scala.build.compileWithDotty")).exists(_.toBoolean)
lazy val commonSettings = Seq(
Expand Down
7 changes: 1 addition & 6 deletions src/compiler/scala/tools/tasty/TastyHeaderUnpickler.scala
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,7 @@ class TastyHeaderUnpickler(reader: TastyReader) {
compilerExperimental = ExperimentalVersion
)

// TODO: remove this exception once we have a 3.3.0
val dottyRCexception = validVersion ||
(fileMajor == 28 && fileMinor == 3 && fileExperimental == 1
&& MajorVersion == 28 && MinorVersion == 3 && ExperimentalVersion == 0)

check(dottyRCexception, {
check(validVersion, {
val signature = signatureString(fileMajor, fileMinor, fileExperimental)
val toolingVersion = new String(bytes, toolingStart.index, toolingLength)
val producedByAddendum = s"\nThe TASTy file was produced by $toolingVersion.$toolingAddendum"
Expand Down

0 comments on commit a901a60

Please sign in to comment.