diff --git a/.gitignore b/.gitignore index f4406576..12c0f6ad 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ src/main/scala/dsptools/sandbox.sc test_run_dir/ *.fir *.f -*.anno +*.anno.json ### XilinxISE template # intermediate build files @@ -345,4 +345,4 @@ project/plugins/project/ hs_err_pid* # ignore lib from rocket build -lib \ No newline at end of file +lib diff --git a/build.sbt b/build.sbt index e291440d..fd9638b1 100644 --- a/build.sbt +++ b/build.sbt @@ -1,14 +1,14 @@ // See LICENSE for license details. val defaultVersions = Map( - "chisel3" -> "3.4-SNAPSHOT", - "chisel-iotesters" -> "1.5-SNAPSHOT" + "chisel3" -> "3.4.+", + "chisel-iotesters" -> "1.5.+" ) lazy val commonSettings = Seq( organization := "edu.berkeley.cs", version := "0.1-SNAPSHOT", - scalaVersion := "2.12.8", + scalaVersion := "2.12.10", scalacOptions := Seq("-deprecation", "-feature", "-language:reflectiveCalls", "-Xsource:2.11"), libraryDependencies ++= Seq("chisel3","chisel-iotesters").map { dep: String => "edu.berkeley.cs" %% dep % sys.props.getOrElse(dep + "Version", defaultVersions(dep)) @@ -19,7 +19,8 @@ lazy val commonSettings = Seq( ), resolvers ++= Seq( Resolver.sonatypeRepo("snapshots"), - Resolver.sonatypeRepo("releases") + Resolver.sonatypeRepo("releases"), + Resolver.mavenLocal ) ) @@ -29,21 +30,16 @@ lazy val mdf = (project in file("mdf/scalalib")) lazy val macros = (project in file("macros")) .dependsOn(mdf) .settings(commonSettings) - .settings(Seq( + .settings( libraryDependencies ++= Seq( - "edu.berkeley.cs" %% "firrtl-interpreter" % "1.4.0" % Test + "edu.berkeley.cs" %% "firrtl-interpreter" % "1.4.+" % Test ), mainClass := Some("barstools.macros.MacroCompiler") - )) + ) .enablePlugins(sbtassembly.AssemblyPlugin) lazy val tapeout = (project in file("tapeout")) .settings(commonSettings) - .settings(Seq( - libraryDependencies ++= Seq( - "io.github.daviddenton" %% "handlebars-scala-fork" % "2.3.0" - ) - )) .settings(scalacOptions in Test ++= Seq("-language:reflectiveCalls")) lazy val root = (project in file(".")).aggregate(macros, tapeout) diff --git a/project/build.properties b/project/build.properties index 72f90289..0837f7a1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.7 +sbt.version=1.3.13