Merge pull request #2140 from lwronski/dump-scala

Update scala 3 to 3.3.0

Author: lwronski

modules/integration/src/test/scala/scala/cli/integration/ExportJsonTestDefinitions.scala

@@ -39,8 +39,8 @@ abstract class ExportJsonTestDefinitions(val scalaVersionOpt: Option[String])
       val jsonContents = readJson(exportJsonProc.out.text())
 
       expect(jsonContents ==
-        """{
-          |"scalaVersion":"3.2.2",
+        s"""{
+          |"scalaVersion":"${Constants.scala3}",
           |"platform":"JVM",
           |"jvmVersion":"adopt:11",
           |"scopes": {
@@ -74,6 +74,7 @@ abstract class ExportJsonTestDefinitions(val scalaVersionOpt: Option[String])
         """//> using lib "com.lihaoyi::os-lib:0.7.8"
           |//> using option "-Xasync"
           |//> using plugin "org.wartremover:::wartremover:3.0.9"
+          |//> using scala 3.2.2
           |
           |object Main {
           |  def main(args: Array[String]): Unit =

modules/integration/src/test/scala/scala/cli/integration/RunScriptTestDefinitions.scala

@@ -247,30 +247,23 @@ trait RunScriptTestDefinitions { _: RunTestDefinitions =>
       // format: on
       val res    = os.proc(cmd).call(cwd = root, check = false, mergeErrIntoOut = true)
       val output = res.out.lines()
-      val exceptionLines = output
+      val exceptionLines: Vector[String] = output
         .map(stripAnsi)
         .dropWhile(!_.startsWith("Exception in thread "))
       val tab = "\t"
-      val expectedLines =
-        s"""Exception in thread "main" java.lang.Exception: Caught exception during processing
-           |${tab}at throws$$_.<init>(throws.sc:8)
-           |${tab}at throws_sc$$.script(throws.sc:25)
-           |${tab}at throws_sc$$.main(throws.sc:29)
-           |${tab}at throws_sc.main(throws.sc)
-           |Caused by: java.lang.RuntimeException: nope
-           |${tab}at scala.sys.package$$.error(package.scala:27)
-           |${tab}at throws$$_.something(throws.sc:3)
-           |${tab}at throws$$_.<init>(throws.sc:5)
-           |$tab... 3 more""".stripMargin.linesIterator.toVector
+
+      val (caughtLines, causedLines) = exceptionLines.span(!_.startsWith("Caused by:"))
+
+      assert(caughtLines.length > 1)
+      assert(caughtLines.contains(s"${tab}at throws$$_.<init>(throws.sc:8)"), clues(caughtLines))
+
+      assert(causedLines.length > 1)
       assert(
-        exceptionLines.length == expectedLines.length,
-        clues(output, exceptionLines.length, expectedLines.length)
+        causedLines.contains(s"Caused by: java.lang.RuntimeException: nope") &&
+        causedLines.contains(s"${tab}at throws$$_.something(throws.sc:3)") &&
+        causedLines.contains(s"${tab}at throws$$_.<init>(throws.sc:5)"),
+        clues(causedLines)
       )
-      for (i <- exceptionLines.indices)
-        assert(
-          exceptionLines(i) == expectedLines(i),
-          clues(output, exceptionLines(i), expectedLines(i))
-        )
     }
   }
 

project/deps.sc

@@ -8,7 +8,7 @@ object Scala {
   def scala212     = "2.12.17"
   def scala213     = "2.13.10"
   def runnerScala3 = "3.0.2" // the newest version that is compatible with all Scala 3.x versions
-  def scala3       = "3.2.2"
+  def scala3       = "3.3.0"
   val allScala2    = Seq(scala213, scala212)
   val all          = allScala2 ++ Seq(scala3)
   val mainVersions = Seq(scala3, scala213)
@@ -33,7 +33,7 @@ object Scala {
 
   def maxAmmoniteScala212Version = scala212
   def maxAmmoniteScala213Version = scala213
-  def maxAmmoniteScala3Version   = scala3
+  def maxAmmoniteScala3Version   = "3.2.2"
   lazy val listAllAmmonite = {
     import coursier.core.Version
     val max212 = Version(maxAmmoniteScala212Version)

website/docs/reference/cli-options.md

@@ -1420,7 +1420,7 @@ Available in commands:
 
 Aliases: `-S`, `--scala`
 
-Set the Scala version (3.2.2 by default)
+Set the Scala version (3.3.0 by default)
 
 ### `--scala-binary-version`
 

website/docs/reference/scala-command/cli-options.md

@@ -912,7 +912,7 @@ Aliases: `-S`, `--scala`
 
 `MUST have` per Scala Runner specification
 
-Set the Scala version (3.2.2 by default)
+Set the Scala version (3.3.0 by default)
 
 ### `--scala-binary-version`
 

website/docs/reference/scala-command/runner-specification.md

@@ -76,7 +76,7 @@ Aliases: `--plugin` ,`-P`
 
 **--scala-version**
 
-Set the Scala version (3.2.2 by default)
+Set the Scala version (3.3.0 by default)
 
 Aliases: `-S` ,`--scala`
 
@@ -780,7 +780,7 @@ Aliases: `--plugin` ,`-P`
 
 **--scala-version**
 
-Set the Scala version (3.2.2 by default)
+Set the Scala version (3.3.0 by default)
 
 Aliases: `-S` ,`--scala`
 
@@ -1319,7 +1319,7 @@ Aliases: `--plugin` ,`-P`
 
 **--scala-version**
 
-Set the Scala version (3.2.2 by default)
+Set the Scala version (3.3.0 by default)
 
 Aliases: `-S` ,`--scala`
 
@@ -1872,7 +1872,7 @@ Aliases: `--plugin` ,`-P`
 
 **--scala-version**
 
-Set the Scala version (3.2.2 by default)
+Set the Scala version (3.3.0 by default)
 
 Aliases: `-S` ,`--scala`
 
@@ -2450,7 +2450,7 @@ Aliases: `--plugin` ,`-P`
 
 **--scala-version**
 
-Set the Scala version (3.2.2 by default)
+Set the Scala version (3.3.0 by default)
 
 Aliases: `-S` ,`--scala`
 
@@ -3016,7 +3016,7 @@ Aliases: `--plugin` ,`-P`
 
 **--scala-version**
 
-Set the Scala version (3.2.2 by default)
+Set the Scala version (3.3.0 by default)
 
 Aliases: `-S` ,`--scala`
 
@@ -3601,7 +3601,7 @@ Aliases: `--plugin` ,`-P`
 
 **--scala-version**
 
-Set the Scala version (3.2.2 by default)
+Set the Scala version (3.3.0 by default)
 
 Aliases: `-S` ,`--scala`
 
@@ -4243,7 +4243,7 @@ Aliases: `--plugin` ,`-P`
 
 **--scala-version**
 
-Set the Scala version (3.2.2 by default)
+Set the Scala version (3.3.0 by default)
 
 Aliases: `-S` ,`--scala`
 
@@ -5092,7 +5092,7 @@ Aliases: `--plugin` ,`-P`
 
 **--scala-version**
 
-Set the Scala version (3.2.2 by default)
+Set the Scala version (3.3.0 by default)
 
 Aliases: `-S` ,`--scala`
 

website/docs/reference/scala-versions.md

@@ -17,5 +17,6 @@ it is recommended to update scala-cli.
 | 0.1.13 - 0.1.15    |  3.2.0  |     2.13.8 |    2.12.16 |
 | 0.1.16 - 0.1.17    |  3.2.0  |    2.13.10 |    2.12.17 |
 | 0.1.18 - 0.1.19    |  3.2.1  |    2.13.10 |    2.12.17 |
-| 0.1.20 - current   |  3.2.2  |    2.13.10 |    2.12.17 |
+| 0.1.20 - 1.0.0-RC2 |  3.2.2  |    2.13.10 |    2.12.17 |
+| 1.0.0 - current    |  3.3.0  |    2.13.10 |    2.12.17 |