diff options
| author | Jack Koenig | 2021-02-01 12:44:24 -0800 |
|---|---|---|
| committer | GitHub | 2021-02-01 12:44:24 -0800 |
| commit | 445b5cecb267adcd556627ffea2486b20740d6d4 (patch) | |
| tree | 9f874c4a005c92cfdb0ec15af595224cfdc81ef9 | |
| parent | 654db98e92c0ea96d89f0307c043951fdc73a257 (diff) | |
Bump to Scala 2.12.13 (#1766)
| -rw-r--r-- | .github/workflows/test.yml | 4 | ||||
| -rw-r--r-- | build.sbt | 5 | ||||
| -rw-r--r-- | build.sc | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f9c2b2b0..a9322492 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - scala: [2.12.12] + scala: [2.12.13] container: image: ucbbar/chisel3-tools options: --user github --entrypoint /bin/bash @@ -32,7 +32,7 @@ jobs: - name: Cache Scala uses: coursier/cache-action@v5 - name: Documentation (Scala 2.12 only) - if: matrix.scala == '2.12.12' + if: matrix.scala == '2.12.13' run: sbt ++${{ matrix.scala }} docs/mdoc - name: Test run: sbt ++${{ matrix.scala }} test @@ -15,8 +15,8 @@ lazy val commonSettings = Seq ( organization := "edu.berkeley.cs", version := "3.5-SNAPSHOT", autoAPIMappings := true, - scalaVersion := "2.12.12", - crossScalaVersions := Seq("2.12.12"), + scalaVersion := "2.12.13", + crossScalaVersions := Seq("2.12.13"), scalacOptions := Seq("-deprecation", "-feature", ), libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value, @@ -92,6 +92,7 @@ lazy val pluginScalaVersions = Seq( "2.12.10", "2.12.11", "2.12.12", + "2.12.13", ) lazy val plugin = (project in file("plugin")). @@ -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.12.12") +object chisel3 extends mill.Cross[chisel3CrossModule]("2.12.13") // The following stanza is searched for and used when preparing releases. // Please retain it. diff --git a/project/plugins.sbt b/project/plugins.sbt index 5c73d56e..482c2201 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -16,7 +16,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.15") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") -addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.5" ) +addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.16" ) addSbtPlugin("com.eed3si9n" % "sbt-sriracha" % "0.1.0") |