Skip to content

fix: eliminate Thread.stop() deprecation warning and enforce -Werror on server/client #1003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
He-Pin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: eliminate Thread.stop() deprecation warning and enforce -Werror on server/client #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.mill
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,15 +390,15 @@ object sjsonnet extends VersionFileModule {

object client extends JavaModule with SjsonnetPublishModule {
def artifactName = "sjsonnet-server"
def javacOptions = super.javacOptions() ++ Seq("--release", "17")
def javacOptions = super.javacOptions() ++ Seq("--release", "17", "-Xlint:deprecation", "-Werror")
object test extends JavaTests with TestModule.Junit4
}

object server extends ScalaModule with SjsonnetPublishModule {
def artifactName = "sjsonnet-server"
def scalaVersion = SjsonnnetJvmModule.this.crossValue
def moduleDeps = Seq(SjsonnnetJvmModule.this, client)
def scalacOptions = super.scalacOptions() ++ Seq("-release", "17")
def scalacOptions = super.scalacOptions() ++ Seq("-release", "17", "-deprecation", "-Werror")
def javacOptions = super.javacOptions() ++ Seq("--release", "17")

override def prependShellScript = mill.util.Jvm.universalScript(
Expand Down
3 changes: 0 additions & 3 deletions sjsonnet/server/src/sjsonnet/SjsonnetServerMain.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,6 @@ class Server[T](
if (!idle) interruptServer()

t.interrupt()
// Thread.stop() is removed in Java 25+; try it for older JVMs but ignore failures
try t.stop()
catch { case NonFatal(_) => }

if (ClientUtil.isWindows) {
// Closing the socket on Windows can sometimes take a few seconds.
Expand Down
Loading