From 6faca06206ce7ab1cc4bc7861623fbe4777a5666 Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Tue, 7 Jun 2022 22:40:56 +0200 Subject: [PATCH] Update junixsocket-core to 2.5.0 and removed workarounds (#1894) Pull request: https://github.com/com-lihaoyi/mill/pull/1894 --- build.sc | 2 +- main/test/src/main/ClientServerTests.scala | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/build.sc b/build.sc index f281b5729e8..6cbf243dea9 100755 --- a/build.sc +++ b/build.sc @@ -98,7 +98,7 @@ object Deps { val flywayCore = ivy"org.flywaydb:flyway-core:8.0.2" val graphvizJava = ivy"guru.nidi:graphviz-java-all-j2v8:0.18.1" - val junixsocket = ivy"com.kohlschutter.junixsocket:junixsocket-core:2.4.0" + val junixsocket = ivy"com.kohlschutter.junixsocket:junixsocket-core:2.5.0" object jetty { val version = "8.2.0.v20160908" diff --git a/main/test/src/main/ClientServerTests.scala b/main/test/src/main/ClientServerTests.scala index eaf16a311ca..19a837d19c9 100644 --- a/main/test/src/main/ClientServerTests.scala +++ b/main/test/src/main/ClientServerTests.scala @@ -42,12 +42,6 @@ class EchoServer extends MillServerMain[Int] { object ClientServerTests extends TestSuite { - if (scala.util.Properties.isWin) { - // workaround for CI issue - // https://github.com/com-lihaoyi/mill/pull/1852#issuecomment-1114332274 - System.setProperty("os.name", "Windows10") - } - val ENDL = System.lineSeparator() def initStreams() = {