Add Scala 2.13.x support

.travis.yml

@@ -3,6 +3,7 @@ sudo: required
 scala:
   - "2.11.12"
   - "2.12.12"
+  - "2.13.3"
 
 os: linux
 dist: trusty

auxlib/src/main/scala/scala/runtime/Statics.scala

@@ -73,4 +73,20 @@ object Statics {
     case x: java.lang.Float  => floatHash(x.floatValue)
     case _                   => x.hashCode
   }
+
+  /** Used as a marker object to return from PartialFunctions */
+  def pfMarker: AnyRef = PFMarker
+
+  private object PFMarker extends AnyRef
+
+  def releaseFence(): Unit = ()
+
+  /** Just throws an exception.
+   *
+   *  Used by the synthetic `productElement` and `productElementName` methods
+   *  in case classes. Delegating the exception-throwing to this function
+   *  reduces the bytecode size of the case class.
+   */
+  final def ioobe[T](n: Int): T =
+    throw new IndexOutOfBoundsException(String.valueOf(n))
 }

build.sbt

@@ -59,16 +59,9 @@ inThisBuild(
 addCommandAlias(
   "test-all",
   Seq(
-    "sandbox/run",
-    "testRunner/test",
-    "testInterface/test",
-    "tools/test",
-    "tests/test",
-    "nirparser/test",
-    "sbtScalaNative/scripted",
-    "tools/mimaReportBinaryIssues",
-    "junitTestOutputsJVM/test",
-    "junitTestOutputsNative/test"
+    "test-tools",
+    "test-runtime",
+    "test-scripted"
   ).mkString(";")
 )
 
@@ -103,6 +96,18 @@ addCommandAlias(
 lazy val publishSnapshot =
   taskKey[Unit]("Publish snapshot to sonatype on every commit to master.")
 
+val collectionsCompatLib = {
+  "org.scala-lang.modules" %% "scala-collection-compat" % "2.2.0"
+}
+
+def parallelCollectionsLib(scalaVersion: String): Seq[ModuleID] = {
+  CrossVersion.partialVersion(scalaVersion) match {
+    case Some((2, n)) if n >= 13 =>
+      Seq("org.scala-lang.modules" %% "scala-parallel-collections" % "0.2.0")
+    case _ => Nil
+  }
+}
+
 // to publish plugin (we only need to do this once, it's already done!)
 // follow: https://www.scala-sbt.org/1.x/docs/Bintray-For-Plugins.html
 // then add a new package
@@ -220,6 +225,9 @@ lazy val util =
     .in(file("util"))
     .settings(toolSettings)
     .settings(mavenPublishSettings)
+    .settings(
+      libraryDependencies += collectionsCompatLib
+    )
 
 lazy val nir =
   project
@@ -256,8 +264,9 @@ lazy val tools =
     .settings(
       libraryDependencies ++= Seq(
         scalacheckDep,
-        scalatestDep
-      ),
+        scalatestDep,
+        collectionsCompatLib
+      ) ++ parallelCollectionsLib(scalaVersion.value),
       Test / fork := true,
       Test / javaOptions ++= {
         val nscpluginjar = (nscplugin / Compile / Keys.`package`).value
@@ -422,15 +431,13 @@ lazy val scalalib =
     .in(file("scalalib"))
     .enablePlugins(MyScalaNativePlugin)
     .settings(
-      // This build uses Scala 2.11 version 2.11.12 to compile
-      // what appears to be 2.11.0 sources. This yields 114
-      // deprecations. Editing those sources is not an option (long story),
-      // so do not spend compile time looking for the deprecations.
-      // Keep the log file clean so that real issues stand out.
       scalacOptions -= "-deprecation",
       scalacOptions += "-deprecation:false",
       // The option below is needed since Scala 2.12.12.
-      scalacOptions += "-language:postfixOps"
+      scalacOptions += "-language:postfixOps",
+      // The option below is needed since Scala 2.13.0.
+      scalacOptions += "-language:implicitConversions",
+      scalacOptions += "-language:higherKinds"
     )
     .settings(mavenPublishSettings)
     .settings(
@@ -582,10 +589,6 @@ lazy val tests =
     )
     .settings(noPublishSettings)
     .settings(
-      // nativeOptimizerReporter := OptimizerReporter.toDirectory(
-      //   crossTarget.value),
-      // nativeLinkerReporter := LinkerReporter.toFile(
-      //   target.value / "out.dot"),
       testFrameworks ++= Seq(
         new TestFramework("tests.NativeFramework"),
         new TestFramework("com.novocode.junit.JUnitFramework")
@@ -615,10 +618,6 @@ lazy val sandbox =
     .enablePlugins(MyScalaNativePlugin)
     .settings(scalacOptions -= "-Xfatal-warnings")
     .settings(noPublishSettings)
-    .settings(
-      // nativeOptimizerReporter := OptimizerReporter.toDirectory(
-      //   crossTarget.value),
-    )
     .dependsOn(nscplugin % "plugin", allCoreLibs, testInterface % Test)
 
 lazy val testingCompilerInterface =

javalib/src/main/scala-2.11/scala/scalanative/compat/ScalaStream.scala

@@ -0,0 +1,21 @@
+package scala.scalanative.compat
+
+import java.util.stream.WrappedScalaStream
+import scala.collection.immutable
+import scala.language.implicitConversions
+
+private[scalanative] object ScalaStream {
+  type Underlying[T] = immutable.Stream[T]
+  val Underlying = immutable.Stream
+
+  implicit class ScalaStreamImpl[T](val underyling: Underlying[T])
+      extends AnyVal {
+    def wrappedStream(closeHanlder: Option[Runnable] = None) =
+      new WrappedScalaStream[T](underyling, closeHanlder)
+  }
+
+  implicit def seqToScalaStream[T](seq: Iterable[T]): Underlying[T] = {
+    seq.to[Underlying]
+  }
+
+}

javalib/src/main/scala-2.12/scala/scalanative/compat/ScalaStream.scala

@@ -0,0 +1,20 @@
+package scala.scalanative.compat
+
+import java.util.stream.WrappedScalaStream
+import scala.collection.immutable
+import scala.language.implicitConversions
+
+private[scalanative] object ScalaStream {
+  type Underlying[T] = immutable.Stream[T]
+  val Underlying = immutable.Stream
+
+  implicit class ScalaStreamImpl[T](val underyling: Underlying[T])
+      extends AnyVal {
+    def wrappedStream(closeHanlder: Option[Runnable] = None) =
+      new WrappedScalaStream[T](underyling, closeHanlder)
+  }
+
+  implicit def seqToScalaStream[T](seq: Iterable[T]): Underlying[T] = {
+    seq.to[Underlying]
+  }
+}

javalib/src/main/scala-2.13/scala/scalanative/compat/ScalaStream.scala

@@ -0,0 +1,21 @@
+package scala.scalanative.compat
+
+import java.util.stream.WrappedScalaStream
+import scala.collection.immutable
+import scala.language.implicitConversions
+
+private[scalanative] object ScalaStream {
+  type Underlying[T] = immutable.LazyList[T]
+  val Underlying = immutable.LazyList
+
+  implicit class ScalaStreamImpl[T](val underyling: Underlying[T])
+      extends AnyVal {
+    def wrappedStream(closeHanlder: Option[Runnable] = None) =
+      new WrappedScalaStream[T](underyling, closeHanlder)
+  }
+
+  implicit def seqToScalaStream[T](seq: Iterable[T]): Underlying[T] = {
+    seq.to(Underlying)
+  }
+
+}

javalib/src/main/scala/java/io/BufferedOutputStream.scala

@@ -73,7 +73,7 @@ class BufferedOutputStream(out: OutputStream, size: Int)
     count += 1
   }
 
-  private def flushInternal() {
+  private def flushInternal() = {
     if (count > 0) {
       out.write(buf, 0, count)
       count = 0

javalib/src/main/scala/java/io/BufferedReader.scala

@@ -1,6 +1,6 @@
 package java.io
 
-import scala.collection.immutable.{Stream => SStream}
+import scala.scalanative.compat.StreamsCompat._
 import java.util.stream.{Stream, WrappedScalaStream}
 
 class BufferedReader(in: Reader, sz: Int) extends Reader {
@@ -162,9 +162,6 @@ class BufferedReader(in: Reader, sz: Int) extends Reader {
     }
   }
 
-  private def toScalaStream(): SStream[String] =
-    toScalaStream(false)
-
   private[this] def toScalaStream(closeAtEnd: Boolean): SStream[String] = {
     Option(readLine()) match {
       case None =>

javalib/src/main/scala/java/io/BufferedWriter.scala

@@ -1,7 +1,5 @@
 package java.io
 
-import scala.compat.Platform.EOL
-
 class BufferedWriter(out: Writer, sz: Int) extends Writer {
 
   if (sz <= 0) throw new IllegalArgumentException("Buffer size <= 0")
@@ -26,7 +24,7 @@ class BufferedWriter(out: Writer, sz: Int) extends Writer {
   }
 
   def newLine(): Unit =
-    write(EOL, 0, EOL.length)
+    write(System.lineSeparator(), 0, System.lineSeparator().length)
 
   override def write(c: Int): Unit =
     write(Array(c.toChar), 0, 1)

javalib/src/main/scala/java/io/File.scala

@@ -31,7 +31,7 @@ class File(_path: String) extends Serializable with Comparable[File] {
     this(Option(parent).map(_.path).orNull, child)
 
   def this(uri: URI) = {
-    this(uri.getPath)
+    this(uri.getPath())
     checkURI(uri)
   }
 
@@ -122,7 +122,7 @@ class File(_path: String) extends Serializable with Comparable[File] {
 
   def getCanonicalPath(): String =
     Zone { implicit z =>
-      if (exists) {
+      if (exists()) {
         fromCString(simplifyExistingPath(toCString(properPath)))
       } else {
         simplifyNonExistingPath(fromCString(resolve(toCString(properPath))))
@@ -153,7 +153,7 @@ class File(_path: String) extends Serializable with Comparable[File] {
         case (acc, seg)  => seg :: acc
       }
       .reverse
-      .filterNot(_.isEmpty)
+      .filterNot(_.isEmpty())
       .mkString(separator, separator, "")
 
   @throws(classOf[IOException])
@@ -166,11 +166,12 @@ class File(_path: String) extends Serializable with Comparable[File] {
   }
 
   def getParent(): String =
-    path.split(separatorChar).filterNot(_.isEmpty) match {
-      case Array() if !isAbsolute  => null
-      case Array(_) if !isAbsolute => null
-      case parts if !isAbsolute    => parts.init.mkString(separator)
-      case parts if isAbsolute     => parts.init.mkString(separator, separator, "")
+    path.split(separatorChar).filterNot(_.isEmpty()) match {
+      case Array() if !isAbsolute()  => null
+      case Array(_) if !isAbsolute() => null
+      case parts if !isAbsolute()    => parts.init.mkString(separator)
+      case parts if isAbsolute() =>
+        parts.init.mkString(separator, separator, "")
     }
 
   def getParentFile(): File = {
@@ -310,7 +311,7 @@ class File(_path: String) extends Serializable with Comparable[File] {
 
   override def toString(): String = path
 
-  def deleteOnExit(): Unit = DeleteOnExit.addFile(this.getAbsolutePath)
+  def deleteOnExit(): Unit = DeleteOnExit.addFile(this.getAbsolutePath())
 
   @stub
   def toURL(): java.net.URL = ???
@@ -419,7 +420,7 @@ object File {
             throw new IOException(
               "getcwd() error in trying to get user directory."))
 
-      if (path.isEmpty) userdir
+      if (path.isEmpty()) userdir
       else if (userdir.endsWith(separator)) userdir + path
       else userdir + separator + path
     }
@@ -521,16 +522,16 @@ object File {
     }
   }
 
-  val pathSeparatorChar: Char        = if (Platform.isWindows) ';' else ':'
+  val pathSeparatorChar: Char        = if (Platform.isWindows()) ';' else ':'
   val pathSeparator: String          = pathSeparatorChar.toString
-  val separatorChar: Char            = if (Platform.isWindows) '\\' else '/'
+  val separatorChar: Char            = if (Platform.isWindows()) '\\' else '/'
   val separator: String              = separatorChar.toString
   private var counter: Int           = 0
   private var counterBase: Int       = 0
-  private val caseSensitive: Boolean = !Platform.isWindows
+  private val caseSensitive: Boolean = !Platform.isWindows()
 
   def listRoots(): Array[File] =
-    if (Platform.isWindows) ???
+    if (Platform.isWindows()) ???
     else {
       var array = new Array[File](1)
       array(0) = new File("/")
@@ -556,19 +557,19 @@ object File {
     def compMsg(comp: String): String =
       s"Found $comp component in URI"
 
-    if (!uri.isAbsolute) {
+    if (!uri.isAbsolute()) {
       throwExc("URI is not absolute")
-    } else if (!uri.getRawSchemeSpecificPart.startsWith("/")) {
+    } else if (!uri.getRawSchemeSpecificPart().startsWith("/")) {
       throwExc("URI is not hierarchical")
-    } else if (uri.getScheme == null || !(uri.getScheme == "file")) {
+    } else if (uri.getScheme() == null || !(uri.getScheme() == "file")) {
       throwExc("Expected file scheme in URI")
-    } else if (uri.getRawPath == null || uri.getRawPath.length == 0) {
+    } else if (uri.getRawPath() == null || uri.getRawPath().length() == 0) {
       throwExc("Expected non-empty path in URI")
-    } else if (uri.getRawAuthority != null) {
+    } else if (uri.getRawAuthority() != null) {
       throwExc(compMsg("authority"))
-    } else if (uri.getRawQuery != null) {
+    } else if (uri.getRawQuery() != null) {
       throwExc(compMsg("query"))
-    } else if (uri.getRawFragment != null) {
+    } else if (uri.getRawFragment() != null) {
       throwExc(compMsg("fragment"))
     }
     // else URI is ok

javalib/src/main/scala/java/io/FileDescriptor.scala

@@ -34,9 +34,9 @@ object FileDescriptor {
 
   private[io] def openReadOnly(file: File): FileDescriptor =
     Zone { implicit z =>
-      val fd = fcntl.open(toCString(file.getPath), fcntl.O_RDONLY, 0.toUInt)
+      val fd = fcntl.open(toCString(file.getPath()), fcntl.O_RDONLY, 0.toUInt)
       if (fd == -1) {
-        throw new FileNotFoundException("No such file " + file.getPath)
+        throw new FileNotFoundException("No such file " + file.getPath())
       }
       new FileDescriptor(fd, true)
     }

javalib/src/main/scala/java/io/FileOutputStream.scala

@@ -67,7 +67,7 @@ object FileOutputStream {
       import stat._
       val flags = O_CREAT | O_WRONLY | (if (append) O_APPEND else O_TRUNC)
       val mode  = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH
-      val fd    = open(toCString(file.getPath), flags, mode)
+      val fd    = open(toCString(file.getPath()), flags, mode)
       if (fd == -1)
         throw new FileNotFoundException(
           s"$file (${fromCString(string.strerror(errno.errno))})")