Merge branch 'master' into update/genjavadoc-plugin-0.14

Author: lrytz

.travis.yml

@@ -1,25 +1,17 @@
 language: scala
 
 scala:
-  - 2.13.0
-  - 2.12.8
   - 2.11.12
+  - 2.12.8
+  - 2.13.0
 
 env:
-  global:
-    # PGP_PASSPHRASE
-    - secure: "BzgzRZLYa52rS/hBfzf43b++CfDhdcd3Mmu8tsyBHgThSQOd2YBLbV5kWD8aYVFKVHfW7XX0PTe3F+rR/fFZqGItE6o8Px0Y7Vzb5pqjlaQdxFEJ+WrsnshS0xuAKZ7OwVHRp+d+jznaCwRxEo2vpW3ko1OPAJ8cxfhVL/4C1I0="
-    # SONA_USER
-    - secure: "lx2qFeFxh9AFmyHR7hH4Qf9flIEx8VgYj6ebzuxp1cc1ZZiXHC1256x0bHFDUH9bhJACOazOrco/+v6MBAriBkWxLBc98FrC6OkVeQMFW2ffWSBuHRclilKsQA/Lsgc81Wg+WV105hOqUNAkTXgroblInNt+KS+DhC/8FVoh9ZY="
-    # SONA_PASS
-    - secure: "FZC+FZnBNeklA150vW5QDZJ5J7t+DExJrgyXWM46Wh0MobjH8cvydgC3qatItb0rDBV8l7zO1LDwl2KEi92aefw2a8E49z6qVOHgUXiI3SAx7M0UO0FFeKPmTXCLcBlbnGLcUqNjIZfuIEufQvPblKTl8qN4eMmcMn9jsNzJr28="
-  matrix:
-    - ADOPTOPENJDK=8
-    - ADOPTOPENJDK=11
+  - ADOPTOPENJDK=8
+  - ADOPTOPENJDK=11
 
 before_install:
   # adding $HOME/.sdkman to cache would create an empty directory, which interferes with the initial installation
-  - "[[ -d $HOME/.sdkman/bin/ ]] || rm -rf $HOME/.sdkman/"
+  - "[[ -d $HOME/.sdkman/bin ]] || rm -rf $HOME/.sdkman/"
   - curl -sL https://get.sdkman.io | bash
   - echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config
   - source "$HOME/.sdkman/bin/sdkman-init.sh"
@@ -28,21 +20,22 @@ install:
   - sdk install java $(sdk list java | grep -o "$ADOPTOPENJDK\.[0-9\.]*hs-adpt" | head -1)
   - unset JAVA_HOME
   - java -Xmx32m -version
-  - javac -J-Xmx32m -version
+  - git fetch --tags # get all tags for sbt-dynver
 
-script:
-  - admin/build.sh
+script: ./build.sh
 
 notifications:
   email:
     - jason.zaugg@lightbend.com
     - seth.tisue@lightbend.com
 
 before_cache:
-  - find $HOME/.sbt -name "*.lock" | xargs rm
-  - find $HOME/.ivy2/cache -name "ivydata-*.properties" | xargs rm
+  - rm -f $HOME/.ivy2/.sbt.ivy.lock
+  - find $HOME/.ivy2/cache     -name "ivydata-*.properties" | xargs rm
+  - find $HOME/.sbt            -name "*.lock"               | xargs rm
 cache:
   directories:
     - $HOME/.ivy2/cache
     - $HOME/.sbt
+    - $HOME/.cache/coursier
     - $HOME/.sdkman

admin/README.md

@@ -1,10 +1,6 @@
-import ScalaModulePlugin._
-
-crossScalaVersions in ThisBuild := List("2.13.0", "2.12.8", "2.11.12")
-
 val disableDocs =
   sys.props("nodocs") == "true" ||
-    // can't build doc on JDK 11 until sbt/sbt#4350 is fixed
+    // on jdk 11 https://github.com/scala/scala-java8-compat/issues/160, seems to fail the build (not on 8)
     !sys.props("java.version").startsWith("1.")
 
 lazy val JavaDoc = config("genjavadoc") extend Compile
@@ -23,9 +19,6 @@ def osgiExport(scalaVersion: String, version: String) = {
 }
 
 lazy val commonSettings = Seq(
-  organization := "org.scala-lang.modules",
-  version := "0.9.1-SNAPSHOT",
-
   scalacOptions ++= Seq("-feature", "-deprecation", "-unchecked"),
 
   unmanagedSourceDirectories in Compile ++= {
@@ -49,21 +42,22 @@ lazy val commonSettings = Seq(
   },
 )
 
-lazy val fnGen = (project in file("fnGen")).
-  settings(commonSettings: _*).
-  settings(
+lazy val fnGen = (project in file("fnGen"))
+  .settings(commonSettings)
+  .settings(
     fork in run := true,  // Needed if you run this project directly
     libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
     libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value
   )
 
-lazy val root = (project in file(".")).
-  settings(scalaModuleSettings: _*).
-  settings(commonSettings: _*).
-  settings(
+lazy val scalaJava8Compat = (project in file("."))
+  .settings(ScalaModulePlugin.scalaModuleSettings)
+  .settings(ScalaModulePlugin.scalaModuleSettingsJVM)
+  .settings(commonSettings)
+  .settings(
     name := "scala-java8-compat"
-  ).
-  settings(
+  )
+  .settings(
     fork := true, // This must be set so that runner task is forked when it runs fnGen and the compiler gets a proper classpath
 
     OsgiKeys.exportPackage := osgiExport(scalaVersion.value, version.value),
@@ -76,7 +70,7 @@ lazy val root = (project in file(".")).
 
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
 
-    mimaPreviousVersion := None,
+    scalaModuleMimaPreviousVersion := None,
 
     testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"),
 
@@ -119,23 +113,26 @@ lazy val root = (project in file(".")).
     },
 
     publishArtifact in packageDoc := !disableDocs
-  ).
-  settings(
-    (inConfig(JavaDoc)(Defaults.configSettings) ++ (if (disableDocs) Nil else Seq(
-      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.14" cross CrossVersion.full),
-      scalacOptions in Compile += "-P:genjavadoc:out=" + (target.value / "java")
-    ))): _*
-  ).
-  settings(
+  )
+  .settings(
+    inConfig(JavaDoc)(Defaults.configSettings) ++ {
+      if (disableDocs) Nil
+      else Seq(
+        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.14" cross CrossVersion.full),
+        scalacOptions in Compile += "-P:genjavadoc:out=" + (target.value / "java")
+      )
+    }
+  )
+  .settings(
     initialCommands :=
     """|import scala.concurrent._
        |import ExecutionContext.Implicits.global