From 4f1f9fce47a41d7d1a3e1eb1f065dce03d5873ea Mon Sep 17 00:00:00 2001 From: Tynan McAuley Date: Wed, 2 Feb 2022 15:37:28 -0800 Subject: [PATCH] Remove sbt subproject "tapeout" Now barstools should be easier to compose in multi-project sbt projects, such as Chipyard. Resolves ucb-bar/barstools#117. --- build.sbt | 57 +++++++++++++++++++++---------------------------------- 1 file changed, 22 insertions(+), 35 deletions(-) diff --git a/build.sbt b/build.sbt index ca8d0639..67d09427 100644 --- a/build.sbt +++ b/build.sbt @@ -5,39 +5,26 @@ val defaultVersions = Map( "chisel-iotesters" -> "2.5-SNAPSHOT" ) -lazy val commonSettings = Seq( - organization := "edu.berkeley.cs", - version := "0.4-SNAPSHOT", - scalaVersion := "2.12.13", - crossScalaVersions := Seq("2.12.13", "2.13.6"), - scalacOptions := Seq("-deprecation", "-feature", "-language:reflectiveCalls"), - libraryDependencies ++= Seq("chisel3","chisel-iotesters").map { - dep: String => "edu.berkeley.cs" %% dep % sys.props.getOrElse(dep + "Version", defaultVersions(dep)) - }, - libraryDependencies ++= Seq( - "com.typesafe.play" %% "play-json" % "2.9.2", - "org.scalatest" %% "scalatest" % "3.2.9" % "test", - "org.apache.logging.log4j" % "log4j-api" % "2.11.2", - "org.apache.logging.log4j" % "log4j-core" % "2.11.2" - ), - resolvers ++= Seq( - Resolver.sonatypeRepo("snapshots"), - Resolver.sonatypeRepo("releases"), - Resolver.mavenLocal - ) +organization := "edu.berkeley.cs" +version := "0.4-SNAPSHOT" +name := "tapeout" +scalaVersion := "2.12.13" +crossScalaVersions := Seq("2.12.13", "2.13.6") +scalacOptions := Seq("-deprecation", "-feature", "-language:reflectiveCalls") +Test / scalacOptions ++= Seq("-language:reflectiveCalls") +fork := true +mainClass := Some("barstools.macros.MacroCompiler") +libraryDependencies ++= Seq("chisel3","chisel-iotesters").map { + dep: String => "edu.berkeley.cs" %% dep % sys.props.getOrElse(dep + "Version", defaultVersions(dep)) +} +libraryDependencies ++= Seq( + "com.typesafe.play" %% "play-json" % "2.9.2", + "org.scalatest" %% "scalatest" % "3.2.9" % "test", + "org.apache.logging.log4j" % "log4j-api" % "2.11.2", + "org.apache.logging.log4j" % "log4j-core" % "2.11.2" +) +resolvers ++= Seq( + Resolver.sonatypeRepo("snapshots"), + Resolver.sonatypeRepo("releases"), + Resolver.mavenLocal ) - -//disablePlugins(sbtassembly.AssemblyPlugin) -// -//enablePlugins(sbtassembly.AssemblyPlugin) - -lazy val tapeout = (project in file(".")) - .settings(commonSettings) - .settings(scalacOptions in Test ++= Seq("-language:reflectiveCalls")) - .settings(fork := true) - .settings( - mainClass := Some("barstools.macros.MacroCompiler") - ) - .enablePlugins(sbtassembly.AssemblyPlugin) - -//lazy val root = (project in file(".")).aggregate(tapeout)