Merge pull request #39 from freechipsproject/bumpscala

Bump to Scala 2.12.10
freechipsproject · Mar 13, 2020 · d1444f3 · d1444f3
2 parents 31b2cdc + f5bb9a0
commit d1444f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -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] = {

diff --git a/build.sc b/build.sc
@@ -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: _*) {