Skip to content

Commit

Permalink
cleanup build.sc and remove unnecessary dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
kammoh committed Feb 1, 2024
1 parent 9782756 commit 10021e6
Showing 1 changed file with 7 additions and 32 deletions.
39 changes: 7 additions & 32 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,13 @@ object ivys {
val ivyVersions = Map(
"org.chipsalliance::chisel" -> "6.0.0",
"org.chipsalliance:::chisel-plugin" -> "$chisel",
"edu.berkeley.cs::chiseltest" -> "6.0.0",
"edu.berkeley.cs::firrtl2" -> "$chiseltest",
"org.scalatest::scalatest" -> "3.2.17",
"org.scalacheck::scalacheck" -> "1.17.0",
"org.scalatestplus::scalacheck-1-17" -> "3.2.17.0",
"com.lihaoyi::mainargs" -> "0.5.4",
"com.outr::scribe" -> "3.13.0",
"com.lihaoyi::pprint" -> "0.8.1",
"com.lihaoyi::os-lib" -> "0.9.2",
"org.json4s::json4s-jackson" -> "4.0.7",
"org.scala-lang.modules::scala-parallel-collections" -> "1.0.4",
"com.lihaoyi::utest" -> "0.8.2",
"org.scalanlp::breeze" -> "2.1.0",
"com.chuusai::shapeless" -> "2.3.10",
"com.github.jnr:jnr-ffi" -> "2.2.15",
"edu.berkeley.cs::chiseltest" -> "6.0-LOCAL-SNAPSHOT",
"com.lihaoyi::mainargs" -> "0.5.4+",
"org.scala-lang:scala-reflect" -> scalaVersion,
"com.typesafe.play::play-json" -> "2.10.4"
"com.typesafe.play::play-json" -> "2.10.4+"
)

val nameMap = Map.from(ivyVersions.map { case (k, v) =>
lazy val nameMap = Map.from(ivyVersions.map { case (k, v) =>
val kSplit = k.split(':')
kSplit.last -> (k, v)
})
Expand Down Expand Up @@ -79,32 +66,22 @@ trait CommonScalaModule
with ScalafmtModule {
override def scalaVersion = ivys.scalaVersion

def noWarnUnused = Seq(
"-Wconf:cat=unused:silent"
)

def noWarn = Seq(
// "-Wconf::s",
)

override def scalacOptions = Seq(
// checks
"-deprecation",
"-feature",
"-Xcheckinit",
// warnings
"-Wunused",
// "-Wunused",
"-Xlint:adapted-args",
"-Wconf:cat=unused&msg=parameter .* in .* never used:silent",
"-Wconf:src=dependencies/.*:silent"
)
}

// For modules not support mill yet, need to have a ScalaModule depend on our own repositories.
trait ChiselModule extends CommonScalaModule {
override def ivyDeps = super.ivyDeps() ++ Agg(
dep("chisel"),
dep("scala-reflect")
dep("chisel")
)

override def scalacPluginIvyDeps = Agg(
Expand All @@ -126,9 +103,7 @@ trait InnerChiselTestModule
extends CommonScalaModule
with TestModule.ScalaTest {
override def ivyDeps = super.ivyDeps() ++ Agg(
dep("chiseltest"),//.excludeName("chisel", "chisel-plugin", "scalatest"),
dep("scalatest"),
dep("scalacheck")
dep("chiseltest")
)
}

Expand Down

0 comments on commit 10021e6

Please sign in to comment.