Merge pull request #90 from SethTisue/cleanup-round

misc cleanups and upgrades

Author: SethTisue

.travis.yml

@@ -14,4 +14,4 @@ jdk:
   - oraclejdk8
 notifications:
   email:
-    - jason.zaugg@typesafe.com
+    - jason.zaugg@lightbend.com

LICENSE

@@ -1,5 +1,5 @@
-Copyright (c) 2002-2013 EPFL
-Copyright (c) 2011-2013 Typesafe, Inc.
+Copyright (c) 2002-2017 EPFL
+Copyright (c) 2011-2017 Lightbend, Inc.
 
 All rights reserved.
 

build.sbt

@@ -1,7 +1,7 @@
 import ScalaModulePlugin._
 
 scalaVersionsByJvm in ThisBuild := Map(
-  8 -> List("2.12.0", "2.11.8", "2.13.0-M1").map(_ -> true)
+  8 -> List("2.12.2", "2.11.11", "2.13.0-M1").map(_ -> true)
 )
 
 val disableDocs = sys.props("nodocs") == "true"
@@ -23,7 +23,8 @@ def osgiExport(scalaVersion: String, version: String) = {
 
 lazy val commonSettings = Seq(
   organization := "org.scala-lang.modules",
-  version := "0.9.0-SNAPSHOT"
+  version := "0.9.0-SNAPSHOT",
+  scalacOptions ++= Seq("-feature", "-deprecation", "-unchecked")
 )
 
 lazy val fnGen = (project in file("fnGen")).
@@ -68,9 +69,10 @@ lazy val root = (project in file(".")).
       (out ** "*.scala").get
     }.taskValue,
 
-    sourceGenerators in Compile <+= (sourceManaged in Compile, scalaVersion) map { (dir, v) =>
+    sourceGenerators in Compile += Def.task {
+      val dir = (sourceManaged in Compile).value
       val write = jwrite(dir) _
-      if(v.startsWith("2.11.")) {
+      if(scalaVersion.value.startsWith("2.11.")) {
         Seq(write("JFunction", CodeGen.factory)) ++
           (0 to 22).map(n => write("JFunction" + n, CodeGen.fN(n))) ++
           (0 to 22).map(n => write("JProcedure" + n, CodeGen.pN(n))) ++
@@ -79,11 +81,11 @@ lazy val root = (project in file(".")).
           CodeGen.specializedF2.map(write.tupled) ++
           CodeGen.packageDummy.map((jwrite(dir, "java/runtime/java8") _).tupled)
       } else CodeGen.create212.map(write.tupled)
-    },
+    }.taskValue,
 
-    sourceGenerators in Test <+= sourceManaged in Test map { dir =>
-      Seq(jwrite(dir)("TestApi", CodeGen.testApi))
-    },
+    sourceGenerators in Test += Def.task {
+      Seq(jwrite((sourceManaged in Test).value)("TestApi", CodeGen.testApi))
+    }.taskValue,
 
     initialize := {
       // Run previously configured inialization...
@@ -103,14 +105,16 @@ lazy val root = (project in file(".")).
   ).
   settings(
     (inConfig(JavaDoc)(Defaults.configSettings) ++ (if (disableDocs) Nil else Seq(
-      packageDoc in Compile <<= packageDoc in JavaDoc,
-      sources in JavaDoc <<= (target, compile in Compile, sources in Compile) map {(t, c, s) =>
-        val allJavaSources = (t / "java" ** "*.java").get ++ s.filter(_.getName.endsWith(".java"))
+      packageDoc in Compile := (packageDoc in JavaDoc).value,
+      sources in JavaDoc := {
+        val allJavaSources =
+          (target.value / "java" ** "*.java").get ++
+            (sources in Compile).value.filter(_.getName.endsWith(".java"))
         allJavaSources.filterNot(_.getName.contains("FuturesConvertersImpl.java")) // this file triggers bugs in genjavadoc
       },
       javacOptions in JavaDoc := Seq(),
       artifactName in packageDoc in JavaDoc := ((sv, mod, art) => "" + mod.name + "_" + sv.binary + "-" + mod.revision + "-javadoc.jar"),
-      libraryDependencies += compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.10" cross CrossVersion.fullMapped { case "2.12.0" => "2.12.0-RC1" case x => x}),
+      libraryDependencies += compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.10" cross CrossVersion.full),
       scalacOptions in Compile += "-P:genjavadoc:out=" + (target.value / "java")
     ))): _*
   ).

fnGen/WrapFnGen.scala

@@ -14,7 +14,6 @@ object WrapFnGen {
   val packaging = "package scala.compat.java8"
 
   import scala.tools.nsc._
-  import scala.reflect.internal._
   val settings = new Settings(msg => sys.error(msg))
   settings.usejavacp.value = true
   val compiler = new Global(settings)
@@ -59,12 +58,12 @@ object WrapFnGen {
   }
 
   implicit class SplitMyLinesAndStuff(s: String) {
-    def toVec = s.linesIterator.toVector
+    def toVec = s.lines.toVector
     def nonBlank = s.trim.length > 0
   }
 
   implicit class TreeToText(t: Tree) {
-    def text = showCode(t).replace("$", "").linesIterator.toVector
+    def text = showCode(t).replace("$", "").lines.toVector
   }
 
   case class Prioritized(lines: Vector[String], priority: Int) {
@@ -253,7 +252,6 @@ object WrapFnGen {
             q"""@inline implicit def $s2jImpN[..$scalafnTdefs](sf: $scalaType[..$scalafnTnames])(implicit ..$evs): $s2jValCN[..$tnParams] =
               new $s2jValCN[..$tnParams](sf.asInstanceOf[$scalaType[..$scalaTargs]])
             """
-          val depth = numberedA.size
           (tree, tdParams.length)
         }
 
@@ -290,7 +288,7 @@ object WrapFnGen {
   def sameText(f: java.io.File, text: String): Boolean = {
     val x = scala.io.Source.fromFile(f)
     val lines = try { x.getLines.toVector } finally { x.close }
-    lines.iterator.filter(_.nonBlank) == text.linesIterator.filter(_.nonBlank)
+    lines.iterator.filter(_.nonBlank) == text.lines.filter(_.nonBlank)
   }
 
   def write(f: java.io.File, text: String) {

project/plugins.sbt

@@ -1 +1,3 @@
+scalacOptions += "-Xfatal-warnings"
+
 addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.8")

src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveDoubleWrapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2015 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.compat.java8.wrappers;
 

src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveIntWrapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2015 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.compat.java8.wrappers;
 

src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveLongWrapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2015 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.compat.java8.wrappers;
 

src/main/scala/scala/compat/java8/FutureConverters.scala

@@ -1,13 +1,14 @@
 /*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2015 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.compat.java8
 
+import scala.language.implicitConversions
+
 import scala.concurrent.java8.FuturesConvertersImpl._
-import scala.concurrent.{ Future, Promise, ExecutionContext, ExecutionContextExecutorService, ExecutionContextExecutor, impl }
-import java.util.concurrent.{ CompletionStage, Executor, ExecutorService, CompletableFuture }
-import scala.util.{ Try, Success, Failure }
-import java.util.function.{ BiConsumer, Function ⇒ JF, Consumer, BiFunction }
+import scala.concurrent.{ Future, Promise, ExecutionContext, ExecutionContextExecutorService, ExecutionContextExecutor }
+import java.util.concurrent.{ CompletionStage, Executor, ExecutorService }
+import java.util.function.Consumer
 
 /**
  * This class contains static methods which convert between Java CompletionStage

src/main/scala/scala/compat/java8/OptionConverters.scala

@@ -1,9 +1,8 @@
 /*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2015 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.compat.java8
 
-import language.implicitConversions
 import java.util.{Optional, OptionalDouble, OptionalInt, OptionalLong}
 
 /** This class enables bidirectional conversion between `scala.Option` and the