Dotty version: 0.24.0-RC1 -> 0.25.0-RC2 #SCL-17690

build.sbt

@@ -93,7 +93,7 @@ lazy val tastyRuntime = newProject("tasty-runtime", file("tasty/runtime"))
 
 lazy val tastyExample = newProject("tasty-example", file("tasty/example"))
   .dependsOn(tastyCompile, tastyProvided % Provided)
-  .settings(scalaVersion := "2.13.1", libraryDependencies += "ch.epfl.lamp" % "dotty-library_0.24" % "0.24.0-RC1" % Runtime)
+  .settings(scalaVersion := "2.13.1", libraryDependencies += "ch.epfl.lamp" % "dotty-library_0.25" % "0.25.0-RC2" % Runtime)
 
 lazy val tastyReader = newProject("tasty-reader", file("tasty/reader"))
   .dependsOn(tastyCompile, tastyProvided % Provided)

project/dependencies.scala

@@ -31,7 +31,7 @@ object Versions {
     val latest_2_11 = "2.11.12"
     val latest_2_12 = "2.12.10"
     val latest_2_13 = "2.13.1"
-    val latest_3_0 = "0.24.0-RC1"
+    val latest_3_0 = "0.25.0-RC2"
     val latest_dotty = latest_3_0
     val latest: String = latest_2_12
     /** Version used to build this project. Prefer latest_2_12 unless it causes problems. */

scala/runners/resources/org/jetbrains/plugins/scala/worksheet/src/MacroPrinter3_sources.scala

@@ -1,14 +1,14 @@
 package org.jetbrains.plugins.scala.worksheet
 
 import scala.quoted._
-import scala.quoted.matching._
-
-import dotty.tools.dotc.tastyreflect.TastyTreeExpr
+import dotty.tools.dotc.ast.tpd.Tree
 import dotty.tools.dotc.core.Contexts.{Context => InternalContext}
 import dotty.tools.dotc.ast.{Trees => InternalTrees}
 
 object MacroPrinter3 {
 
+  type TastyTreeExpr = scala.internal.quoted.Expr[Tree]
+
   inline def showType[T](inline expr: => T): String = ${ showTypeImpl('expr) }
   inline def showMethodDefinition[T](inline expr: T): String = ${ showMethodDefinitionImpl('expr) }
 

scala/scala-api/src/org/jetbrains/plugins/scala/project/ScalaLanguageLevel.java

@@ -11,7 +11,7 @@ public enum ScalaLanguageLevel implements Ordered<ScalaLanguageLevel>, Named {
     Scala_2_11("2.11"),
     Scala_2_12("2.12"),
     Scala_2_13("2.13"),
-    Scala_3_0("0.24", "3.0");
+    Scala_3_0("0.25", "3.0");
 
     @NotNull
     private final String myVersion;

scala/scala-impl/src/org/jetbrains/plugins/scala/ScalaVersion.scala

@@ -58,7 +58,7 @@ object LatestScalaVersions {
   val Scala_2_11 = new ScalaVersion(ScalaLanguageLevel.Scala_2_11, "12")
   val Scala_2_12 = new ScalaVersion(ScalaLanguageLevel.Scala_2_12, "10")
   val Scala_2_13 = new ScalaVersion(ScalaLanguageLevel.Scala_2_13, "1")
-  val Scala_3_0 = new ScalaVersion(ScalaLanguageLevel.Scala_3_0, "0-RC1")
+  val Scala_3_0 = new ScalaVersion(ScalaLanguageLevel.Scala_3_0, "0-RC2")
   final val Dotty = Scala_3_0
 
   val all: Seq[ScalaVersion] = Seq(

tasty/compile/README.md

@@ -1,6 +1,6 @@
 # TASTy Reflect & Inspect compatibility for the Scala 2.x TASTy APIs
 
-Scala 3-like syntax on top of the ABI of [scala.tasty.Reflection.scala](https://github.com/lampepfl/dotty/blob/0.24.0-RC1/library/src/scala/tasty/Reflection.scala)
+Scala 3-like syntax on top of the ABI of [scala.tasty.Reflection.scala](https://github.com/lampepfl/dotty/blob/0.25.0-RC2/library/src/scala/tasty/Reflection.scala)
 
 Required because Scala 2.x doesn't support extension methods (and implicit AnyVal classes in a class):
 https://dotty.epfl.ch/docs/reference/contextual/relationship-implicits.html

tasty/example/src/Main.scala

@@ -22,15 +22,16 @@ object Main {
   def main(args: Array[String]): Unit = {
     val home = System.getProperty("user.home")
 
-    val Version = "0.24"
+    val Version = "0.25"
+    val FullVersion = s"$Version.0-RC2"
 
     val files = Seq(
       home + "/.ivy2/cache/org.scala-lang/scala-library/jars/scala-library-2.13.1.jar",
-      s"$home/.ivy2/cache/ch.epfl.lamp/dotty-interfaces/jars/dotty-interfaces-$Version.0-RC1.jar",
-      s"$home/.ivy2/cache/ch.epfl.lamp/dotty-library_$Version/jars/dotty-library_$Version-$Version.0-RC1.jar",
-      s"$home/.ivy2/cache/ch.epfl.lamp/dotty-compiler_$Version/jars/dotty-compiler_$Version-$Version.0-RC1.jar",
-      s"$home/.ivy2/cache/ch.epfl.lamp/dotty-tasty-inspector_$Version/jars/dotty-tasty-inspector_$Version-$Version.0-RC1.jar",
-      s"$home/.ivy2/cache/ch.epfl.lamp/tasty-core_$Version/jars/tasty-core_$Version-$Version.0-RC1.jar",
+      s"$home/.ivy2/cache/ch.epfl.lamp/dotty-interfaces/jars/dotty-interfaces-$FullVersion.jar",
+      s"$home/.ivy2/cache/ch.epfl.lamp/dotty-library_$Version/jars/dotty-library_$Version-$FullVersion.jar",
+      s"$home/.ivy2/cache/ch.epfl.lamp/dotty-compiler_$Version/jars/dotty-compiler_$Version-$FullVersion.jar",
+      s"$home/.ivy2/cache/ch.epfl.lamp/dotty-tasty-inspector_$Version/jars/dotty-tasty-inspector_$Version-$FullVersion.jar",
+      s"$home/.ivy2/cache/ch.epfl.lamp/tasty-core_$Version/jars/tasty-core_$Version-$FullVersion.jar",
       "target/plugin/Scala/lib/tasty/tasty-runtime.jar",
     )
 

tasty/provided/README.md

@@ -1,6 +1,6 @@
 # TASTy Reflect & Inspect APIs for Scala 2.x
 
-Reproduces the ABI of [scala.tasty.Reflection.scala](https://github.com/lampepfl/dotty/blob/0.24.0-RC1/library/src/scala/tasty/Reflection.scala) (and several related Scala classes).
+Reproduces the ABI of [scala.tasty.Reflection.scala](https://github.com/lampepfl/dotty/blob/0.25.0-RC2/library/src/scala/tasty/Reflection.scala) (and several related Scala classes).
 
 See:
 * https://dotty.epfl.ch/docs/reference/metaprogramming/tasty-reflect.html