summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.circleci/config.yml2
-rw-r--r--build.sbt4
-rw-r--r--build.sc2
3 files changed, 4 insertions, 4 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 10a82b72..cf797e47 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -124,7 +124,7 @@ jobs:
executor: chisel-executor
steps:
- test-chisel:
- scalaVersion: "++2.12.7"
+ scalaVersion: "++2.12.10"
checkstyle-chisel:
executor: chisel-executor
diff --git a/build.sbt b/build.sbt
index 76fac5d9..432f3d9d 100644
--- a/build.sbt
+++ b/build.sbt
@@ -38,8 +38,8 @@ lazy val commonSettings = Seq (
organization := "edu.berkeley.cs",
version := "3.2-SNAPSHOT",
autoAPIMappings := true,
- scalaVersion := "2.12.9",
- crossScalaVersions := Seq("2.12.9", "2.11.12"),
+ scalaVersion := "2.12.10",
+ crossScalaVersions := Seq("2.12.10", "2.11.12"),
scalacOptions := Seq("-deprecation", "-feature") ++ scalacOptionsVersion(scalaVersion.value),
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full),
diff --git a/build.sc b/build.sc
index 36e27464..e379446b 100644
--- a/build.sc
+++ b/build.sc
@@ -32,7 +32,7 @@ object chiselCompileOptions {
)
}
-val crossVersions = Seq("2.12.9", "2.11.12")
+val crossVersions = Seq("2.12.10", "2.11.12")
// Provide a managed dependency on X if -DXVersion="" is supplied on the command line.
val defaultVersions = Map("firrtl" -> "1.2-SNAPSHOT")