diff --git a/.travis.yml b/.travis.yml index ae91b71..42f51eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ scala: - 3.0.0 - 3.0.0-RC3 - 2.11.12 - - 2.12.13 + - 2.12.14 - 2.13.5 env: diff --git a/build.sbt b/build.sbt index 13d8357..ced0231 100644 --- a/build.sbt +++ b/build.sbt @@ -45,7 +45,7 @@ lazy val commonSettings = Seq( lazy val fnGen = (project in file("fnGen")) .settings(commonSettings) .settings( - crossScalaVersions := Seq("2.12.13"), + crossScalaVersions := Seq("2.12.14"), scalaVersion := crossScalaVersions.value.head, run / fork := true, // Needed if you run this project directly libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value, @@ -149,7 +149,7 @@ lazy val scalaJava8Compat = (project in file(".")) JavaDoc / packageDoc / artifactName := ((sv, mod, art) => "" + mod.name + "_" + sv.binary + "-" + mod.revision + "-javadoc.jar"), libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((3, _)) => Seq() - case _ => Seq(compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.16" cross CrossVersion.full)) + case _ => Seq(compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.17" cross CrossVersion.full)) }), Compile / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((3, _)) => Seq()