Skip to content
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.

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

Bump to Scala 2.12.10 #39

Merged
merged 1 commit into from
Mar 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ resolvers ++= Seq(
organization := "edu.berkeley.cs"
version := "1.2-SNAPSHOT"
autoAPIMappings := true
scalaVersion := "2.12.7"
crossScalaVersions := Seq("2.12.7", "2.11.12")
scalaVersion := "2.12.10"
crossScalaVersions := Seq("2.12.10", "2.11.12")
scalacOptions := Seq("-deprecation", "-feature") ++ scalacOptionsVersion(scalaVersion.value)

def scalacOptionsVersion(scalaVersion: String): Seq[String] = {
Expand Down
2 changes: 1 addition & 1 deletion build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ trait CommonModule extends CrossUnRootedSbtModule with PublishModule {
override def javacOptions = CommonBuild.javacOptionsVersion(crossScalaVersion)
}

val crossVersions = Seq("2.12.7", "2.11.12")
val crossVersions = Seq("2.12.10", "2.11.12")

// Make this available to external tools.
object diagrammer extends Cross[DiagrammerModule](crossVersions: _*) {
Expand Down