diff --git a/.gitignore b/.gitignore index aebe1a5..3544346 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ project/ +/.bsp/ target/ obj_dir/ out/ @@ -24,4 +25,4 @@ samples/micropython samples/hello_world/hello_world.bin samples/hello_world/hello_world.elf samples/hello_world/hello_world.o -samples/hello_world/head.o \ No newline at end of file +samples/hello_world/head.o diff --git a/build.sbt b/build.sbt index bc089e0..c3ce280 100644 --- a/build.sbt +++ b/build.sbt @@ -1,58 +1,25 @@ // See README.md for license details. -def scalacOptionsVersion(scalaVersion: String): Seq[String] = { - Seq() ++ { - // If we're building with Scala > 2.11, enable the compile option - // switch to support our anonymous Bundle definitions: - // https://github.com/scala/bug/issues/10047 - CrossVersion.partialVersion(scalaVersion) match { - case Some((2, scalaMajor: Long)) if scalaMajor < 12 => Seq() - case _ => Seq("-Xsource:2.11") - } - } -} -def javacOptionsVersion(scalaVersion: String): Seq[String] = { - Seq() ++ { - // Scala 2.12 requires Java 8. We continue to generate - // Java 7 compatible code for Scala 2.11 - // for compatibility with old clients. - CrossVersion.partialVersion(scalaVersion) match { - case Some((2, scalaMajor: Long)) if scalaMajor < 12 => - Seq("-source", "1.7", "-target", "1.7") - case _ => - Seq("-source", "1.8", "-target", "1.8") - } - } -} +ThisBuild / scalaVersion := "2.12.12" +ThisBuild / version := "3.2.0" -name := "chisel-module-template" -version := "3.2.0" - -scalaVersion := "2.12.10" - -crossScalaVersions := Seq("2.12.10", "2.11.12") - -resolvers ++= Seq( - Resolver.sonatypeRepo("snapshots"), - Resolver.sonatypeRepo("releases") -) - -// Provide a managed dependency on X if -DXVersion="" is supplied on the command line. -val defaultVersions = Map( - "chisel3" -> "3.2.+", - "chisel-iotesters" -> "1.3.+" +lazy val root = (project in file(".")) + .settings( + name := "chiselwatt", + libraryDependencies ++= Seq( + "edu.berkeley.cs" %% "chisel3" % "3.4.1", + "edu.berkeley.cs" %% "chiseltest" % "0.3.1" % "test" + "edu.berkeley.cs" %% "scalatest" % "3.0.4" % "test" + ), + scalacOptions ++= Seq( + "-Xsource:2.11", + "-language:reflectiveCalls", + "-deprecation", + "-feature", + "-Xcheckinit" + ), + addCompilerPlugin("edu.berkeley.cs" % "chisel3-plugin" % "3.4.1" cross CrossVersion.full), + addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full) ) - -libraryDependencies ++= Seq("chisel3","chisel-iotesters").map { - dep: String => "edu.berkeley.cs" %% dep % sys.props.getOrElse(dep + "Version", defaultVersions(dep)) } - -scalacOptions ++= scalacOptionsVersion(scalaVersion.value) - -javacOptions ++= javacOptionsVersion(scalaVersion.value) - -scalacOptions ++= Seq("-unchecked", "-deprecation", "-language:reflectiveCalls", "-feature") -scalacOptions ++= Seq("-Ywarn-value-discard", "-Ywarn-dead-code", "-Ywarn-unused") - -libraryDependencies += "edu.berkeley.cs" %% "chiseltest" % "0.2-SNAPSHOT"