Skip to content

Commit 498b87c

Browse files
authored
Remove requirement to extends RootModule (#5008)
Fixes #4971 With this PR, any top-level `object package` in a `build.mill` or `package.mill` file has the `extends RootModule` or `extends SubfolderModule` automatically inserted. Before this PR we were already over-writing the `extends RootModule` with the correct type, so this just makes it insert the correct type even when `extends RootModule` is not provided (although we still require that it extends some kind of `mill.Module`). If there is an existing `extends RootModule`, we accept that for now to ease in the migration
1 parent ee30b0a commit 498b87c

File tree

100 files changed

+121
-109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+121
-109
lines changed

example/extending/metabuild/4-meta-build/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package build
33
import mill._, scalalib._
44
import scalatags.Text.all._
55

6-
object `package` extends RootModule with ScalaModule {
6+
object `package` extends ScalaModule {
77
def scalaVersion = "2.13.4"
88
def mvnDeps = Seq(
99
mvn"com.lihaoyi::scalatags:${millbuild.DepVersions.scalatagsVersion}",

example/extending/metabuild/5-meta-shared-sources/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package build
22

33
import mill._, scalalib._
44

5-
object `package` extends RootModule with ScalaModule {
5+
object `package` extends ScalaModule {
66
def scalaVersion = millbuild.ScalaVersion.myScalaVersion
77
// Add (or replace) source folders for the module to use
88
def customSources = Task.Sources("mill-build/src")

example/extending/plugins/7-writing-mill-plugins/myplugin/test/resources/example-test-project/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package build
44

55
import mill._, myplugin._
66

7-
object `package` extends RootModule with LineCountJavaModule {
7+
object `package` extends LineCountJavaModule {
88
def lineCountResourceFileName = "line-count.txt"
99
}
1010

example/extending/plugins/7-writing-mill-plugins/myplugin/test/resources/integration-test-project/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ package build
44

55
import mill._, myplugin._
66

7-
object `package` extends RootModule with LineCountJavaModule {
7+
object `package` extends LineCountJavaModule {
88
def lineCountResourceFileName = "line-count.txt"
99
}

example/fundamentals/modules/7-root-module/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package build
55
import mill._, javalib._
66

7-
object `package` extends RootModule with JavaModule {
7+
object `package` extends JavaModule {
88
def mvnDeps = Seq(
99
mvn"net.sourceforge.argparse4j:argparse4j:0.9.0",
1010
mvn"org.thymeleaf:thymeleaf:3.1.1.RELEASE"

example/javalib/dependencies/1-mvn-deps/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package build
33
import mill._, javalib._
44

5-
object `package` extends RootModule with JavaModule {
5+
object `package` extends JavaModule {
66
def mvnDeps = Seq(
77
mvn"com.fasterxml.jackson.core:jackson-databind:2.13.4"
88
)

example/javalib/dependencies/3-unmanaged-jars/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package build
33
import mill._, javalib._
44

5-
object `package` extends RootModule with JavaModule {
5+
object `package` extends JavaModule {
66
def unmanagedClasspath = Task {
77
if (!os.exists(moduleDir / "lib")) Seq()
88
else Seq.from(os.list(moduleDir / "lib").map(PathRef(_)))

example/javalib/dependencies/4-downloading-unmanaged-jars/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package build
33
import mill._, javalib._
44

5-
object `package` extends RootModule with JavaModule {
5+
object `package` extends JavaModule {
66
def unmanagedClasspath = Task {
77
if (Task.offline) Task.fail("Cannot download classpath when in offline-mode") // <1>
88
else {

example/javalib/linting/1-error-prone/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package build
88

99
import mill._, javalib._, errorprone._
1010

11-
object `package` extends RootModule with JavaModule with ErrorProneModule {
11+
object `package` extends JavaModule with ErrorProneModule {
1212
def errorProneOptions = Seq("-XepAllErrorsAsWarnings")
1313
}
1414

example/javalib/linting/2-checkstyle/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package build
55
import mill._, javalib._, checkstyle._
66

7-
object `package` extends RootModule with CheckstyleModule {
7+
object `package` extends CheckstyleModule {
88
def checkstyleVersion = "9.3"
99
}
1010

0 commit comments

Comments
 (0)