diff --git a/build.sbt b/build.sbt index 61f5190..0a59555 100644 --- a/build.sbt +++ b/build.sbt @@ -1,17 +1,17 @@ ThisBuild / organization := "mupq" -// SpinalHDL v1.8.0 can support newer Scala versions, but VexRiscv only references 2.11.12 +// SpinalHDL can support newer Scala versions, but VexRiscv only references 2.11.12 ThisBuild / scalaVersion := "2.11.12" -val spinalVersion = "1.8.0" +val spinalVersion = "1.10.1" lazy val pqvexriscv = (project in file(".")) .settings( name := "pqvexriscv", version := "0.1", libraryDependencies ++= Seq( - "net.java.dev.jna" % "jna" % "5.13.0", - "org.scalatest" %% "scalatest" % "3.2.5" % "test", + "net.java.dev.jna" % "jna" % "5.14.0", + "org.scalatest" %% "scalatest" % "3.2.5" % "test", // Same version as VexRiscv uses... compilerPlugin("com.github.spinalhdl" % "spinalhdl-idsl-plugin_2.11" % spinalVersion) ), run / connectInput := true, @@ -19,7 +19,7 @@ lazy val pqvexriscv = (project in file(".")) ).dependsOn(vexRiscv) // Newer versions of VexRiscv bring a new debugger, that requires more refactoring -lazy val vexRiscv = RootProject(uri("https://github.com/SpinalHDL/VexRiscv.git#b29eb542f278edb8ee2c91863a5b26e76b5932c9")) +lazy val vexRiscv = RootProject(uri("https://github.com/SpinalHDL/VexRiscv.git#e52251d88c1d0dd397cc976654b291909152a979")) fork := true diff --git a/project/build.properties b/project/build.properties index 3040987..04267b1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.4 +sbt.version=1.9.9