Merge pull request #108 from SethTisue/scala-2.13.0-M2

support Scala 2.13.0-M2

Author: 2m

.travis.yml

@@ -14,11 +14,6 @@ jdk:
   - oraclejdk8
 
 env:
-  - SCALA_VERSION=2.10.2
-  - SCALA_VERSION=2.10.3
-  - SCALA_VERSION=2.10.4
-  - SCALA_VERSION=2.10.5
-  - SCALA_VERSION=2.10.6
   - SCALA_VERSION=2.11.0
   - SCALA_VERSION=2.11.1
   - SCALA_VERSION=2.11.2
@@ -33,7 +28,7 @@ env:
   - SCALA_VERSION=2.12.1
   - SCALA_VERSION=2.12.2
   - SCALA_VERSION=2.12.3
-  - SCALA_VERSION=2.13.0-M1
+  - SCALA_VERSION=2.13.0-M2
 
 # there's no better way it seems.. https://github.com/travis-ci/travis-ci/issues/1519
 matrix:
@@ -46,7 +41,9 @@ matrix:
     - jdk: openjdk6
       env: SCALA_VERSION=2.12.2
     - jdk: openjdk6
-      env: SCALA_VERSION=2.13.0-M1
+      env: SCALA_VERSION=2.12.3
+    - jdk: openjdk6
+      env: SCALA_VERSION=2.13.0-M2
 
 # Increasing ReservedCodeCacheSize minimizes scala compiler-interface compile times
 script:

LICENSE

@@ -1,6 +1,6 @@
 This software is licensed under the Apache 2 license, quoted below.
 
-Copyright 2009-2013 Typesafe Inc. [http://www.typesafe.com]
+Copyright 2009-2017 Lightbend Inc. [http://www.lightbend.com]
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not
 use this file except in compliance with the License. You may obtain a copy of

build.sbt

@@ -1,7 +1,3 @@
-/**
- *  Copyright (C) 2009-2017 Typesafe Inc. <http://www.typesafe.com>
- */
-
 // 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.")
 
@@ -46,29 +42,31 @@ lazy val `genjavadoc-plugin` = (project in file("plugin"))
       else default
     },
     crossVersion := CrossVersion.full,
-    exportJars := true
+    exportJars := true,
+    scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-Xlint", "-Xfatal-warnings")
   )
 
 lazy val defaults = Seq(
   organization := "com.typesafe.genjavadoc",
   scalaVersion := crossScalaVersions.value.last,
   crossScalaVersions := {
-    val latest210 = 6
     val latest211 = 11
     val latest212 = 3
-    val pre213 = List("M1")
+    val pre213 = List("M2")
     val skipVersions = Set("2.11.9", "2.11.10")
-    val scala210and211Versions = (2 to latest210).map(i => s"2.10.$i") ++ (0 to latest211).map(i => s"2.11.$i")
-      .filterNot(skipVersions.contains(_))
+    val scala211Versions =
+      (0 to latest211)
+        .map(i => s"2.11.$i")
+        .filterNot(skipVersions.contains(_))
     ifJavaVersion(_ < 8) {
-      scala210and211Versions
+      scala211Versions
     } {
-      scala210and211Versions ++ (0 to latest212).map(i => s"2.12.$i") ++ pre213.map(s => s"2.13.0-$s")
+      scala211Versions ++ (0 to latest212).map(i => s"2.12.$i") ++ pre213.map(s => s"2.13.0-$s")
     }
   },
   scalaTestVersion := {
     val Some((2, scalaMajor)) = CrossVersion.partialVersion(scalaVersion.value)
-    if (scalaMajor >= 12) "3.0.3"
+    if (scalaMajor >= 12) "3.0.4"
     else "2.1.3"
   },
   resolvers += Resolver.mavenLocal,

plugin/src/main/scala-2.10/com/typesafe/genjavadoc/Comments.scala

@@ -1,6 +1,5 @@
 package com.typesafe.genjavadoc
 
-import scala.reflect.internal.Flags
 import scala.annotation.tailrec
 
 trait AST { this: TransformCake ⇒
@@ -77,7 +76,7 @@ trait AST { this: TransformCake ⇒
 
   def fabricateParams: Boolean
 
-  final case class DeprecationInfo(msg: String, since: String) {
+  case class DeprecationInfo(msg: String, since: String) {
     def maybeDot = if (msg.endsWith(".")) " " else ". "
     def maybeSinceDot = if (since.endsWith(".")) " " else ". "
     def render = s" * @deprecated ${msg}${maybeDot}Since $since${maybeSinceDot}"

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

@@ -73,8 +73,8 @@ trait BaseComments { this: TransformCake ⇒
 
   implicit val positionOrdering: Ordering[Position] = new Ordering[Position] {
     def compare(a: Position, b: Position) =
-      if (a.endOrPoint < b.startOrPoint) -1
-      else if (a.startOrPoint > b.endOrPoint) 1
+      if (a.end < b.start) -1
+      else if (a.start > b.end) 1
       else 0
   }
   var comments = TreeMap[Position, Comment]()
@@ -86,7 +86,7 @@ trait BaseComments { this: TransformCake ⇒
 
   val positions = comments.keySet
 
-  def between(p1: Position, p2: Position) = unit.source.content.slice(p1.startOrPoint, p2.startOrPoint).filterNot(_ == '\n').mkString
+  def between(p1: Position, p2: Position) = unit.source.content.slice(p1.start, p2.start).filterNot(_ == '\n').mkString
 
   object ScalaDoc extends (Comment ⇒ Boolean) {
     def apply(c: Comment): Boolean = c.text.head.startsWith("/**")

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

@@ -1,7 +1,6 @@
 package com.typesafe.genjavadoc
 
 import scala.reflect.internal.Flags
-import java.util.regex.Pattern
 
 trait BasicTransform { this: TransformCake ⇒
   import global._
@@ -52,7 +51,7 @@ trait BasicTransform { this: TransformCake ⇒
         val old = pos
         pos = max(tp, prevTemplateMaxPos)
         if (old.precedes(pos)) {
-          (positions.from(old) intersect positions.to(pos)).toSeq map comments filter ScalaDoc lastOption match {
+          (positions.from(old) intersect positions.to(pos)).toSeq.map(comments).filter(ScalaDoc).lastOption match {
             case Some(c) ⇒ c.text // :+ s"// found in '${between(old, pos)}'"
             case None ⇒
               // s"// empty '${between(old, pos)}' (${pos.lineContent}:${pos.column})" ::

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

@@ -12,10 +12,10 @@ trait JavaSig { this: TransformCake ⇒
     def removeThis(in: Type): Type = {
       //          println("transforming " + in)
       in match {
-        case ThisType(parent) if !parent.isPackage ⇒ removeThis(parent.tpe)
-        case SingleType(parent, name)              ⇒ typeRef(removeThis(parent), name, Nil)
-        case TypeRef(pre, sym, args)               ⇒ typeRef(removeThis(pre), sym, args)
-        case x                                     ⇒ x
+        case ThisType(parent) if !parent.hasPackageFlag ⇒ removeThis(parent.tpe)
+        case SingleType(parent, name)                   ⇒ typeRef(removeThis(parent), name, Nil)
+        case TypeRef(pre, sym, args)                    ⇒ typeRef(removeThis(pre), sym, args)
+        case x                                          ⇒ x
       }
     }
 

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

@@ -2,13 +2,11 @@ package com.typesafe.genjavadoc
 
 import scala.tools.nsc
 import nsc.Global
-import nsc.Phase
 import nsc.plugins.Plugin
 import nsc.plugins.PluginComponent
-import nsc.transform.{ Transform, TypingTransformers }
+import nsc.transform.Transform
 import java.io.File
 import java.util.Properties
-import java.io.StringReader
 
 object GenJavaDocPlugin {
 
@@ -26,7 +24,6 @@ object GenJavaDocPlugin {
 }
 
 class GenJavaDocPlugin(val global: Global) extends Plugin {
-  import global._
   import GenJavaDocPlugin._
 
   val name = "genjavadoc"
@@ -53,15 +50,14 @@ class GenJavaDocPlugin(val global: Global) extends Plugin {
   private object MyComponent extends PluginComponent with Transform {
 
     import global._
-    import global.definitions._
 
     type GT = GenJavaDocPlugin.this.global.type
 
     override val global: GT = GenJavaDocPlugin.this.global
 
     val isPreFields = {
       val v = nsc.Properties.versionNumberString
-      Set("2.12.0-M1", "2.12.0-M2", "2.12.0-M3", "2.12.0-M4", "2.12.0-M5").contains(v) || v.startsWith("2.10.") || v.startsWith("2.11.")
+      Set("2.12.0-M1", "2.12.0-M2", "2.12.0-M3", "2.12.0-M4", "2.12.0-M5").contains(v) || v.startsWith("2.11.")
     }
     override val runsAfter = List(if(isPreFields) "uncurry" else "fields")
     val phaseName = "GenJavaDoc"

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

@@ -1,7 +1,6 @@
 package com.typesafe.genjavadoc
 
 import scala.tools.nsc.Global
-import scala.tools.nsc.transform.Transform
 
 trait TransformCake extends JavaSig with Output with Comments with BasicTransform with AST {