Merge pull request #141 from lrytz/newCollections

Compile with 2.13.0-M4

Author: 2m

.travis.yml

@@ -31,7 +31,7 @@ env:
   - SCALA_VERSION=2.12.4
   - SCALA_VERSION=2.12.5
   - SCALA_VERSION=2.12.6
-  - SCALA_VERSION=2.13.0-M3
+  - SCALA_VERSION=2.13.0-M4
 
 # there's no better way it seems.. https://github.com/travis-ci/travis-ci/issues/1519
 matrix:
@@ -52,7 +52,7 @@ matrix:
     - jdk: openjdk6
       env: SCALA_VERSION=2.12.6
     - jdk: openjdk6
-      env: SCALA_VERSION=2.13.0-M3
+      env: SCALA_VERSION=2.13.0-M4
 
 # Increasing ReservedCodeCacheSize minimizes scala compiler-interface compile times
 script:

build.sbt

@@ -1,3 +1,5 @@
+val scalaMajorVersion = SettingKey[Int]("scalaMajorVersion")
+
 // so we can set this from automated builds and also depending on Scala version
 lazy val scalaTestVersion = settingKey[String]("The version of ScalaTest to use.")
 
@@ -26,7 +28,7 @@ lazy val `genjavadoc-plugin` = (project in file("plugin"))
       IO.write(result, (fullClasspath in Test).value.map(_.data.getAbsolutePath).mkString("\n"))
       result
     },
-    (test in Test) := {
+    test in Test := {
       // since we are building for different Scala patch versions, a clean
       // is required to avoid conflicts in class files
       clean.value
@@ -38,12 +40,15 @@ lazy val `genjavadoc-plugin` = (project in file("plugin"))
       val default = (unmanagedSourceDirectories in Compile).value
       def r(from: String, to: String) = default.map(f => new java.io.File(f.getPath.replaceAll(from, to)))
       if (scalaVersion.value == "2.12.0") r("""/scala-2\.12$""", "/scala-2.11")
-      else if (scalaVersion.value.startsWith("2.13.")) r("""/scala-2\.13[^/]*$""", "/scala-2.12")
+      else if (scalaMajorVersion.value == 13) r("""/scala-2\.13[^/]*$""", "/scala-2.12")
       else default
     },
     crossVersion := CrossVersion.full,
     exportJars := true,
-    scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-Xlint", "-Xfatal-warnings")
+    scalacOptions ++=
+      Seq("-deprecation", "-feature", "-unchecked", "-Xlint") ++ (
+        if (scalaMajorVersion.value == 13) Seq() // deprecation warnings due to SortedSet.from/to
+        else Seq("-Xfatal-warnings"))
   )
 
 lazy val defaults = Seq(
@@ -53,7 +58,7 @@ lazy val defaults = Seq(
     val earliest211 = 6
     val latest211 = 12
     val latest212 = 6
-    val pre213 = List("M3")
+    val pre213 = List("M4")
     val skipVersions = Set("2.11.9", "2.11.10")
     val scala211Versions =
       (earliest211 to latest211)
@@ -65,11 +70,12 @@ lazy val defaults = Seq(
       scala211Versions ++ (0 to latest212).map(i => s"2.12.$i") ++ pre213.map(s => s"2.13.0-$s")
     }
   },
+  scalaMajorVersion := CrossVersion.partialVersion(scalaVersion.value).get._2.toInt,
   scalaTestVersion := {
-    CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, 13)) => "3.0.5-M1"  // only version available for 2.13.0-M3
-      case Some((2, 12)) => "3.0.4"
-      case _ => "2.1.3"
+    scalaMajorVersion.value match {
+      case 13 => "3.0.6-SNAP1" // the version available for 2.13.0-M4
+      case 12 => "3.0.4"
+      case _  => "2.1.3"
     }
   },
   resolvers += Resolver.mavenLocal,

plugin/src/main/scala/com/typesafe/genjavadoc/BaseComments.scala

@@ -36,8 +36,8 @@ trait BaseComments { this: TransformCake ⇒
               s"$prefix$link"
           case x ⇒ x
         }
-        .map(line ⇒ (line /: replacements) { case (l, (from, to)) ⇒ l.replace(from, to) })
-      val (_, _, _, l2) = ((false, false, true, List.empty[String]) /: ll) {
+        .map(line ⇒ replacements.foldLeft(line) { case (l, (from, to)) ⇒ l.replace(from, to) })
+      val (_, _, _, l2) = ll.foldLeft((false, false, true, List.empty[String])) {
         // insert <p> line upon transition to empty, collapse contiguous empty lines
         case ((pre, code, empty, lines), line @ EmptyLine()) ⇒
           val nl =

plugin/src/main/scala/com/typesafe/genjavadoc/BasicTransform.scala

@@ -147,11 +147,11 @@ trait BasicTransform { this: TransformCake ⇒
     ret
   }
 
-  private def addMethod(d: DefDef, comment: Seq[String]) {
+  private def addMethod(d: DefDef, comment: Seq[String]): Unit = {
     clazz = clazz map (c ⇒ c.addMember(MethodInfo(d, c.interface, comment, hasVararg = false, deprecation = deprecationInfo(d))))
   }
 
-  private def addVarargsMethod(d: DefDef, comment: Seq[String]) {
+  private def addVarargsMethod(d: DefDef, comment: Seq[String]): Unit = {
     clazz = clazz map (c ⇒ c.addMember(MethodInfo(d, c.interface, comment, hasVararg = true, deprecation = deprecationInfo(d))))
   }
 

plugin/src/main/scala/com/typesafe/genjavadoc/JavaSig.scala

@@ -178,7 +178,7 @@ trait JavaSig { this: TransformCake ⇒
   }
 
   private object NeedsSigCollector extends TypeCollector(false) {
-    def traverse(tp: Type) {
+    def traverse(tp: Type): Unit = {
       if (!result) {
         tp match {
           case st: SubType ⇒

plugin/src/main/scala/com/typesafe/genjavadoc/Output.scala

@@ -9,7 +9,7 @@ trait Output { this: TransformCake ⇒
 
   def outputBase: File
 
-  def write(out: Out, c: ClassInfo) {
+  def write(out: Out, c: ClassInfo): Unit = {
     // TODO @param should be transformed to constructor comments
     c.comment foreach {line =>
       val replaced = line.replace("@param", "param: ") match {
@@ -30,7 +30,7 @@ trait Output { this: TransformCake ⇒
     out("}")
   }
 
-  def write(out: Out, m: MethodInfo) {
+  def write(out: Out, m: MethodInfo): Unit = {
     m.comment foreach (out(_))
     out(m.sig)
   }
@@ -39,9 +39,9 @@ trait Output { this: TransformCake ⇒
     var ind = 0
 
     def println(s: String): Unit
-    def apply(s: String) { println(" " * ind + s) }
-    def indent() { ind += 2 }
-    def outdent() { ind -= 2 }
+    def apply(s: String): Unit = { println(" " * ind + s) }
+    def indent(): Unit = { ind += 2 }
+    def outdent(): Unit = { ind -= 2 }
     def close(): Unit
   }
 
@@ -50,8 +50,8 @@ trait Output { this: TransformCake ⇒
     f.getParentFile.mkdirs
     val w = new PrintStream(f, "UTF-8")
     new Out {
-      def println(s: String) { w.println(s) }
-      def close() { w.close() }
+      def println(s: String): Unit = { w.println(s) }
+      def close(): Unit = { w.close() }
     }
   }
 
@@ -107,7 +107,7 @@ trait Output { this: TransformCake ⇒
 
   // goes from object to companion class (not the other way around)
   private def fabricateCompanion(obj: ClassInfo): ClassInfo = {
-    val com = (obj.comment /: obj.members)((c, mem) ⇒ mem match {
+    val com = obj.members.foldLeft(obj.comment)((c, mem) ⇒ mem match {
       case x: MethodInfo if x.name == obj.name ⇒ c ++ x.comment
       case _                                   ⇒ c
     })
@@ -134,7 +134,7 @@ trait Output { this: TransformCake ⇒
       else flatten(obj.classMembers) ++ obj.methodMembers
       )
 
-    val (com: Seq[String], moduleMembers: Vector[Templ]) = ((obj.comment, Vector.empty[Templ]) /: members)((p, mem) ⇒ mem match {
+    val (com: Seq[String], moduleMembers: Vector[Templ]) = members.foldLeft((obj.comment, Vector.empty[Templ]))((p, mem) ⇒ mem match {
       case x: MethodInfo if x.name == obj.name ⇒ (p._1 ++ x.comment, p._2 :+ x.copy(name = x.name + '$', comment = Seq()))
       case x                                   ⇒ (p._1, p._2 :+ x)
     })

plugin/src/test/resources/patches/2.13.0.patch

@@ -15,6 +15,15 @@
    }
    /**
     * class A.B
+@@ -76,7 +76,7 @@
+      * def b(args: java.lang.String*): Unit
+      * @param args (undocumented)
+      */
+-    public  void b (scala.collection.Seq<java.lang.String> args)  { throw new RuntimeException(); }
++    public  void b (scala.collection.immutable.Seq<java.lang.String> args)  { throw new RuntimeException(); }
+     public  java.lang.String d (java.lang.String a, akka.rk.buh.is.it.X b)  { throw new RuntimeException(); }
+   }
+   public  class C implements akka.rk.buh.is.it.X {
 @@ -94,12 +94,12 @@
      public  class C1$ {
        public   C1$ ()  { throw new RuntimeException(); }
@@ -41,7 +50,15 @@
     * varargs
     * @param s (undocumented)
     * @return (undocumented)
-@@ -219,9 +224,4 @@
+@@ -212,16 +217,11 @@
+    * @param s (undocumented)
+    * @return (undocumented)
+    */
+-  public  int hello (scala.collection.Seq<java.lang.String> s)  { throw new RuntimeException(); }
++  public  int hello (scala.collection.immutable.Seq<java.lang.String> s)  { throw new RuntimeException(); }
+   /**
+    * throws
+    * @return (undocumented)
     */
    public  int testthrows () throws java.lang.IllegalArgumentException, java.lang.NullPointerException { throw new RuntimeException(); }
    public  scala.runtime.Null$ getNull ()  { throw new RuntimeException(); }

plugin/src/test/scala/com/typesafe/genjavadoc/SignatureSpec.scala

@@ -84,7 +84,7 @@ class SignatureSpec extends WordSpec with Matchers {
       val exception = "(akka.rk.buh.is.it.A\\$[C1D]+\\$)\\$"
       val replacemnt = "$1"
 
-      def check(jn: String) {
+      def check(jn: String): Unit = {
         val jc: Class[_] = javaCL.loadClass(jn)
         val sc: Class[_] = scalaCL.loadClass(jn.replaceAll(exception, replacemnt))