diff options
| author | Jack Koenig | 2019-09-13 14:17:45 -0700 |
|---|---|---|
| committer | GitHub | 2019-09-13 14:17:45 -0700 |
| commit | 6d6c529b4a4b9bff78dcbf78de9c69ad4168b838 (patch) | |
| tree | 2066e6274320649baaaa6679096c980cce135035 | |
| parent | ba2f0acf5470c25678cd35c8353ca5fbefd62c0f (diff) | |
Bump Scala to 2.12.10 (#1155)
| -rw-r--r-- | .run_chisel_tests.sh | 2 | ||||
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | build.sbt | 4 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/.run_chisel_tests.sh b/.run_chisel_tests.sh index bb96c579..c52bfee1 100644 --- a/.run_chisel_tests.sh +++ b/.run_chisel_tests.sh @@ -9,5 +9,5 @@ else mkdir -p chisel3/lib cp utils/bin/firrtl.jar chisel3/lib cd chisel3 - sbt ++2.11.12 "set concurrentRestrictions in Global += Tags.limit(Tags.Test, 2)" clean test + sbt "set concurrentRestrictions in Global += Tags.limit(Tags.Test, 2)" clean test fi diff --git a/.travis.yml b/.travis.yml index fddd7969..ba4f631c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ jobs: name: "Tests: FIRRTL (2.12.4)" script: - verilator --version - - sbt ++2.12.4 $SBT_ARGS test + - sbt $SBT_ARGS test - stage: test name: "Tests: FIRRTL (2.11.12)" script: @@ -57,7 +57,7 @@ jobs: name: "Tests: chisel3 (2.11.12)" script: - verilator --version - - sbt ++2.11.12 $SBT_ARGS clean assembly publishLocal + - sbt $SBT_ARGS clean assembly publishLocal - bash .run_chisel_tests.sh - stage: test name: "Formal equivalence: RocketCore" @@ -12,9 +12,9 @@ name := "firrtl" version := "1.2-SNAPSHOT" -scalaVersion := "2.12.7" +scalaVersion := "2.12.10" -crossScalaVersions := Seq("2.12.7", "2.11.12") +crossScalaVersions := Seq("2.12.10", "2.11.12") def scalacOptionsVersion(scalaVersion: String): Seq[String] = { Seq() ++ { diff --git a/project/plugins.sbt b/project/plugins.sbt index 84509572..dbf59d89 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -20,6 +20,6 @@ addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.8.1") addSbtPlugin("com.github.gseitz" % "sbt-protobuf" % "0.6.3") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.4") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.7") libraryDependencies += "com.github.os72" % "protoc-jar" % "3.5.1.1" |