Skip to content

Update scala-library to 2.12.14 #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 20, 2021
Merged

Update scala-library to 2.12.14 #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
440f2a9
Update scala-library to 2.12.14
scala-steward May 28, 2021
219302e
Update .travis.yml
xuwei-k Jun 9, 2021
b6e9df8
upgrade genjavadoc to version available for Scala 2.12.14
SethTisue Jun 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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()
Expand Down