Skip to content

Commit

Permalink
[query] Make memory follow mill module structure
Browse files Browse the repository at this point in the history
  • Loading branch information
ehigham authored and patrick-schultz committed Dec 17, 2024
1 parent 51abd7d commit 3b20487
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions hail/build.mill
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ object Deps {
}
}

trait HailScalaModule extends SbtModule with ScalafmtModule with ScalafixModule { outer =>
trait HailScalaModule extends ScalafmtModule with ScalafixModule { outer =>
override def scalaVersion: T[String] = build.env.scalaVersion()

override def javacOptions: T[Seq[String]] = Seq(
Expand Down Expand Up @@ -107,7 +107,7 @@ trait HailScalaModule extends SbtModule with ScalafmtModule with ScalafixModule
override def bspCompileClasspath: T[Agg[UnresolvedPath]] =
super.bspCompileClasspath() ++ resources().map(p => UnresolvedPath.ResolvedPath(p.path))

trait HailTests extends SbtTests with TestNg with ScalafmtModule with ScalafixModule {
trait HailTests extends ScalafmtModule with ScalafixModule with TestNg {
override def forkArgs: T[Seq[String]] = Seq("-Xss4m", "-Xmx4096M")

override def ivyDeps: T[Agg[Dep]] =
Expand All @@ -125,7 +125,7 @@ trait HailScalaModule extends SbtModule with ScalafmtModule with ScalafixModule
}
}

object `package` extends RootModule with HailScalaModule { outer =>
object `package` extends RootModule with SbtModule with HailScalaModule { outer =>

override def millSourcePath: Path = super.millSourcePath / "modules"

Expand Down Expand Up @@ -263,11 +263,11 @@ object `package` extends RootModule with HailScalaModule { outer =>
)

override def sources: T[Seq[PathRef]] = Task.Sources {
Seq(PathRef(this.millSourcePath / os.up / "src" / env.debugOrRelease() / "java"))
Seq(PathRef(this.millSourcePath / "src" / env.debugOrRelease()))
}
}

object test extends HailTests {
object test extends SbtTests with HailTests {
override def resources: T[Seq[PathRef]] = outer.resources() ++ super.resources()

override def assemblyRules: Seq[Rule] = outer.assemblyRules ++ Seq(
Expand Down

0 comments on commit 3b20487

Please sign in to comment.