From 92065a1a10af5f910f55a01b280b2aef2a9d2460 Mon Sep 17 00:00:00 2001
From: Dolu1990 <charles.papon.90@gmail.com>
Date: Sun, 30 Dec 2018 15:51:46 +0100
Subject: [PATCH] Update to SpinalHDL 1.3.0

---
 build.sbt                | 16 +++++++---------
 project/build.properties |  2 +-
 project/plugins.sbt      |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/build.sbt b/build.sbt
index 2185132..3075bba 100644
--- a/build.sbt
+++ b/build.sbt
@@ -25,22 +25,20 @@ lazy val root = (project in file(".")).
   settings(
     inThisBuild(List(
       organization := "com.github.spinalhdl",
-      scalaVersion := "2.11.6",
+      scalaVersion := "2.11.12",
       version      := "1.0.0"
     )),
     libraryDependencies ++= Seq(
-//        "com.github.spinalhdl" % "spinalhdl-core_2.11" % "1.2.2",
-//        "com.github.spinalhdl" % "spinalhdl-lib_2.11" % "1.2.2",
+        "com.github.spinalhdl" % "spinalhdl-core_2.11" % "1.3.0",
+        "com.github.spinalhdl" % "spinalhdl-lib_2.11" % "1.3.0",
         "org.scalatest" % "scalatest_2.11" % "2.2.1",
         "org.yaml" % "snakeyaml" % "1.8"
     ),
     name := "VexRiscv"
-  ).dependsOn(spinalHdlSim,spinalHdlCore,spinalHdlLib)
-lazy val spinalHdlSim = ProjectRef(file("../SpinalHDL"), "SpinalHDL-sim")
-lazy val spinalHdlCore = ProjectRef(file("../SpinalHDL"), "SpinalHDL-core")
-lazy val spinalHdlLib = ProjectRef(file("../SpinalHDL"), "SpinalHDL-lib")
+  )//.dependsOn(spinalHdlSim,spinalHdlCore,spinalHdlLib)
+//lazy val spinalHdlSim = ProjectRef(file("../SpinalHDL"), "SpinalHDL-sim")
+//lazy val spinalHdlCore = ProjectRef(file("../SpinalHDL"), "SpinalHDL-core")
+//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
\ No newline at end of file
diff --git a/project/build.properties b/project/build.properties
index c091b86..72f9028 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.16
+sbt.version=1.2.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 9190bbb..e5c4233 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.1")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")