# HG changeset patch # User wenzelm # Date 1685524455 -7200 # Node ID 163e4835a8db3f0b1060c1c06a2b3c7cadce52cc # Parent 96e2c2bbacbdd341f9ab36b1234510838b6e4db5 enable scala-3.3.0, with forced rebuild of Isabelle/Scala and Isabelle/ML; diff -r 96e2c2bbacbd -r 163e4835a8db Admin/components/main --- a/Admin/components/main Wed May 31 11:13:22 2023 +0200 +++ b/Admin/components/main Wed May 31 11:14:15 2023 +0200 @@ -29,7 +29,7 @@ postgresql-42.5.0 prismjs-1.29.0 rsync-3.2.7 -scala-3.2.0-2 +scala-3.3.0 smbc-0.4.1 spass-3.8ds-2 sqlite-jdbc-3.41.0.0 diff -r 96e2c2bbacbd -r 163e4835a8db src/Pure/ROOT.ML --- a/src/Pure/ROOT.ML Wed May 31 11:13:22 2023 +0200 +++ b/src/Pure/ROOT.ML Wed May 31 11:14:15 2023 +0200 @@ -370,4 +370,3 @@ ML_file "Tools/jedit.ML"; ML_file "Tools/ghc.ML"; ML_file "Tools/generated_files.ML"; - diff -r 96e2c2bbacbd -r 163e4835a8db src/Pure/ROOT.scala --- a/src/Pure/ROOT.scala Wed May 31 11:13:22 2023 +0200 +++ b/src/Pure/ROOT.scala Wed May 31 11:14:15 2023 +0200 @@ -27,4 +27,3 @@ def if_proper[A](x: Iterable[A], body: => String): String = Library.if_proper(x, body) def if_proper(b: Boolean, body: => String): String = Library.if_proper(b, body) } -