Bump Scala to 2.12.12 (#1553)

Also fix BuildInfo in mill

2 files changed, 13 insertions, 11 deletions

diff --git a/build.sbt b/build.sbt
index 77ebe90b..84e0efda 100644
--- a/build.sbt
+++ b/build.sbt
@@ -41,8 +41,8 @@ lazy val commonSettings = Seq (
   organization := "edu.berkeley.cs",
   version := "3.4-SNAPSHOT",
   autoAPIMappings := true,
-  scalaVersion := "2.12.11",
-  crossScalaVersions := Seq("2.12.11", "2.11.12"),
+  scalaVersion := "2.12.12",
+  crossScalaVersions := Seq("2.12.12", "2.11.12"),
   scalacOptions := Seq("-deprecation", "-feature") ++ scalacOptionsVersion(scalaVersion.value),
   libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
   addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full),
@@ -141,7 +141,8 @@ lazy val pluginScalaVersions = Seq(
   "2.12.8",
   "2.12.9",
   "2.12.10",
-  "2.12.11"
+  "2.12.11",
+  "2.12.12",
 )
 
 lazy val plugin = (project in file("plugin")).
diff --git a/build.sc b/build.sc
index cc215de4..47ca01c8 100644
--- a/build.sc
+++ b/build.sc
@@ -6,7 +6,7 @@ import coursier.maven.MavenRepository
 import $ivy.`com.lihaoyi::mill-contrib-buildinfo:$MILL_VERSION`
 import mill.contrib.buildinfo.BuildInfo
 
-object chisel3 extends mill.Cross[chisel3CrossModule]("2.11.12", "2.12.11") 
+object chisel3 extends mill.Cross[chisel3CrossModule]("2.11.12", "2.12.12")
 
 // The following stanza is searched for and used when preparing releases.
 // Please retain it.
@@ -41,7 +41,7 @@ trait CommonModule extends ScalaModule with SbtModule with PublishModule {
 
   def publishVersion = "3.4-SNAPSHOT"
 
-  // 2.12.11 -> Array("2", "12", "10") -> "12" -> 12
+  // 2.12.10 -> Array("2", "12", "10") -> "12" -> 12
   protected def majorVersion = crossVersion.split('.')(1).toInt
 
   def crossVersion: String
@@ -90,7 +90,7 @@ trait CommonModule extends ScalaModule with SbtModule with PublishModule {
 
 class chisel3CrossModule(crossVersionValue: String) extends CommonModule with PublishModule with BuildInfo { m =>
   // different scala version shares same sources
-  // mill use foo/2.11.12 foo/2.12.11 as millSourcePath by default
+  // mill use foo/2.11.12 foo/2.12.12 as millSourcePath by default
   override def millSourcePath = super.millSourcePath / os.up / os.up
 
   def crossVersion = crossVersionValue
@@ -116,7 +116,7 @@ class chisel3CrossModule(crossVersionValue: String) extends CommonModule with Pu
     def testFrameworks = Seq("org.scalatest.tools.Framework")
 
     // a sbt-like testOnly command.
-    // for example, mill -i "chisel3[2.12.11].test.testOnly" "chiselTests.BitwiseOpsSpec" 
+    // for example, mill -i "chisel3[2.12.12].test.testOnly" "chiselTests.BitwiseOpsSpec"
     def testOnly(args: String*) = T.command {
       super.runMain("org.scalatest.run", args: _*)
     }
@@ -132,10 +132,6 @@ class chisel3CrossModule(crossVersionValue: String) extends CommonModule with Pu
     )
   }
 
-  override def generatedSources = T {
-    Seq(generatedBuildInfo()._2)
-  }
-
   object macros extends CommonModule {
     def firrtlModule = m.firrtlModule
 
@@ -158,6 +154,11 @@ class chisel3CrossModule(crossVersionValue: String) extends CommonModule with Pu
       "-Xcheckinit",
       "-Xlint:infer-any"
     )
+
+    override def generatedSources = T {
+      Seq(generatedBuildInfo()._2)
+    }
+
   }
   // make mill publish sbt compatible package
   def artifactName = "chisel3"