Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Update scala-library to 2.12.19 #457

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
scala: [ 2.13.4, 2.12.17 ]
scala: [ 2.13.4, 2.12.19 ]
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ lazy val baseSettings = Seq(
name := "treadle",
organization := "edu.berkeley.cs",
version := "1.6-SNAPSHOT",
scalaVersion := "2.12.17",
crossScalaVersions := Seq("2.13.10", "2.12.17"),
scalaVersion := "2.12.19",
crossScalaVersions := Seq("2.13.10", "2.12.19"),
// enables using control-c in sbt CLI
cancelable in Global := true,
resolvers ++= Seq(
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/treadle/primops/ShlShrDshlDshr.scala
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ class ShlShrDshlDshr extends AnyFreeSpec with Matchers with LazyLogging {
"Dshr should work for pathological edge cases" in {
def dshrIntFirrtl(width: Int): String = {
s"""
|;buildInfoPackage: chisel3, version: 3.5-SNAPSHOT, scalaVersion: 2.12.17, sbtVersion: 1.3.10
|;buildInfoPackage: chisel3, version: 3.5-SNAPSHOT, scalaVersion: 2.12.19, sbtVersion: 1.3.10
|circuit ShiftTestInt :
| module ShiftTestInt :
| input clock : Clock
Expand Down
Loading