Hardware
/
VexRiscv
mirror of https://github.com/SpinalHDL/VexRiscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to SpinalHDL 1.3.0

This commit is contained in:
Dolu1990 2018-12-30 15:51:46 +01:00
parent dd42e30c61
commit 92065a1a10
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build.sbt
View File

@ -25,22 +25,20 @@ lazy val root = (project in file(".")).
settings( settings(
inThisBuild(List( inThisBuild(List(
organization := "com.github.spinalhdl", organization := "com.github.spinalhdl",
scalaVersion := "2.11.6", scalaVersion := "2.11.12",
version := "1.0.0" version := "1.0.0"
)), )),
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
// "com.github.spinalhdl" % "spinalhdl-core_2.11" % "1.2.2", "com.github.spinalhdl" % "spinalhdl-core_2.11" % "1.3.0",
// "com.github.spinalhdl" % "spinalhdl-lib_2.11" % "1.2.2", "com.github.spinalhdl" % "spinalhdl-lib_2.11" % "1.3.0",
"org.scalatest" % "scalatest_2.11" % "2.2.1", "org.scalatest" % "scalatest_2.11" % "2.2.1",
"org.yaml" % "snakeyaml" % "1.8" "org.yaml" % "snakeyaml" % "1.8"
), ),
name := "VexRiscv" name := "VexRiscv"
).dependsOn(spinalHdlSim,spinalHdlCore,spinalHdlLib) )//.dependsOn(spinalHdlSim,spinalHdlCore,spinalHdlLib)
lazy val spinalHdlSim = ProjectRef(file("../SpinalHDL"), "SpinalHDL-sim") //lazy val spinalHdlSim = ProjectRef(file("../SpinalHDL"), "SpinalHDL-sim")
lazy val spinalHdlCore = ProjectRef(file("../SpinalHDL"), "SpinalHDL-core") //lazy val spinalHdlCore = ProjectRef(file("../SpinalHDL"), "SpinalHDL-core")
lazy val spinalHdlLib = ProjectRef(file("../SpinalHDL"), "SpinalHDL-lib") //lazy val spinalHdlLib = ProjectRef(file("../SpinalHDL"), "SpinalHDL-lib")
addCompilerPlugin("org.scala-lang.plugins" % "scala-continuations-plugin_2.11.6" % "1.0.2")
scalacOptions += "-P:continuations:enable"
fork := true fork := true

2
project/build.properties
View File

@ -1 +1 @@
sbt.version=0.13.16 sbt.version=1.2.7

2
project/plugins.sbt
View File

@ -1,2 +1,2 @@
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.1") addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")