summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Koenig2020-03-26 14:18:21 -0700
committerGitHub2020-03-26 21:18:21 +0000
commite88f33e0aa02b093eaaef496b63f61a5c45148d6 (patch)
tree1ae32b6a8adee7d4156ade483ff217ad211d50cb
parent81845909248aaceef427e73924211931e0dc60dc (diff)
Bump to Scala 2.12.11 (#1389)
Co-authored-by: Jim Lawson <ucbjrl@berkeley.edu> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
-rw-r--r--.circleci/config.yml2
-rw-r--r--build.sbt6
-rw-r--r--build.sc10
3 files changed, 9 insertions, 9 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index cf797e47..1bcac0e6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -124,7 +124,7 @@ jobs:
executor: chisel-executor
steps:
- test-chisel:
- scalaVersion: "++2.12.10"
+ scalaVersion: "++2.12.11"
checkstyle-chisel:
executor: chisel-executor
diff --git a/build.sbt b/build.sbt
index 64520fa1..0ab58e0d 100644
--- a/build.sbt
+++ b/build.sbt
@@ -38,11 +38,11 @@ lazy val commonSettings = Seq (
organization := "edu.berkeley.cs",
version := "3.3-SNAPSHOT",
autoAPIMappings := true,
- scalaVersion := "2.12.10",
- crossScalaVersions := Seq("2.12.10", "2.11.12"),
+ scalaVersion := "2.12.11",
+ crossScalaVersions := Seq("2.12.11", "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),
+ addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full),
(scalastyleConfig in Test) := (baseDirectory in root).value / "scalastyle-test-config.xml",
// Use the root project's unmanaged base for all sub-projects.
unmanagedBase := (unmanagedBase in root).value,
diff --git a/build.sc b/build.sc
index 821d71e0..72058b0f 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.10")
+object chisel3 extends mill.Cross[chisel3CrossModule]("2.11.12", "2.12.11")
// The following stanza is searched for and used when preparing releases.
// Please retain it.
@@ -24,7 +24,7 @@ trait CommonModule extends ScalaModule with SbtModule with PublishModule {
def publishVersion = "3.3-SNAPSHOT"
- // 2.12.10 -> Array("2", "12", "10") -> "12" -> 12
+ // 2.12.11 -> Array("2", "12", "10") -> "12" -> 12
protected def majorVersion = crossVersion.split('.')(1).toInt
def crossVersion: String
@@ -59,7 +59,7 @@ trait CommonModule extends ScalaModule with SbtModule with PublishModule {
override def javacOptions = super.javacOptions() ++ javacCrossOptions
- private val macroParadise = ivy"org.scalamacros:::paradise:2.1.0"
+ private val macroParadise = ivy"org.scalamacros:::paradise:2.1.1"
override def compileIvyDeps = Agg(macroParadise)
@@ -79,7 +79,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.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 crossVersion = crossVersionValue
@@ -105,7 +105,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.10].test.testOnly" "chiselTests.BitwiseOpsSpec"
+ // for example, mill -i "chisel3[2.12.11].test.testOnly" "chiselTests.BitwiseOpsSpec"
def testOnly(args: String*) = T.command {
super.runMain("org.scalatest.run", args: _*)
}