summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScala Steward2021-09-14 00:50:37 +0200
committerGitHub2021-09-13 15:50:37 -0700
commitc66f0ed24366f8ce0e20a5a420589b8ae01aba77 (patch)
tree6304700321ce68784da50859cb18804e462b368b
parente27de290cd649581957958ab212be8a115a29177 (diff)
Update scala-compiler, scala-library, ... to 2.12.14 (#1950)
-rw-r--r--.github/workflows/test.yml4
-rw-r--r--build.sbt2
-rw-r--r--build.sc2
3 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a2240ff8..c6ca69fd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
matrix:
system: ["ubuntu-20.04"]
jvm: ["adopt@1.8"]
- scala: ["2.13.6", "2.12.13"]
+ scala: ["2.13.6", "2.12.14"]
verilator: ["4.204"]
z3: ["4.8.10"]
espresso: ["2.4"]
@@ -106,7 +106,7 @@ jobs:
- name: Cache Scala
uses: coursier/cache-action@v5
- name: Documentation (Scala 2.12 only)
- if: matrix.scala == '2.12.13'
+ if: matrix.scala == '2.12.14'
run: sbt ++${{ matrix.scala }} docs/mdoc
- name: Test
run: sbt ++${{ matrix.scala }} test noPluginTests/test
diff --git a/build.sbt b/build.sbt
index 54bf87f0..4084eecd 100644
--- a/build.sbt
+++ b/build.sbt
@@ -17,7 +17,7 @@ lazy val commonSettings = Seq (
version := "3.5-SNAPSHOT",
autoAPIMappings := true,
scalaVersion := "2.13.6",
- crossScalaVersions := Seq("2.13.6", "2.12.13"),
+ crossScalaVersions := Seq("2.13.6", "2.12.14"),
scalacOptions := Seq("-deprecation", "-feature"),
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
// Macros paradise is integrated into 2.13 but requires a scalacOption
diff --git a/build.sc b/build.sc
index 19ddc7ed..b83f4bdd 100644
--- a/build.sc
+++ b/build.sc
@@ -5,7 +5,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.13.6", "2.12.13")
+object chisel3 extends mill.Cross[chisel3CrossModule]("2.13.6", "2.12.14")
// The following stanza is searched for and used when preparing releases.
// Please retain it.