# HG changeset patch
# User wenzelm
# Date 1669409920 -3600
# Node ID cdbe200240384e43eb2c9833d3cf9090b5d2853a
# Parent  80dc20ffd31b4bcb2057762fd3b334b0b64365c1
update to scala-3.2.1;
enforce rebuild of Isabelle/ML + Isabelle/Scala;

diff -r 80dc20ffd31b -r cdbe20024038 Admin/components/components.sha1
--- a/Admin/components/components.sha1	Fri Nov 25 20:45:52 2022 +0100
+++ b/Admin/components/components.sha1	Fri Nov 25 21:58:40 2022 +0100
@@ -441,6 +441,7 @@
 87c8e53100df4bc85cd8d4f55028088646d70fb4 scala-3.2.0-1.tar.gz
 c58db22b9e1e90f5b7a3f5edd8bdb4ddab4947fd scala-3.2.0-2.tar.gz
 7677b02fe06c992ca6cf82bf68adb16287294256 scala-3.2.0.tar.gz
+bee1c9416a086e553057171e5cb571271ed02c60 scala-3.2.1.tar.gz
 abe7a3b50da529d557a478e9f631a22429418a67 smbc-0.4.1.tar.gz
 cbd491c0feba1d21019d05564e76dd04f592ccb4 spass-3.8ds-1.tar.gz
 edaa1268d82203067657aabcf0371ce7d4b579b9 spass-3.8ds-2.tar.gz
diff -r 80dc20ffd31b -r cdbe20024038 Admin/components/main
--- a/Admin/components/main	Fri Nov 25 20:45:52 2022 +0100
+++ b/Admin/components/main	Fri Nov 25 21:58:40 2022 +0100
@@ -28,7 +28,7 @@
 polyml-test-bafe319bc3a6-1
 postgresql-42.5.0
 prismjs-1.29.0
-scala-3.2.0-2
+scala-3.2.1
 smbc-0.4.1
 spass-3.8ds-2
 sqlite-jdbc-3.36.0.3
diff -r 80dc20ffd31b -r cdbe20024038 src/Pure/Admin/build_scala.scala
--- a/src/Pure/Admin/build_scala.scala	Fri Nov 25 20:45:52 2022 +0100
+++ b/src/Pure/Admin/build_scala.scala	Fri Nov 25 21:58:40 2022 +0100
@@ -43,7 +43,7 @@
   }
 
   val main_download: Download =
-    Download("scala", "3.2.0", base_version = "",
+    Download("scala", "3.2.1", base_version = "",
       url = "https://github.com/lampepfl/dotty/releases/download/{V}/scala3-{V}.tar.gz")
 
   val lib_downloads: List[Download] = List(
diff -r 80dc20ffd31b -r cdbe20024038 src/Pure/Concurrent/par_list.scala
--- a/src/Pure/Concurrent/par_list.scala	Fri Nov 25 20:45:52 2022 +0100
+++ b/src/Pure/Concurrent/par_list.scala	Fri Nov 25 21:58:40 2022 +0100
@@ -52,7 +52,9 @@
     val results =
       managed_results(
         (x: A) => f(x) match { case None => () case Some(y) => throw new Found(y) }, xs)
-    results.collectFirst({ case Exn.Exn(found: Found) => found.res }) match {
+    results.collectFirst({
+      case Exn.Exn(found) if found.isInstanceOf[Found] => found.asInstanceOf[Found].res
+    }) match {
       case None => Exn.release_first(results); None
       case some => some
     }
diff -r 80dc20ffd31b -r cdbe20024038 src/Pure/ROOT.ML
--- a/src/Pure/ROOT.ML	Fri Nov 25 20:45:52 2022 +0100
+++ b/src/Pure/ROOT.ML	Fri Nov 25 21:58:40 2022 +0100
@@ -366,3 +366,4 @@
 ML_file "Tools/jedit.ML";
 ML_file "Tools/ghc.ML";
 ML_file "Tools/generated_files.ML";
+
diff -r 80dc20ffd31b -r cdbe20024038 src/Pure/ROOT.scala
--- a/src/Pure/ROOT.scala	Fri Nov 25 20:45:52 2022 +0100
+++ b/src/Pure/ROOT.scala	Fri Nov 25 21:58:40 2022 +0100
@@ -21,4 +21,3 @@
   val proper_string = Library.proper_string _
   def proper_list[A](list: List[A]): Option[List[A]] = Library.proper_list(list)
 }
-
diff -r 80dc20ffd31b -r cdbe20024038 src/Pure/System/scala.scala
--- a/src/Pure/System/scala.scala	Fri Nov 25 20:45:52 2022 +0100
+++ b/src/Pure/System/scala.scala	Fri Nov 25 21:58:40 2022 +0100
@@ -184,7 +184,8 @@
       def compile(source: String, state: repl.State = init_state): Result = {
         out.flush()
         out_stream.reset()
-        val state1 = driver.run(source)(state)
+        given repl.State = state
+        val state1 = driver.run(source)
         out.flush()
         val messages = Message.split(out_stream.toString(UTF8.charset))
         out_stream.reset()