diff options
| author | mergify[bot] | 2022-10-13 21:25:07 +0000 |
|---|---|---|
| committer | GitHub | 2022-10-13 21:25:07 +0000 |
| commit | 1e9f4e99167d1bc132a1a1a04e6987c2161c4d0e (patch) | |
| tree | 03395e639efa676389aa080e67cb798e771ade31 | |
| parent | 0167a664c38273d7016a6f828dcafdeeff8d32cd (diff) | |
Bump to Scala 2.13.10 (backport #2774) (#2775)
* Bump to Scala 2.13.10 (#2774)
2.13.9 has a binary compatibility regression so should be avoided.
(cherry picked from commit c53265d6853728280b6bc01b001415166515c79a)
# Conflicts:
# .github/workflows/test.yml
* Fix backport conflicts
* Fix scalaVersion in README
* Waive binary compatibility check for plugin for 2.13.10
3.5.4 is published for 2.13.10 so we cannot check binary compatibility
for it.
Co-authored-by: Jack Koenig <koenig@sifive.com>
| -rw-r--r-- | .github/workflows/test.yml | 2 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | build.sbt | 9 | ||||
| -rw-r--r-- | build.sc | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e48f37ea..69426662 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: matrix: system: ["ubuntu-20.04"] jvm: ["adopt@1.8"] - scala: ["2.13.9", "2.12.17"] + scala: ["2.13.10", "2.12.17"] espresso: ["2.4"] runs-on: ${{ matrix.system }} @@ -222,10 +222,10 @@ For example, in SBT this could be expressed as: ```scala // build.sbt scalaVersion := "2.13.8" -addCompilerPlugin("edu.berkeley.cs" % "chisel3-plugin" % "3.5.3" cross CrossVersion.full) -libraryDependencies += "edu.berkeley.cs" %% "chisel3" % "3.5.3" +addCompilerPlugin("edu.berkeley.cs" % "chisel3-plugin" % "3.5.4" cross CrossVersion.full) +libraryDependencies += "edu.berkeley.cs" %% "chisel3" % "3.5.4" // We also recommend using chiseltest for writing unit tests -libraryDependencies += "edu.berkeley.cs" %% "chiseltest" % "0.5.3" % "test" +libraryDependencies += "edu.berkeley.cs" %% "chiseltest" % "0.5.4" % "test" ``` ### Guide For New Contributors @@ -22,7 +22,7 @@ lazy val commonSettings = Seq ( version := "3.5-SNAPSHOT", autoAPIMappings := true, scalaVersion := "2.12.17", - crossScalaVersions := Seq("2.13.9", "2.12.17"), + crossScalaVersions := Seq("2.13.10", "2.12.17"), scalacOptions := Seq("-deprecation", "-feature"), libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value, // Macros paradise is integrated into 2.13 but requires a scalacOption @@ -123,7 +123,8 @@ lazy val pluginScalaVersions = Seq( "2.13.6", "2.13.7", "2.13.8", - "2.13.9" + "2.13.9", + "2.13.10", ) lazy val plugin = (project in file("plugin")). @@ -143,8 +144,8 @@ lazy val plugin = (project in file("plugin")). ). settings( mimaPreviousArtifacts := { - // There is not yet a 2.12.17 nor 2.13.9 artifact, so suppress until 3.5.5 is released - val skipVersions = Seq("2.12.17", "2.13.9") + // There are not yet artifacts for 2.12.17, 2.13.9, nor 2.13.10; suppress until 3.5.5 is released + val skipVersions = Seq("2.12.17", "2.13.9", "2.13.10") if (skipVersions.contains(scalaVersion.value)) { Set() } else { @@ -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.13.9", "2.12.17") +object chisel3 extends mill.Cross[chisel3CrossModule]("2.13.10", "2.12.17") // The following stanza is searched for and used when preparing releases. // Please retain it. |
