Drop Java 8 support / JNI stuff / Windows named pipe support (#11)

Author: alexarchambault

build.sc

@@ -1,9 +1,6 @@
 import $ivy.`com.lihaoyi::mill-contrib-bloop:$MILL_VERSION`
 import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version_mill0.9:0.1.1`
 
-import $file.jarmanifest
-import $file.zip
-
 import de.tobiasroeser.mill.vcs.version._
 import mill._
 import mill.scalalib._
@@ -15,11 +12,7 @@ def scala213      = "2.13.7"
 def scala212      = "2.12.15"
 def scalaVersions = Seq(scala3, scala213, scala212)
 
-object library     extends Cross[Library](scalaVersions: _*)
-object tests       extends Cross[Tests](scalaVersions: _*)
-object `jni-tests` extends Cross[JniTests](scalaVersions: _*)
-
-object library16 extends Cross[Library16](scalaVersions: _*)
+object library extends Cross[Library](scalaVersions: _*)
 
 def tmpDirBase =
   if (System.getenv("CI") == null)
@@ -31,60 +24,16 @@ def tmpDirBase =
       PathRef(os.home / ".test-data")
     }
 
-def libraryDeps = Seq(
-  ivy"org.scala-sbt.ipcsocket:ipcsocket:1.4.0"
-)
-
 class Library(val crossScalaVersion: String) extends CrossScalaModule with LibDaemonPublish {
   def artifactName = "libdaemon"
-  def ivyDeps      = super.ivyDeps() ++ libraryDeps
   def compileIvyDeps = super.compileIvyDeps() ++ Seq(
     ivy"org.graalvm.nativeimage:svm:21.2.0"
   )
   def javacOptions = super.javacOptions() ++ Seq(
     "--release",
-    "8"
+    "16"
   )
-
-  def baseJar = T {
-    super.jar()
-  }
-  def mrJar = T {
-    val newJar    = T.dest / "mr.jar"
-    val baseJar0  = baseJar()
-    val java16Jar = library16().jar()
-    val extraEntries = zip.entries(java16Jar.path)
-      .filter(_._1.getName.startsWith("libdaemonjvm"))
-      .map {
-        case (e, b) =>
-          val e0 = zip.newEntry("META-INF/versions/16/" + e.getName, e)
-          (e0, b)
-      }
-    assert(extraEntries.nonEmpty)
-    val (manifestEntries, baseEntries) =
-      zip.entries(baseJar0.path).partition(_._1.getName == "META-INF/MANIFEST.MF")
-    assert(manifestEntries.length == 1)
-    val (manifestEntry, manifestContent) = manifestEntries.head
-    val updatedManifestContent = jarmanifest.addAttributes(manifestContent)(
-      "Multi-Release" -> "true"
-    )
-    val allEntries = ((manifestEntry, updatedManifestContent) +: baseEntries) ++ extraEntries
-    zip.write(newJar, allEntries)
-    PathRef(newJar)
-  }
-  def jar = mrJar()
-}
-
-class Library16(val crossScalaVersion: String) extends CrossScalaModule {
-  def moduleDeps = Seq(
-    library()
-  )
-}
-
-abstract class TestsBase extends CrossScalaModule { self =>
-  def ivyDeps = super.ivyDeps() ++ libraryDeps
-  trait Tests extends super.Tests {
-    def unmanagedClasspath = super.unmanagedClasspath() ++ self.unmanagedClasspath()
+  object test extends Tests {
     def ivyDeps = super.ivyDeps() ++ Seq(
       ivy"org.scalameta::munit:0.7.29",
       ivy"com.eed3si9n.expecty::expecty:0.15.4",
@@ -97,24 +46,6 @@ abstract class TestsBase extends CrossScalaModule { self =>
   }
 }
 
-class Tests(val crossScalaVersion: String) extends TestsBase {
-  def unmanagedClasspath = super.unmanagedClasspath() ++ Seq(
-    library().jar()
-  )
-  object test extends Tests
-}
-
-class JniTests(val crossScalaVersion: String) extends TestsBase {
-  def unmanagedClasspath = super.unmanagedClasspath() ++ Seq(
-    library().baseJar()
-  )
-  object test extends Tests {
-    def sources = T.sources {
-      tests().test.sources()
-    }
-  }
-}
-
 object manual extends Module {
   object server extends ScalaModule {
     def scalaVersion = scala3

jarmanifest.sc

@@ -64,13 +64,12 @@ object LockFiles {
     )
   }
 
-  def under(dir: Path, windowsPipeName: String): LockFiles =
-    under(dir, windowsPipeName, addPipePrefix = true)
-  def under(dir: Path, windowsPipeName: String, addPipePrefix: Boolean): LockFiles =
-    under(dir, windowsPipeName, addPipePrefix, checkPermissions = true)
+  def under(dir: Path): LockFiles =
+    under(dir, addPipePrefix = true)
+  def under(dir: Path, addPipePrefix: Boolean): LockFiles =
+    under(dir, addPipePrefix, checkPermissions = true)
   def under(
     dir: Path,
-    windowsPipeName: String,
     addPipePrefix: Boolean,
     checkPermissions: Boolean
   ): LockFiles = {
@@ -87,10 +86,7 @@ object LockFiles {
     LockFiles(
       lockFile = dir.resolve("lock"),
       pidFile = dir.resolve("pid"),
-      socketPaths = SocketPaths(
-        dir.resolve("socket"),
-        if (addPipePrefix) "\\\\.\\pipe\\" + windowsPipeName else windowsPipeName
-      )
+      socketPaths = SocketPaths(dir.resolve("socket"))
     )
   }
 }

library/src/libdaemonjvm/LockFiles.scala

@@ -3,6 +3,5 @@ package libdaemonjvm
 import java.nio.file.Path
 
 final case class SocketPaths(
-  path: Path,
-  windowsPipeName: String
+  path: Path
 )

library/src/libdaemonjvm/SocketPaths.scala

@@ -1,6 +1,8 @@
 package libdaemonjvm.internal
 
+import scala.util.Properties
+
 object DefaultSocketHandler {
   def default: SocketHandler =
-    JniSocketHandler
+    Java16SocketHandler
 }

library/src/libdaemonjvm/internal/DefaultSocketHandler.scala

@@ -38,10 +38,7 @@ object TestUtil {
       os.makeDir.all(dir)
       os.perms.set(dir, "rwx------")
     }
-    LockFiles.under(
-      dir.toNIO,
-      "libdaemonjvm-tests-" + dir.segments.toVector.drop(dir.segmentCount - 2).mkString("-")
-    )
+    LockFiles.under(dir.toNIO)
   }
 
   private val count = new AtomicInteger

library16/src/libdaemonjvm/internal/Java16SocketHandler.scala renamed to library/src/libdaemonjvm/internal/Java16SocketHandler.scala

@@ -7,7 +7,7 @@ import java.security.SecureRandom
 
 object TestClient {
   def main(args: Array[String]): Unit = {
-    val files = LockFiles.under(Paths.get("data-dir"), "libdaemonjvm\\test-server-client\\pipe")
+    val files      = LockFiles.under(Paths.get("data-dir"))
     val canConnect = SocketFile.canConnect(files.socketPaths)
     println(s"canConnect: $canConnect")
   }

library/src/libdaemonjvm/internal/JniSocketHandler.scala

@@ -48,7 +48,7 @@ object TestServer {
         ).asJava
       )
     }
-    val files = LockFiles.under(path, "libdaemonjvm\\test-server-client\\pipe")
+    val files = LockFiles.under(path)
     Lock.tryAcquire(files)(s => runServer(() => s.fold(_.accept(), _.accept()))) match {
       case Left(e)   => throw e
       case Right(()) =>