Skip to content

Commit 8c946c0

Browse files
authored
Merge pull request #233 from scala-steward/update/scala-library-2.12.14
2 parents b6cf686 + b6e9df8 commit 8c946c0

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ scala:
88
- 3.0.0
99
- 3.0.0-RC3
1010
- 2.11.12
11-
- 2.12.13
11+
- 2.12.14
1212
- 2.13.5
1313

1414
env:

build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ lazy val commonSettings = Seq(
4545
lazy val fnGen = (project in file("fnGen"))
4646
.settings(commonSettings)
4747
.settings(
48-
crossScalaVersions := Seq("2.12.13"),
48+
crossScalaVersions := Seq("2.12.14"),
4949
scalaVersion := crossScalaVersions.value.head,
5050
run / fork := true, // Needed if you run this project directly
5151
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
@@ -145,7 +145,7 @@ lazy val scalaJava8Compat = (project in file("."))
145145
JavaDoc / packageDoc / artifactName := ((sv, mod, art) => "" + mod.name + "_" + sv.binary + "-" + mod.revision + "-javadoc.jar"),
146146
libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
147147
case Some((3, _)) => Seq()
148-
case _ => Seq(compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.16" cross CrossVersion.full))
148+
case _ => Seq(compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.17" cross CrossVersion.full))
149149
}),
150150
Compile / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
151151
case Some((3, _)) => Seq()

0 commit comments

Comments
 (0)