Support Java 20 (Backport of #2501) (#2546)

Ignore the `UnsupportedOperationException` of `Thread.stop`. This is a quick fix to de-block users from using Java 20. * Original Pull request: #2501 Pull request:. #2546
com-lihaoyi · Jun 1, 2023 · e3328bc · e3328bc
1 parent e55488d
commit e3328bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -109,7 +109,6 @@ jobs:
           - cmd /C %GITHUB_WORKSPACE%\ci\mill.bat -i -d -k "integration.thirdparty.{local,forked}"
           - cmd /C %GITHUB_WORKSPACE%\ci\mill.bat -i -d -k "contrib.__.test"
 
-
     runs-on: windows-latest
 
     steps:

diff --git a/main/src/mill/main/MillServerMain.scala b/main/src/mill/main/MillServerMain.scala
@@ -208,6 +208,8 @@ class Server[T](
     Thread.sleep(5)
     try t.stop()
     catch {
+      case e: UnsupportedOperationException =>
+      // nothing we can do about, removed in Java 20
       case e: java.lang.Error if e.getMessage.contains("Cleaner terminated abnormally") =>
       // ignore this error and do nothing; seems benign
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -109,7 +109,6 @@ jobs: @@
               - cmd /C %GITHUB_WORKSPACE%\ci\mill.bat -i -d -k "integration.thirdparty.{local,forked}"
               - cmd /C %GITHUB_WORKSPACE%\ci\mill.bat -i -d -k "contrib.__.test"
         runs-on: windows-latest
         steps:
@@ Expand Down @@