Merge pull request #75 from BToersche/master

Updated to latest genjavadoc, sbt and scala versions
sbt · Jan 29, 2020 · 6050d2c · 6050d2c
2 parents d212d9d + c416848
commit 6050d2c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,10 +12,12 @@ script:
 matrix:
   include:
   - env: SBT_VERSION="0.13.18"
-    scala: 2.10.7
+    scala:
+      - 2.10.7
 
-  - env: SBT_VERSION="1.2.7"
-    scala: 2.12.8
+  - env: SBT_VERSION="1.2.8"
+    scala:
+      - 2.12.8
 
 cache:
   directories:

diff --git a/build.sbt b/build.sbt
@@ -6,7 +6,7 @@ lazy val root = (project in file(".")).
   settings(commonSettings: _*).
   settings(
     sbtPlugin := true,
-    crossSbtVersions := Vector("0.13.18", "1.2.7"),
+    crossSbtVersions := Vector("0.13.18", "1.2.8"),
     name := "sbt-unidoc",
     description := "sbt plugin to create a unified API document across projects",
     licenses := Seq("Apache License v2" -> url("http://www.apache.org/licenses/LICENSE-2.0.html")),

diff --git a/src/main/scala/sbtunidoc/GenJavadocPlugin.scala b/src/main/scala/sbtunidoc/GenJavadocPlugin.scala
@@ -10,7 +10,7 @@ object GenJavadocPlugin extends AutoPlugin {
   }
   import autoImport._
 
-  override def globalSettings = unidocGenjavadocVersion := "0.13"
+  override def globalSettings = unidocGenjavadocVersion := "0.15"
 
   override def requires = JvmPlugin