Skip to content

Commit d1cfa01

Browse files
committed
compilation fixes
1 parent 149c3d3 commit d1cfa01

File tree

5 files changed

+5
-23
lines changed

5 files changed

+5
-23
lines changed

contrib/versionfile/src/mill/contrib/versionfile/Version.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ sealed trait Version {
3434
}
3535

3636
this match {
37-
case release: Release => Release.tupled(segments)
38-
case snapshot: Snapshot => Snapshot.tupled(segments)
37+
case release: Release => Release.apply.tupled(segments)
38+
case snapshot: Snapshot => Snapshot.apply.tupled(segments)
3939
}
4040
}
4141
}

main/define/src/mill/define/Discover.scala

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,6 @@ case class Discover private (
2727
private[define] def this(value: Map[Class[_], Seq[mainargs.MainData[_, _]]]) =
2828
this(value.view.mapValues((Nil, _)).toMap)
2929

30-
// Explicit copy, so we can use @targetName to avoid conflict with the other copy
31-
@annotation.targetName("copy2")
32-
def copy(
33-
value: Map[
34-
Class[_],
35-
(Seq[String], Seq[mainargs.MainData[_, _]])
36-
] = value,
37-
dummy: Int = dummy /* avoid conflict with Discover.apply(value: Map) below*/
38-
): Discover = new Discover(value, dummy)
39-
40-
// Explicit copy for bincompat
41-
def copy[T](
42-
value: Map[
43-
Class[_],
44-
(Seq[String], Seq[mainargs.MainData[_, _]])
45-
],
46-
dummy: Int /* avoid conflict with Discover.apply(value: Map) below*/
47-
): Discover = new Discover(value, dummy)
48-
49-
5030
@deprecated("Binary compatibility shim", "Mill 0.11.4")
5131
private[define] def copy(value: Map[Class[_], Seq[mainargs.MainData[_, _]]]): Discover = {
5232
new Discover(value.view.mapValues((Nil, _)).toMap, dummy)

main/eval/test/src/mill/eval/ModuleTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import mill.define.Discover
99
import utest._
1010

1111
object TestExternalModule extends mill.define.ExternalModule with mill.define.TaskModule {
12-
def defaultCommandName = "x"
12+
def defaultCommandName() = "x"
1313
def x = T { 13 }
1414
object inner extends mill.Module {
1515
def y = T { 17 }

scalanativelib/test/src/mill/scalanativelib/ExclusionsTests.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package mill.scalanativelib
22

3+
import mill.given
34
import mill.Agg
45
import mill.scalalib._
56
import mill.define.Discover

scalanativelib/test/src/mill/scalanativelib/FeaturesTests.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package mill.scalanativelib
22

3+
import mill.given
34
import mill.define.Discover
45
import mill.testkit.UnitTester
56
import mill.testkit.TestBaseModule

0 commit comments

Comments
 (0)