diff options
| author | Jack Koenig | 2019-09-16 14:41:39 -0700 |
|---|---|---|
| committer | GitHub | 2019-09-16 14:41:39 -0700 |
| commit | a83647a91326bcd2ac0e3c664056b5ced212cc67 (patch) | |
| tree | 52e2545573751531183e9daea33c5674605fb9f6 | |
| parent | 4af6db34e865b44cc68ed114d35ca6016a37d265 (diff) | |
Bump Scala to 2.12.10 (#1179)
| -rw-r--r-- | .circleci/config.yml | 2 | ||||
| -rw-r--r-- | build.sbt | 4 | ||||
| -rw-r--r-- | build.sc | 2 |
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 @@ -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), @@ -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") |
