Support Scala 3 (#39)

* Support Scala 3

* Remove server which doesn't link on Scala 3

- This server is superseded by SNUnit

* Add workaround for scala-native#2550

Author: lolgab

build.sbt

@@ -1,10 +1,14 @@
-Global / onChangedBuildSource := ReloadOnSourceChanges
+val scala3 = "3.1.0"
+val scala213 = "2.13.4"
+val scala212 = "2.12.13"
+val scala211 = "2.11.12"
 
 inThisBuild(
   Seq(
     organization := "com.github.lolgab",
     version := "0.2.1-SNAPSHOT",
-    scalaVersion := scala212
+    scalaVersion := scala213,
+    crossScalaVersions := Seq(scala3, scala213, scala212, scala211),
   )
 )
 
@@ -40,13 +44,7 @@ val noPublishSettings = Seq(
   skip in publish := true
 )
 
-val scala213 = "2.13.4"
-val scala212 = "2.12.13"
-val scala211 = "2.11.12"
-
 lazy val commonSettings = Seq(
-  scalaVersion := scala213,
-  crossScalaVersions := Seq(scala213, scala212, scala211),
   scalacOptions ++= Seq(
     "-deprecation",
     "-encoding",
@@ -57,7 +55,7 @@ lazy val commonSettings = Seq(
     // "-Wunused:imports"
   ),
   Compile / doc / sources := Seq.empty,
-  libraryDependencies += "com.lihaoyi" %%% "utest" % "0.7.6" % Test,
+  libraryDependencies += "com.lihaoyi" %%% "utest" % "0.7.11" % Test,
   testFrameworks += new TestFramework("utest.runner.Framework"),
   Test / nativeLinkStubs := true,
 )

client/curl.scala

@@ -122,7 +122,7 @@ object Curl {
         data: Ptr[Byte]
     ) => {
     val serial = !(data.asInstanceOf[Ptr[Long]])
-    val len    = stackalloc[Double]
+    val len    = stackalloc[Double]()
     !len = 0
     val strData = bufferToString(ptr, size, nmemb)
     println(s"req $serial: got data of size ${size} x ${nmemb}")
@@ -141,7 +141,7 @@ object Curl {
         data: Ptr[Byte]
     )=> {
     val serial = !(data.asInstanceOf[Ptr[Long]])
-    val len    = stackalloc[Double]
+    val len    = stackalloc[Double]()
     !len = 0
     val strData = bufferToString(ptr, size, nmemb)
     println(s"req $serial: got header line of size ${size} x ${nmemb}")
@@ -187,10 +187,10 @@ object Curl {
         var actions = 0
         if (res.readable) actions |= 1
         if (res.writable) actions |= 2
-        val running_handles = stackalloc[Int]
+        val running_handles = stackalloc[Int]()
         val result =
           multi_socket_action(multi, socket, actions, running_handles)
-        println("multi_socket_action", result)
+        println(("multi_socket_action", result))
       }
     } else {
       println("stopping poll")
@@ -209,7 +209,7 @@ object Curl {
     println("starting timer")
     Timer.timeout(time.millis) { () =>
       println("in timeout callback")
-      val running_handles = stackalloc[Int]
+      val running_handles = stackalloc[Int]()
       multi_socket_action(multi, -1, 0, running_handles)
       println(s"on_timer fired, ${!running_handles} sockets running")
     }
@@ -220,8 +220,8 @@ object Curl {
   }
 
   def cleanup_requests(): Unit = {
-    val messages                  = stackalloc[Int]
-    val privateDataPtr            = stackalloc[Ptr[Long]]
+    val messages                  = stackalloc[Int]()
+    val privateDataPtr            = stackalloc[Ptr[Long]]()
     var message: Ptr[CurlMessage] = multi_info_read(multi, messages)
     while (message != null) {
       println(

core/src/main/scala/scala/scalanative/loop/Eventloop.scala

@@ -66,7 +66,9 @@ object LibUV {
   type PrepareCB    = CFuncPtr1[PrepareHandle, Unit]
   type ShutdownCB   = CFuncPtr2[ShutdownReq, Int, Unit]
   type CloseCB      = CFuncPtr1[UVHandle, Unit]
-  type PollCB       = CFuncPtr3[PollHandle, Int, Int, Unit]
+  // Workaround for https://github.com/scala-native/scala-native/issues/2550
+  // Use `Int` instead of `Integer` once fixed
+  type PollCB       = CFuncPtr3[PollHandle, Integer, Integer, Unit]
   type TimerCB      = CFuncPtr1[TimerHandle, Unit]
   type FSCB         = CFuncPtr1[FSReq, Unit]
 

core/src/main/scala/scala/scalanative/loop/Poll.scala

@@ -37,7 +37,11 @@ class RWResult(val result: Int, val readable: Boolean, val writable: Boolean)
 }
 
 object Poll {
-  private val pollReadWriteCB: PollCB = (handle: PollHandle, status: Int, events: Int) => {
+  private val pollReadWriteCB: PollCB = (
+      handle: PollHandle,
+      status: Integer,
+      events: Integer
+  ) => {
     val callback =
       HandleUtils.getData[RWResult => Unit](handle)
     callback.apply(
@@ -48,11 +52,19 @@ object Poll {
       )
     )
   }
-  private val pollReadCB: PollCB = (handle: PollHandle, status: Int, events: Int) => {
+  private val pollReadCB: PollCB = (
+      handle: PollHandle,
+      status: Integer,
+      events: Integer
+  ) => {
     val callback = HandleUtils.getData[Int => Unit](handle)
     if ((events & UV_READABLE) != 0) callback.apply(status)
   }
-  private val pollWriteCB: PollCB = (handle: PollHandle, status: Int, events: Int) => {
+  private val pollWriteCB: PollCB = (
+      handle: PollHandle,
+      status: Integer,
+      events: Integer
+  ) => {
     val callback = HandleUtils.getData[Int => Unit](handle)
     if ((events & UV_WRITABLE) != 0) callback.apply(status)
   }

core/src/test/scala/scala/scalanative/loop/PollTests.scala

@@ -31,14 +31,14 @@ object PollTests extends LoopTestSuite {
           if (i != 0) {
             throw new Exception("Poll result != 0")
           }
-          val buf       = stackalloc[Byte]
+          val buf       = stackalloc[Byte]()
           val bytesRead = read(r, buf, 1L.toULong)
           assert(bytesRead == 1)
           assert(buf(0) == byte)
           promise.success(())
           poll.stop()
         }
-        val buf = stackalloc[Byte]
+        val buf = stackalloc[Byte]()
         buf(0) = byte
         val bytesWrote = write(w, buf, 1L.toULong)
         assert(bytesWrote == 1)

project/build.properties

@@ -1 +1 @@
-sbt.version=1.4.6
+sbt.version=1.6.1

project/plugins.sbt

@@ -1,4 +1,4 @@
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.3")
 addSbtPlugin("com.eed3si9n"     % "sbt-dirty-money"  % "0.2.0")
 addSbtPlugin("com.jsuereth"     % "sbt-pgp"          % "2.0.1")
 addSbtPlugin("org.xerial.sbt"   % "sbt-sonatype"     % "3.9.4")