Skip to content

Commit 2e1c8c8

Browse files
lihaoyilihaoyi
committed
.
1 parent 7b1e999 commit 2e1c8c8

File tree

7 files changed

+7
-96
lines changed

7 files changed

+7
-96
lines changed

‎build.mill‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import millbuild.*
99
//import com.github.lolgab.mill.mima.Mima
1010
import coursier.maven.MavenRepository
1111
import coursier.VersionConstraint
12-
import mill.main.VcsVersion
12+
import mill.vcs.VcsVersion
1313
//import com.goyeau.mill.scalafix.ScalafixModule
1414
import mill._
15-
import mill.main.Tasks
15+
import mill.util.Tasks
1616
import mill.scalalib._
1717
import mill.scalalib.api.JvmWorkerUtil
1818
import mill.scalalib.publish._

‎ci/mill-bootstrap.patch‎

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +0,0 @@
1-
diff --git a/build.mill b/build.mill
2-
index 1fb72584691..29d0956b258 100644
3-
--- a/build.mill
4-
+++ b/build.mill
5-
@@ -9,10 +9,10 @@ import millbuild.*
6-
//import com.github.lolgab.mill.mima.Mima
7-
import coursier.maven.MavenRepository
8-
import coursier.VersionConstraint
9-
-import mill.main.VcsVersion
10-
+import mill.vcs.VcsVersion
11-
//import com.goyeau.mill.scalafix.ScalafixModule
12-
import mill._
13-
-import mill.main.Tasks
14-
+import mill.util.Tasks
15-
import mill.scalalib._
16-
import mill.scalalib.api.JvmWorkerUtil
17-
import mill.scalalib.publish._
18-
diff --git a/contrib/package.mill b/contrib/package.mill
19-
index 3d75cbc5d80..dada6a4e9ec 100644
20-
--- a/contrib/package.mill
21-
+++ b/contrib/package.mill
22-
@@ -3,7 +3,7 @@ package build.contrib
23-
import scala.util.chaining._
24-
import coursier.maven.MavenRepository
25-
import mill._
26-
-import mill.main.Tasks
27-
+import mill.util.Tasks
28-
import mill.scalalib._
29-
import mill.scalalib.api.JvmWorkerUtil
30-
import mill.scalalib.publish._
31-
diff --git a/dist/package.mill b/dist/package.mill
32-
index ce5a5c8583c..661635bb67b 100644
33-
--- a/dist/package.mill
34-
+++ b/dist/package.mill
35-
@@ -305,10 +305,6 @@ object `package` extends MillJavaModule with DistModule {
36-
// "--enable-monitoring=jvmstat,heapdump"
37-
)
38-
39-
- def jvmWorker = ModuleRef(JvmWorkerGraalvm)
40-
-
41-
- object JvmWorkerGraalvm extends JvmWorkerModule {
42-
- def jvmId = Settings.graalvmJvmId
43-
- }
44-
+ def jvmId = Settings.graalvmJvmId
45-
}
46-
}
47-
diff --git a/example/package.mill b/example/package.mill
48-
index 18f8eadea6f..779fd4d6d37 100644
49-
--- a/example/package.mill
50-
+++ b/example/package.mill
51-
@@ -3,7 +3,7 @@ package build.example
52-
import scala.util.chaining._
53-
import coursier.maven.MavenRepository
54-
import mill._
55-
-import mill.main.Tasks
56-
+import mill.util.Tasks
57-
import mill.scalalib._
58-
import mill.scalalib.api.JvmWorkerUtil
59-
import mill.scalalib.publish._
60-
diff --git a/integration/package.mill b/integration/package.mill
61-
index 87321df4887..1c084983f03 100644
62-
--- a/integration/package.mill
63-
+++ b/integration/package.mill
64-
@@ -3,7 +3,7 @@ package build.integration
65-
import scala.util.chaining._
66-
import coursier.maven.MavenRepository
67-
import mill._
68-
-import mill.main.Tasks
69-
+import mill.util.Tasks
70-
import mill.scalalib._
71-
import mill.scalalib.api.JvmWorkerUtil
72-
import mill.scalalib.publish._
73-
diff --git a/libs/scalalib/package.mill b/libs/scalalib/package.mill
74-
index c0bc8cb7dce..454d41b6107 100644
75-
--- a/libs/scalalib/package.mill
76-
+++ b/libs/scalalib/package.mill
77-
@@ -4,7 +4,7 @@ import scala.util.chaining._
78-
79-
import coursier.maven.MavenRepository
80-
import mill._
81-
-import mill.main.Tasks
82-
+import mill.util.Tasks
83-
import mill.scalalib._
84-
import mill.scalalib.api.JvmWorkerUtil
85-
import mill.scalalib.publish._

‎contrib/package.mill‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package build.contrib
33
import scala.util.chaining._
44
import coursier.maven.MavenRepository
55
import mill._
6-
import mill.main.Tasks
6+
import mill.util.Tasks
77
import mill.scalalib._
88
import mill.scalalib.api.JvmWorkerUtil
99
import mill.scalalib.publish._

‎dist/package.mill‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -307,10 +307,6 @@ object `package` extends MillJavaModule with DistModule {
307307
// "--enable-monitoring=jvmstat,heapdump"
308308
)
309309

310-
def jvmWorker = ModuleRef(JvmWorkerGraalvm)
311-
312-
object JvmWorkerGraalvm extends JvmWorkerModule {
313-
def jvmId = Settings.graalvmJvmId
314-
}
310+
def jvmId = Settings.graalvmJvmId
315311
}
316312
}

‎example/package.mill‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package build.example
33
import scala.util.chaining._
44
import coursier.maven.MavenRepository
55
import mill._
6-
import mill.main.Tasks
6+
import mill.util.Tasks
77
import mill.scalalib._
88
import mill.scalalib.api.JvmWorkerUtil
99
import mill.scalalib.publish._

‎integration/package.mill‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package build.integration
33
import scala.util.chaining._
44
import coursier.maven.MavenRepository
55
import mill._
6-
import mill.main.Tasks
6+
import mill.util.Tasks
77
import mill.scalalib._
88
import mill.scalalib.api.JvmWorkerUtil
99
import mill.scalalib.publish._

‎libs/scalalib/package.mill‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import scala.util.chaining._
44

55
import coursier.maven.MavenRepository
66
import mill._
7-
import mill.main.Tasks
7+
import mill.util.Tasks
88
import mill.scalalib._
99
import mill.scalalib.api.JvmWorkerUtil
1010
import mill.scalalib.publish._

0 commit comments

Comments
 (0)