From 3b204876090a877e2e4b6be938974e8543928fee Mon Sep 17 00:00:00 2001
From: Edmund Higham <edhigham@gmail.com>
Date: Tue, 17 Dec 2024 17:41:24 -0500
Subject: [PATCH] [query] Make `memory` follow mill module structure

---
 hail/build.mill                                        | 10 +++++-----
 .../src/debug}/is/hail/annotations/Memory.java         |  0
 .../src/release}/is/hail/annotations/Memory.java       |  0
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename hail/modules/{src/debug/java => memory/src/debug}/is/hail/annotations/Memory.java (100%)
 rename hail/modules/{src/release/java => memory/src/release}/is/hail/annotations/Memory.java (100%)

diff --git a/hail/build.mill b/hail/build.mill
index 9afdd012661c..a0c8cb1750f8 100644
--- a/hail/build.mill
+++ b/hail/build.mill
@@ -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(
@@ -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]] =
@@ -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"
 
@@ -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(
diff --git a/hail/modules/src/debug/java/is/hail/annotations/Memory.java b/hail/modules/memory/src/debug/is/hail/annotations/Memory.java
similarity index 100%
rename from hail/modules/src/debug/java/is/hail/annotations/Memory.java
rename to hail/modules/memory/src/debug/is/hail/annotations/Memory.java
diff --git a/hail/modules/src/release/java/is/hail/annotations/Memory.java b/hail/modules/memory/src/release/is/hail/annotations/Memory.java
similarity index 100%
rename from hail/modules/src/release/java/is/hail/annotations/Memory.java
rename to hail/modules/memory/src/release/is/hail/annotations/Memory.java