From e145b67c34a0bd1e0c7a22f3d8d3ea1f8d7cf4c9 Mon Sep 17 00:00:00 2001
From: Lorenzo Gabriele <lorenzolespaul@gmail.com>
Date: Tue, 14 Nov 2023 11:44:14 +0100
Subject: [PATCH 01/11] Add check for right Tests traits in ScalaJS and Native

---
 scalalib/src/mill/scalalib/ScalaModule.scala | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala
index 2071117b7ce..f9ed0c442ec 100644
--- a/scalalib/src/mill/scalalib/ScalaModule.scala
+++ b/scalalib/src/mill/scalalib/ScalaModule.scala
@@ -20,6 +20,19 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer =>
   type ScalaModuleTests = ScalaTests
 
   trait ScalaTests extends JavaModuleTests with ScalaModule {
+    require(
+      !Class.forName("mill.scalajslib.ScalaJSModule").isInstance(outer) || Class.forName(
+        "mill.scalajslib.ScalaJSModule$ScalaJSTests"
+      ).isInstance(this),
+      s"$outer is a `ScalaJSModule`. $this needs to extend `ScalaJSTests` instead of `ScalaTests`"
+    )
+    require(
+      !Class.forName("mill.scalanativelib.ScalaNativeModule").isInstance(outer) || Class.forName(
+        "mill.scalajslib.ScalaNativeModule$ScalaNativeTests"
+      ).isInstance(this),
+      s"$outer is a `ScalaNativeModule`. $this needs to extend `ScalaNativeTests` instead of `ScalaTests`"
+    )
+
     override def scalaOrganization: Target[String] = outer.scalaOrganization()
     override def scalaVersion: Target[String] = outer.scalaVersion()
     override def scalacPluginIvyDeps: Target[Agg[Dep]] = outer.scalacPluginIvyDeps()

From 13bf3b1192252c928275b4b76e2aa735309fcac1 Mon Sep 17 00:00:00 2001
From: Lorenzo Gabriele <lorenzolespaul@gmail.com>
Date: Tue, 14 Nov 2023 12:43:05 +0100
Subject: [PATCH 02/11] Pass check when we can't find the classes

---
 scalalib/src/mill/scalalib/ScalaModule.scala | 32 ++++++++++++--------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala
index f9ed0c442ec..b19df18e2d4 100644
--- a/scalalib/src/mill/scalalib/ScalaModule.scala
+++ b/scalalib/src/mill/scalalib/ScalaModule.scala
@@ -20,18 +20,26 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer =>
   type ScalaModuleTests = ScalaTests
 
   trait ScalaTests extends JavaModuleTests with ScalaModule {
-    require(
-      !Class.forName("mill.scalajslib.ScalaJSModule").isInstance(outer) || Class.forName(
-        "mill.scalajslib.ScalaJSModule$ScalaJSTests"
-      ).isInstance(this),
-      s"$outer is a `ScalaJSModule`. $this needs to extend `ScalaJSTests` instead of `ScalaTests`"
-    )
-    require(
-      !Class.forName("mill.scalanativelib.ScalaNativeModule").isInstance(outer) || Class.forName(
-        "mill.scalajslib.ScalaNativeModule$ScalaNativeTests"
-      ).isInstance(this),
-      s"$outer is a `ScalaNativeModule`. $this needs to extend `ScalaNativeTests` instead of `ScalaTests`"
-    )
+    try {
+      require(
+        !Class.forName("mill.scalajslib.ScalaJSModule").isInstance(outer) || Class.forName(
+          "mill.scalajslib.ScalaJSModule$ScalaJSTests"
+        ).isInstance(this),
+        s"$outer is a `ScalaJSModule`. $this needs to extend `ScalaJSTests` instead of `ScalaTests`"
+      )
+    } catch {
+      case _: ClassNotFoundException => // if we can't find the classes, we certainly are not in a ScalaJSModule
+    }
+    try {
+      require(
+        !Class.forName("mill.scalanativelib.ScalaNativeModule").isInstance(outer) || Class.forName(
+          "mill.scalajslib.ScalaNativeModule$ScalaNativeTests"
+        ).isInstance(this),
+        s"$outer is a `ScalaNativeModule`. $this needs to extend `ScalaNativeTests` instead of `ScalaTests`"
+      )
+    } catch {
+      case _: ClassNotFoundException => // if we can't find the classes, we certainly are not in a ScalaNativeModule
+    }
 
     override def scalaOrganization: Target[String] = outer.scalaOrganization()
     override def scalaVersion: Target[String] = outer.scalaVersion()

From 40ba02f88e9d0285f05dd8ffa9d9739776ddcc21 Mon Sep 17 00:00:00 2001
From: Lorenzo Gabriele <lorenzolespaul@gmail.com>
Date: Tue, 14 Nov 2023 14:46:42 +0100
Subject: [PATCH 03/11] Add tests and avoid `require`

---
 .../src/mill/scalajslib/HelloJSWorldTests.scala | 16 ++++++++++++++++
 scalalib/src/mill/scalalib/ScalaModule.scala    | 16 +++++++++-------
 .../scalanativelib/HelloNativeWorldTests.scala  | 17 +++++++++++++++++
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
index a899a4d58b6..6e5573180c1 100644
--- a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
+++ b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
@@ -62,6 +62,13 @@ object HelloJSWorldTests extends TestSuite {
       }
     }
 
+    object scalaTestsError extends ScalaJSModule {
+      val (scala, scalaJS) = matrix.head
+      def scalaVersion = scala
+      def scalaJSVersion = scalaJS
+      object test extends ScalaTests with TestModule.Utest
+    }
+
     object buildScalaTest extends Cross[BuildModuleScalaTest](matrix)
     trait BuildModuleScalaTest extends RootModule {
       object test extends ScalaJSTests with TestModule.ScalaTest {
@@ -272,6 +279,15 @@ object HelloJSWorldTests extends TestSuite {
       )
     }
 
+    test("extends-ScalaTests") {
+      val error = intercept[ExceptionInInitializerError] {
+        HelloJSWorld.scalaTestsError.test
+      }
+      assert(
+        error.getCause.getMessage == s"scalaTestsError is a `ScalaJSModule`. scalaTestsError.test needs to extend `ScalaJSTests` instead of `ScalaTests`"
+      )
+    }
+
     def checkRun(scalaVersion: String, scalaJSVersion: String): Unit = {
       val task = HelloJSWorld.helloJsWorld(scalaVersion, scalaJSVersion).run()
 
diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala
index b19df18e2d4..b92ae911169 100644
--- a/scalalib/src/mill/scalalib/ScalaModule.scala
+++ b/scalalib/src/mill/scalalib/ScalaModule.scala
@@ -21,20 +21,22 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer =>
 
   trait ScalaTests extends JavaModuleTests with ScalaModule {
     try {
-      require(
-        !Class.forName("mill.scalajslib.ScalaJSModule").isInstance(outer) || Class.forName(
+      if (
+        Class.forName("mill.scalajslib.ScalaJSModule").isInstance(outer) && !Class.forName(
           "mill.scalajslib.ScalaJSModule$ScalaJSTests"
-        ).isInstance(this),
+        ).isInstance(this)
+      ) throw new Exception(
         s"$outer is a `ScalaJSModule`. $this needs to extend `ScalaJSTests` instead of `ScalaTests`"
       )
     } catch {
       case _: ClassNotFoundException => // if we can't find the classes, we certainly are not in a ScalaJSModule
     }
     try {
-      require(
-        !Class.forName("mill.scalanativelib.ScalaNativeModule").isInstance(outer) || Class.forName(
-          "mill.scalajslib.ScalaNativeModule$ScalaNativeTests"
-        ).isInstance(this),
+      if (
+        Class.forName("mill.scalanativelib.ScalaNativeModule").isInstance(outer) && !Class.forName(
+          "mill.scalanativelib.ScalaNativeModule$ScalaNativeTests"
+        ).isInstance(this)
+      ) throw new Exception(
         s"$outer is a `ScalaNativeModule`. $this needs to extend `ScalaNativeTests` instead of `ScalaTests`"
       )
     } catch {
diff --git a/scalanativelib/test/src/mill/scalanativelib/HelloNativeWorldTests.scala b/scalanativelib/test/src/mill/scalanativelib/HelloNativeWorldTests.scala
index 618320d60af..8aed27edd89 100644
--- a/scalanativelib/test/src/mill/scalanativelib/HelloNativeWorldTests.scala
+++ b/scalanativelib/test/src/mill/scalanativelib/HelloNativeWorldTests.scala
@@ -68,6 +68,14 @@ object HelloNativeWorldTests extends TestSuite {
         )
       }
     }
+
+    object scalaTestsError extends ScalaNativeModule {
+      val (scala, scalaNative, _) = matrix.head
+      def scalaVersion = scala
+      def scalaNativeVersion = scalaNative
+      object test extends ScalaTests with TestModule.Utest
+    }
+
     object inherited extends ScalaNativeModule {
       val (scala, scalaNative, _) = matrix.head
       def scalacOptions = Seq("-deprecation")
@@ -230,6 +238,15 @@ object HelloNativeWorldTests extends TestSuite {
       testAllMatrix((scala, scalaNative, releaseMode) => checkRun(scala, scalaNative, releaseMode))
     }
 
+    test("extends-ScalaTests") {
+      val error = intercept[ExceptionInInitializerError] {
+        HelloNativeWorld.scalaTestsError.test
+      }
+      assert(
+        error.getCause.getMessage == s"scalaTestsError is a `ScalaNativeModule`. scalaTestsError.test needs to extend `ScalaNativeTests` instead of `ScalaTests`"
+      )
+    }
+
     def checkInheritedTargets[A](target: ScalaNativeModule => T[A], expected: A) = {
       val Right((mainResult, _)) = helloWorldEvaluator(target(HelloNativeWorld.inherited))
       val Right((testResult, _)) = helloWorldEvaluator(target(HelloNativeWorld.inherited.test))

From e86da7be39eeb08c4e97ef66055418740598590f Mon Sep 17 00:00:00 2001
From: Lorenzo Gabriele <lorenzolespaul@gmail.com>
Date: Tue, 14 Nov 2023 15:04:38 +0100
Subject: [PATCH 04/11] Reword exception message for ScalaNativeModule

Co-authored-by: Tobias Roeser <le.petit.fou@web.de>
---
 scalalib/src/mill/scalalib/ScalaModule.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala
index b92ae911169..d560fcd0ae5 100644
--- a/scalalib/src/mill/scalalib/ScalaModule.scala
+++ b/scalalib/src/mill/scalalib/ScalaModule.scala
@@ -37,7 +37,7 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer =>
           "mill.scalanativelib.ScalaNativeModule$ScalaNativeTests"
         ).isInstance(this)
       ) throw new Exception(
-        s"$outer is a `ScalaNativeModule`. $this needs to extend `ScalaNativeTests` instead of `ScalaTests`"
+        s"$outer is a `ScalaNativeModule`. $this needs to extend `ScalaNativeTests`."
       )
     } catch {
       case _: ClassNotFoundException => // if we can't find the classes, we certainly are not in a ScalaNativeModule

From 6a7482d7bb20273e6fdb0ec33bd3c2acbff92ecb Mon Sep 17 00:00:00 2001
From: Lorenzo Gabriele <lorenzolespaul@gmail.com>
Date: Tue, 14 Nov 2023 15:04:48 +0100
Subject: [PATCH 05/11] Reword exception message for ScalaJSModule

Co-authored-by: Tobias Roeser <le.petit.fou@web.de>
---
 scalalib/src/mill/scalalib/ScalaModule.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala
index d560fcd0ae5..6a8d87a71a6 100644
--- a/scalalib/src/mill/scalalib/ScalaModule.scala
+++ b/scalalib/src/mill/scalalib/ScalaModule.scala
@@ -26,7 +26,7 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer =>
           "mill.scalajslib.ScalaJSModule$ScalaJSTests"
         ).isInstance(this)
       ) throw new Exception(
-        s"$outer is a `ScalaJSModule`. $this needs to extend `ScalaJSTests` instead of `ScalaTests`"
+        s"$outer is a `ScalaJSModule`. $this needs to extend `ScalaJSTests`."
       )
     } catch {
       case _: ClassNotFoundException => // if we can't find the classes, we certainly are not in a ScalaJSModule

From e81ff21e9e820eb8f1295d9f8a43c2735c7e04f8 Mon Sep 17 00:00:00 2001
From: Lorenzo Gabriele <lorenzolespaul@gmail.com>
Date: Tue, 14 Nov 2023 15:07:41 +0100
Subject: [PATCH 06/11] Throw mill.api.MillException instead

---
 scalalib/src/mill/scalalib/ScalaModule.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala
index 6a8d87a71a6..72b6f1a6a68 100644
--- a/scalalib/src/mill/scalalib/ScalaModule.scala
+++ b/scalalib/src/mill/scalalib/ScalaModule.scala
@@ -1,7 +1,7 @@
 package mill
 package scalalib
 
-import mill.api.{DummyInputStream, JarManifest, PathRef, Result, SystemStreams, internal}
+import mill.api.{DummyInputStream, JarManifest, MillException, PathRef, Result, SystemStreams, internal}
 import mill.main.BuildInfo
 import mill.util.{Jvm, Util}
 import mill.util.Jvm.createJar
@@ -25,7 +25,7 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer =>
         Class.forName("mill.scalajslib.ScalaJSModule").isInstance(outer) && !Class.forName(
           "mill.scalajslib.ScalaJSModule$ScalaJSTests"
         ).isInstance(this)
-      ) throw new Exception(
+      ) throw new MillException(
         s"$outer is a `ScalaJSModule`. $this needs to extend `ScalaJSTests`."
       )
     } catch {
@@ -36,7 +36,7 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer =>
         Class.forName("mill.scalanativelib.ScalaNativeModule").isInstance(outer) && !Class.forName(
           "mill.scalanativelib.ScalaNativeModule$ScalaNativeTests"
         ).isInstance(this)
-      ) throw new Exception(
+      ) throw new MillException(
         s"$outer is a `ScalaNativeModule`. $this needs to extend `ScalaNativeTests`."
       )
     } catch {

From 4342a9a2251e5e938283f950615d92a7aab12016 Mon Sep 17 00:00:00 2001
From: Lorenzo Gabriele <lorenzolespaul@gmail.com>
Date: Tue, 14 Nov 2023 15:10:09 +0100
Subject: [PATCH 07/11] Fix error message in tests

---
 scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala     | 2 +-
 .../test/src/mill/scalanativelib/HelloNativeWorldTests.scala    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
index 6e5573180c1..9ec6afa1d39 100644
--- a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
+++ b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
@@ -284,7 +284,7 @@ object HelloJSWorldTests extends TestSuite {
         HelloJSWorld.scalaTestsError.test
       }
       assert(
-        error.getCause.getMessage == s"scalaTestsError is a `ScalaJSModule`. scalaTestsError.test needs to extend `ScalaJSTests` instead of `ScalaTests`"
+        error.getCause.getMessage == s"scalaTestsError is a `ScalaJSModule`. scalaTestsError.test needs to extend `ScalaJSTests`."
       )
     }
 
diff --git a/scalanativelib/test/src/mill/scalanativelib/HelloNativeWorldTests.scala b/scalanativelib/test/src/mill/scalanativelib/HelloNativeWorldTests.scala
index 8aed27edd89..34204024a21 100644
--- a/scalanativelib/test/src/mill/scalanativelib/HelloNativeWorldTests.scala
+++ b/scalanativelib/test/src/mill/scalanativelib/HelloNativeWorldTests.scala
@@ -243,7 +243,7 @@ object HelloNativeWorldTests extends TestSuite {
         HelloNativeWorld.scalaTestsError.test
       }
       assert(
-        error.getCause.getMessage == s"scalaTestsError is a `ScalaNativeModule`. scalaTestsError.test needs to extend `ScalaNativeTests` instead of `ScalaTests`"
+        error.getCause.getMessage == s"scalaTestsError is a `ScalaNativeModule`. scalaTestsError.test needs to extend `ScalaNativeTests`."
       )
     }
 

From 0f757d8735444da83319d5e7480c11a9cef8317d Mon Sep 17 00:00:00 2001
From: Lorenzo Gabriele <lorenzolespaul@gmail.com>
Date: Tue, 14 Nov 2023 23:09:42 +0100
Subject: [PATCH 08/11] Fix tests

---
 .../scalajslib/ScalaTestsErrorTests.scala     | 31 +++++++++++++++++++
 .../HelloNativeWorldTests.scala               | 16 ----------
 .../scalanativelib/ScalaTestsErrorTests.scala | 31 +++++++++++++++++++
 3 files changed, 62 insertions(+), 16 deletions(-)
 create mode 100644 scalajslib/test/src/mill/scalajslib/ScalaTestsErrorTests.scala
 create mode 100644 scalanativelib/test/src/mill/scalanativelib/ScalaTestsErrorTests.scala

diff --git a/scalajslib/test/src/mill/scalajslib/ScalaTestsErrorTests.scala b/scalajslib/test/src/mill/scalajslib/ScalaTestsErrorTests.scala
new file mode 100644
index 00000000000..8a9cb541b1b
--- /dev/null
+++ b/scalajslib/test/src/mill/scalajslib/ScalaTestsErrorTests.scala
@@ -0,0 +1,31 @@
+package mill.scalajslib
+
+import mill._
+import mill.define.Discover
+import mill.scalalib.TestModule
+import mill.util.TestUtil
+import utest._
+
+object ScalaTestsErrorTests extends TestSuite {
+  object ScalaTestsError extends TestUtil.BaseModule {
+    object scalaTestsError extends ScalaJSModule {
+      def scalaVersion = sys.props.getOrElse("TEST_SCALA_3_3_VERSION", ???)
+      def scalaJSVersion = sys.props.getOrElse("TEST_SCALAJS_VERSION", ???)
+      object test extends ScalaTests with TestModule.Utest
+    }
+
+    override lazy val millDiscover = Discover[this.type]
+  }
+
+  def tests: Tests = Tests {
+    test("extends-ScalaTests") {
+      val error = intercept[ExceptionInInitializerError] {
+        ScalaTestsError.scalaTestsError.test
+      }
+      val message = error.getCause.getMessage
+      assert(
+        message == s"scalaTestsError is a `ScalaJSModule`. scalaTestsError.test needs to extend `ScalaJSTests`."
+      )
+    }
+  }
+}
diff --git a/scalanativelib/test/src/mill/scalanativelib/HelloNativeWorldTests.scala b/scalanativelib/test/src/mill/scalanativelib/HelloNativeWorldTests.scala
index 34204024a21..453bfaa580b 100644
--- a/scalanativelib/test/src/mill/scalanativelib/HelloNativeWorldTests.scala
+++ b/scalanativelib/test/src/mill/scalanativelib/HelloNativeWorldTests.scala
@@ -69,13 +69,6 @@ object HelloNativeWorldTests extends TestSuite {
       }
     }
 
-    object scalaTestsError extends ScalaNativeModule {
-      val (scala, scalaNative, _) = matrix.head
-      def scalaVersion = scala
-      def scalaNativeVersion = scalaNative
-      object test extends ScalaTests with TestModule.Utest
-    }
-
     object inherited extends ScalaNativeModule {
       val (scala, scalaNative, _) = matrix.head
       def scalacOptions = Seq("-deprecation")
@@ -238,15 +231,6 @@ object HelloNativeWorldTests extends TestSuite {
       testAllMatrix((scala, scalaNative, releaseMode) => checkRun(scala, scalaNative, releaseMode))
     }
 
-    test("extends-ScalaTests") {
-      val error = intercept[ExceptionInInitializerError] {
-        HelloNativeWorld.scalaTestsError.test
-      }
-      assert(
-        error.getCause.getMessage == s"scalaTestsError is a `ScalaNativeModule`. scalaTestsError.test needs to extend `ScalaNativeTests`."
-      )
-    }
-
     def checkInheritedTargets[A](target: ScalaNativeModule => T[A], expected: A) = {
       val Right((mainResult, _)) = helloWorldEvaluator(target(HelloNativeWorld.inherited))
       val Right((testResult, _)) = helloWorldEvaluator(target(HelloNativeWorld.inherited.test))
diff --git a/scalanativelib/test/src/mill/scalanativelib/ScalaTestsErrorTests.scala b/scalanativelib/test/src/mill/scalanativelib/ScalaTestsErrorTests.scala
new file mode 100644
index 00000000000..af843d2102c
--- /dev/null
+++ b/scalanativelib/test/src/mill/scalanativelib/ScalaTestsErrorTests.scala
@@ -0,0 +1,31 @@
+package mill.scalanativelib
+
+import mill._
+import mill.define.Discover
+import mill.scalalib.TestModule
+import mill.util.TestUtil
+import utest._
+
+object ScalaTestsErrorTests extends TestSuite {
+  object ScalaTestsError extends TestUtil.BaseModule {
+    object scalaTestsError extends ScalaNativeModule {
+      def scalaVersion = sys.props.getOrElse("TEST_SCALA_3_3_VERSION", ???)
+      def scalaNativeVersion = sys.props.getOrElse("TEST_SCALANATIVE_VERSION", ???)
+      object test extends ScalaTests with TestModule.Utest
+    }
+
+    override lazy val millDiscover = Discover[this.type]
+  }
+
+  def tests: Tests = Tests {
+    test("extends-ScalaTests") {
+      val error = intercept[ExceptionInInitializerError] {
+        ScalaTestsError.scalaTestsError.test
+      }
+      val message = error.getCause.getMessage
+      assert(
+        message == s"scalaTestsError is a `ScalaNativeModule`. scalaTestsError.test needs to extend `ScalaNativeTests`."
+      )
+    }
+  }
+}

From b1055ac81e1e7b57b46ebbfd07cd86957a9ab632 Mon Sep 17 00:00:00 2001
From: Lorenzo Gabriele <lorenzolespaul@gmail.com>
Date: Tue, 14 Nov 2023 23:11:25 +0100
Subject: [PATCH 09/11] Remove duplicated tests

---
 .../src/mill/scalajslib/HelloJSWorldTests.scala  | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
index 9ec6afa1d39..a899a4d58b6 100644
--- a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
+++ b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
@@ -62,13 +62,6 @@ object HelloJSWorldTests extends TestSuite {
       }
     }
 
-    object scalaTestsError extends ScalaJSModule {
-      val (scala, scalaJS) = matrix.head
-      def scalaVersion = scala
-      def scalaJSVersion = scalaJS
-      object test extends ScalaTests with TestModule.Utest
-    }
-
     object buildScalaTest extends Cross[BuildModuleScalaTest](matrix)
     trait BuildModuleScalaTest extends RootModule {
       object test extends ScalaJSTests with TestModule.ScalaTest {
@@ -279,15 +272,6 @@ object HelloJSWorldTests extends TestSuite {
       )
     }
 
-    test("extends-ScalaTests") {
-      val error = intercept[ExceptionInInitializerError] {
-        HelloJSWorld.scalaTestsError.test
-      }
-      assert(
-        error.getCause.getMessage == s"scalaTestsError is a `ScalaJSModule`. scalaTestsError.test needs to extend `ScalaJSTests`."
-      )
-    }
-
     def checkRun(scalaVersion: String, scalaJSVersion: String): Unit = {
       val task = HelloJSWorld.helloJsWorld(scalaVersion, scalaJSVersion).run()
 

From f03c7b121dcf0800ee33a8eef3048b8974b8aee8 Mon Sep 17 00:00:00 2001
From: Lorenzo Gabriele <lorenzolespaul@gmail.com>
Date: Tue, 14 Nov 2023 23:20:26 +0100
Subject: [PATCH 10/11] Format code

---
 scalalib/src/mill/scalalib/ScalaModule.scala | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala
index 72b6f1a6a68..5a391444cb8 100644
--- a/scalalib/src/mill/scalalib/ScalaModule.scala
+++ b/scalalib/src/mill/scalalib/ScalaModule.scala
@@ -1,7 +1,15 @@
 package mill
 package scalalib
 
-import mill.api.{DummyInputStream, JarManifest, MillException, PathRef, Result, SystemStreams, internal}
+import mill.api.{
+  DummyInputStream,
+  JarManifest,
+  MillException,
+  PathRef,
+  Result,
+  SystemStreams,
+  internal
+}
 import mill.main.BuildInfo
 import mill.util.{Jvm, Util}
 import mill.util.Jvm.createJar

From e40203157115a8700d848581989f8597e4cb2105 Mon Sep 17 00:00:00 2001
From: Lorenzo Gabriele <lorenzolespaul@gmail.com>
Date: Tue, 14 Nov 2023 23:21:11 +0100
Subject: [PATCH 11/11] Revert line change

---
 .../test/src/mill/scalanativelib/HelloNativeWorldTests.scala     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scalanativelib/test/src/mill/scalanativelib/HelloNativeWorldTests.scala b/scalanativelib/test/src/mill/scalanativelib/HelloNativeWorldTests.scala
index 453bfaa580b..618320d60af 100644
--- a/scalanativelib/test/src/mill/scalanativelib/HelloNativeWorldTests.scala
+++ b/scalanativelib/test/src/mill/scalanativelib/HelloNativeWorldTests.scala
@@ -68,7 +68,6 @@ object HelloNativeWorldTests extends TestSuite {
         )
       }
     }
-
     object inherited extends ScalaNativeModule {
       val (scala, scalaNative, _) = matrix.head
       def scalacOptions = Seq("-deprecation")