Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove tasty escape hatch for 3.2.0-RC4 #10127

Merged
merged 1 commit into from Sep 1, 2022
Merged

remove tasty escape hatch for 3.2.0-RC4 #10127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions project/DottySupport.scala
View file
Open in desktop
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.2.0-RC4" // TASTy version 28.2-1
val supportedTASTyRelease = "3.2.0" // TASTy version 28.2-0
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.2.0-RC4"
val dottyVersion = "3.2.0"
val compileWithDotty: Boolean =
Option(System.getProperty("scala.build.compileWithDotty")).map(_.toBoolean).getOrElse(false)
lazy val commonSettings = Seq(
Expand Down
20 changes: 8 additions & 12 deletions src/compiler/scala/tools/tasty/TastyHeaderUnpickler.scala
View file
Open in desktop
Expand Up @@ -44,18 +44,14 @@ class TastyHeaderUnpickler(reader: TastyReader) {
start
}

val validVersion = {
val stdCheck = TastyFormat.isVersionCompatible(
fileMajor = fileMajor,
fileMinor = fileMinor,
fileExperimental = fileExperimental,
compilerMajor = MajorVersion,
compilerMinor = MinorVersion,
compilerExperimental = ExperimentalVersion
)
val fallback = fileMajor == 28 && fileMinor == 2 && fileExperimental == 1 // 3.2.0-RC1
stdCheck || fallback
}
val validVersion = TastyFormat.isVersionCompatible(
fileMajor = fileMajor,
fileMinor = fileMinor,
fileExperimental = fileExperimental,
compilerMajor = MajorVersion,
compilerMinor = MinorVersion,
compilerExperimental = ExperimentalVersion
)

check(validVersion, {
val signature = signatureString(fileMajor, fileMinor, fileExperimental)
Expand Down