diff options
| author | Jack Koenig | 2020-03-26 13:52:47 -0700 |
|---|---|---|
| committer | GitHub | 2020-03-26 20:52:47 +0000 |
| commit | a458754f2c308c08bc152df1785a8468edfc27a4 (patch) | |
| tree | a34e72e45140376d619d8be33305a827d9861e7b | |
| parent | 249ed127cf6bf849f9895b8b603bececba1c5d76 (diff) | |
Bump to Scala 2.12.11 (#1473)
Co-authored-by: Jim Lawson <ucbjrl@berkeley.edu>
| -rw-r--r-- | build.sbt | 4 | ||||
| -rw-r--r-- | build.sc | 8 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
3 files changed, 7 insertions, 7 deletions
@@ -33,8 +33,8 @@ lazy val commonSettings = Seq( organization := "edu.berkeley.cs", name := "firrtl", version := "1.3-SNAPSHOT", - scalaVersion := "2.12.10", - crossScalaVersions := Seq("2.12.10", "2.11.12"), + scalaVersion := "2.12.11", + crossScalaVersions := Seq("2.12.11", "2.11.12"), addCompilerPlugin(scalafixSemanticdb), scalacOptions := scalacOptionsVersion(scalaVersion.value) ++ Seq( "-deprecation", @@ -4,16 +4,16 @@ import mill.scalalib._ import mill.scalalib.publish._ import mill.modules.Util -object firrtl extends mill.Cross[firrtlCrossModule]("2.11.12", "2.12.10") +object firrtl extends mill.Cross[firrtlCrossModule]("2.11.12", "2.12.11") class firrtlCrossModule(crossVersion: String) extends ScalaModule with SbtModule with PublishModule { // different scala version shares same sources - // mill use foo/2.11.12 foo/2.12.10 as millSourcePath by default + // mill use foo/2.11.12 foo/2.12.11 as millSourcePath by default override def millSourcePath = super.millSourcePath / os.up / os.up def scalaVersion = crossVersion - // 2.12.10 -> Array("2", "12", "10") -> "12" -> 12 + // 2.12.11 -> Array("2", "12", "10") -> "12" -> 12 private def majorVersion = crossVersion.split('.')(1).toInt def publishVersion = "1.3-SNAPSHOT" @@ -66,7 +66,7 @@ class firrtlCrossModule(crossVersion: String) extends ScalaModule with SbtModule def testFrameworks = Seq("org.scalatest.tools.Framework") // a sbt-like testOnly command. - // for example, mill -i "firrtl[2.12.10].test.testOnly" "firrtlTests.AsyncResetSpec" + // for example, mill -i "firrtl[2.12.11].test.testOnly" "firrtlTests.AsyncResetSpec" def testOnly(args: String*) = T.command { super.runMain("org.scalatest.run", args: _*) } diff --git a/project/plugins.sbt b/project/plugins.sbt index f29ae2d9..2ce9aa89 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -20,6 +20,6 @@ addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.8.2") addSbtPlugin("com.github.gseitz" % "sbt-protobuf" % "0.6.5") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.11") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.12") libraryDependencies += "com.github.os72" % "protoc-jar" % "3.11.1" |