Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make Target type abstract to allow overriding by different concrete implementations #2402

Merged
merged 18 commits into from
Apr 3, 2023
Merged

Make Target type abstract to allow overriding by different concrete implementations #2402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
74400b5
main tests pass
lihaoyi Apr 2, 2023
7849a7f
fix
lihaoyi Apr 2, 2023
3da2dcb
.
lihaoyi Apr 2, 2023
88876c0
.
lihaoyi Apr 2, 2023
58269ae
.
lihaoyi Apr 2, 2023
21d2a61
.
lihaoyi Apr 2, 2023
2014d51
.
lihaoyi Apr 2, 2023
a1a3f48
.
lihaoyi Apr 2, 2023
f05a297
kill CachedTarget
lihaoyi Apr 3, 2023
1a9686e
cleanup
lihaoyi Apr 3, 2023
a534e90
merge
lihaoyi Apr 3, 2023
21ea325
simplify Labelled
lihaoyi Apr 3, 2023
905011b
privatize
lihaoyi Apr 3, 2023
e8902a7
resurrect NamedTask
lihaoyi Apr 3, 2023
3fbb315
.
lihaoyi Apr 3, 2023
33a87a6
.
lihaoyi Apr 3, 2023
3ebaed3
Merge branch 'main' into abstract-target
lihaoyi Apr 3, 2023
dcb7d9f
.
lihaoyi Apr 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/web/4-webapp-scalajs/build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ object app extends RootModule with ScalaModule{
ivy"com.lihaoyi::scalatags:0.12.0"
)

def resources = T.sources{
def resources = T{
os.makeDir(T.dest / "webapp")
val jsPath = client.fastLinkJS().dest.path
// Move the main.js[.map] files into the proper filesystem position
Expand Down
2 changes: 1 addition & 1 deletion example/web/5-webapp-scalajs-shared/build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ object app extends RootModule with AppScalaModule{

def ivyDeps = Agg(ivy"com.lihaoyi::cask:0.9.0")

def resources = T.sources{
def resources = T{
os.makeDir(T.dest / "webapp")
val jsPath = client.fastLinkJS().dest.path
os.copy(jsPath / "main.js", T.dest / "webapp" / "main.js")
Expand Down
18 changes: 6 additions & 12 deletions main/core/src/mill/define/Discover.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,14 @@ object Discover {
cases: (Type, Int, String)*
): Unit = {
for (m <- methods.toList) {
for ((tt, n, label) <- cases) {
if (
m.returnType <:< tt &&
m.paramLists.length != n
) {
c.abort(
cases
.find{case (tt, n, label) => m.returnType <:< tt}
.foreach{case (tt, n, label) =>
if (m.paramLists.length != n) c.abort(
m.pos,
s"$label definitions must have $n parameter list" + (if (n == 1) "" else "s")
)
}
}
}
}
val mapping = for {
Expand All @@ -84,11 +81,8 @@ object Discover {
overridesRoutes = {
assertParamListCounts(
methods,
(weakTypeOf[mill.define.Sources], 0, "`T.sources`"),
(weakTypeOf[mill.define.Input[_]], 0, "`T.input`"),
(weakTypeOf[mill.define.Persistent[_]], 0, "`T.persistent`"),
(weakTypeOf[mill.define.Target[_]], 0, "`T{...}`"),
(weakTypeOf[mill.define.Command[_]], 1, "`T.command`")
(weakTypeOf[mill.define.Command[_]], 1, "`T.command`"),
(weakTypeOf[mill.define.Target[_]], 0, "Target"),
)

for {
Expand Down
Loading