Skip to content

Commit 90f0ecb

Browse files
lihaoyilihaoyi
authored
Rename jvmlib to javalib, consolidate mill.{vcs,main,util} into mill.util, flesh out Scaladoc (#5469)
1 parent 5651a1e commit 90f0ecb

File tree

488 files changed

+742
-437
lines changed

Some content is hidden

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

488 files changed

+742
-437
lines changed

‎.github/workflows/run-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
install-sbt: true
140140

141141
- java-version: 17
142-
millargs: "'libs.{main,jvmlib,testrunner,vcs,androidlib,graphviz,init,tabcomplete}.__.test'"
142+
millargs: "'libs.{util,javalib,androidlib,graphviz,init,tabcomplete}.__.test'"
143143
install-android-sdk: false
144144
install-sbt: true
145145

@@ -265,7 +265,7 @@ jobs:
265265
# * One job each for local/packaged/native tests
266266
# * At least one job for each of fork/server tests, and example/integration tests
267267
- java-version: 11
268-
millargs: '"libs.{main,jvmlib}.__.test"'
268+
millargs: '"libs.{util,javalib}.__.test"'
269269
install-sbt: false
270270

271271
- java-version: 11

‎.scalafmt.conf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ project {
2727
# don't try to format files that are purposefully malformed / misformatted
2828
"glob:**/example/scalalib/linting/1-scalafmt/src/Foo.scala",
2929
"glob:**/example/**/*-spotless*/**",
30-
"glob:**/jvmlib/test/resources/checkstyle/**",
30+
"glob:**/javalib/test/resources/checkstyle/**",
3131
"glob:**/init/test/resources/giter8/hello.g8/src/main/g8/build.mill",
32-
"glob:**/jvmlib/test/resources/javalib/palantirformat/**",
32+
"glob:**/javalib/test/resources/javalib/palantirformat/**",
3333
"glob:**/integration/failure/parse-error/**",
3434
"glob:**/testkit/test/resources/example-test-example-project/build.mill",
35-
"glob:**/jvmlib/test/resources/scalafmt/**",
36-
"glob:**/jvmlib/test/resources/spotless/**"
35+
"glob:**/javalib/test/resources/scalafmt/**",
36+
"glob:**/javalib/test/resources/spotless/**"
3737
]
3838
}
3939

‎ci/mill-bootstrap.patch‎

Lines changed: 181 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,118 @@
1+
diff --git a/build.mill b/build.mill
2+
index bb60d3b7bee..78ec19509ea 100644
3+
--- a/build.mill
4+
+++ b/build.mill
5+
@@ -10,12 +10,12 @@ import millbuild.*
6+
//import com.github.lolgab.mill.mima.Mima
7+
import coursier.maven.MavenRepository
8+
import coursier.VersionConstraint
9+
-import mill.vcs.VcsVersion
10+
+import mill.util.VcsVersion
11+
//import com.goyeau.mill.scalafix.ScalafixModule
12+
import mill._
13+
import mill.util.Tasks
14+
import mill.scalalib._
15+
-import mill.jvmlib.api.JvmWorkerUtil
16+
+import mill.javalib.api.JvmWorkerUtil
17+
import mill.scalalib.publish._
18+
import mill.api.SelectMode
19+
import mill.T
20+
diff --git a/contrib/package.mill b/contrib/package.mill
21+
index 38f05bccde9..1cbbd237d33 100644
22+
--- a/contrib/package.mill
23+
+++ b/contrib/package.mill
24+
@@ -5,7 +5,7 @@ import coursier.maven.MavenRepository
25+
import mill._
26+
import mill.util.Tasks
27+
import mill.scalalib._
28+
-import mill.jvmlib.api.JvmWorkerUtil
29+
+import mill.javalib.api.JvmWorkerUtil
30+
import mill.scalalib.publish._
31+
import mill.util.Jvm
32+
import mill.api.SelectMode
33+
diff --git a/example/package.mill b/example/package.mill
34+
index 78f55ecd24c..34caed3efcb 100644
35+
--- a/example/package.mill
36+
+++ b/example/package.mill
37+
@@ -5,7 +5,7 @@ import coursier.maven.MavenRepository
38+
import mill.*
39+
import mill.util.Tasks
40+
import mill.scalalib.*
41+
-import mill.jvmlib.api.JvmWorkerUtil
42+
+import mill.javalib.api.JvmWorkerUtil
43+
import mill.scalalib.publish.*
44+
import mill.util.Jvm
45+
import mill.api.SelectMode
46+
diff --git a/integration/package.mill b/integration/package.mill
47+
index 7f1e9cd2894..0040ffa3b5f 100644
48+
--- a/integration/package.mill
49+
+++ b/integration/package.mill
50+
@@ -5,14 +5,14 @@ import coursier.maven.MavenRepository
51+
import mill._
52+
import mill.util.Tasks
53+
import mill.scalalib._
54+
-import mill.jvmlib.api.JvmWorkerUtil
55+
+import mill.javalib.api.JvmWorkerUtil
56+
import mill.scalalib.publish._
57+
import mill.util.Jvm
58+
import mill.api.SelectMode
59+
import mill.contrib.buildinfo.BuildInfo
60+
import mill.T
61+
import mill.api.Cross
62+
-import mill.testrunner.TestResult
63+
+import mill.javalib.testrunner.TestResult
64+
import millbuild.*
65+
import upickle.implicits.namedTuples.default.given
66+
import mill.api.BuildCtx
67+
diff --git a/libs/graphviz/src/mill/main/graphviz/GraphvizTools.scala b/libs/graphviz/src/mill/main/graphviz/GraphvizTools.scala
68+
index d8b6b26d356..832c39a3388 100644
69+
--- a/libs/graphviz/src/mill/main/graphviz/GraphvizTools.scala
70+
+++ b/libs/graphviz/src/mill/main/graphviz/GraphvizTools.scala
71+
@@ -1,4 +1,4 @@
72+
-package mill.main.graphviz
73+
+package mill.graphviz
74+
75+
import com.caoccao.javet.annotations.V8Function
76+
import com.caoccao.javet.interception.logging.JavetStandardConsoleInterceptor
77+
diff --git a/libs/javalib/package.mill b/libs/javalib/package.mill
78+
index 7b84504be3d..4b5b37db0f4 100644
79+
--- a/libs/javalib/package.mill
80+
+++ b/libs/javalib/package.mill
81+
@@ -6,7 +6,7 @@ import coursier.maven.MavenRepository
82+
import mill._
83+
import mill.util.Tasks
84+
import mill.scalalib._
85+
-import mill.jvmlib.api.JvmWorkerUtil
86+
+import mill.javalib.api.JvmWorkerUtil
87+
import mill.scalalib.publish._
88+
import mill.util.Jvm
89+
import mill.api.SelectMode
90+
diff --git a/libs/util/package.mill b/libs/util/package.mill
91+
index 15e100dce96..d245b62d774 100644
92+
--- a/libs/util/package.mill
93+
+++ b/libs/util/package.mill
94+
@@ -6,7 +6,7 @@ import mill.scalalib._
95+
import mill.contrib.buildinfo.BuildInfo
96+
import mill.T
97+
import mill.api.Cross
98+
-import mill.jvmlib.api.JvmWorkerUtil
99+
+import mill.javalib.api.JvmWorkerUtil
100+
import millbuild.*
101+
102+
/**
103+
diff --git a/libs/util/src/mill/util/VisualizeModule.scala b/libs/util/src/mill/util/VisualizeModule.scala
104+
index b752a184106..884554784e5 100644
105+
--- a/libs/util/src/mill/util/VisualizeModule.scala
106+
+++ b/libs/util/src/mill/util/VisualizeModule.scala
107+
@@ -155,7 +155,7 @@ object VisualizeModule extends ExternalModule {
108+
g = g.graphAttr().`with`(Rank.dir(RankDir.LEFT_TO_RIGHT))
109+
110+
mill.util.Jvm.callProcess(
111+
- mainClass = "mill.main.graphviz.GraphvizTools",
112+
+ mainClass = "mill.graphviz.GraphvizTools",
113+
classPath = toolsClasspath().map(_.path).toVector,
114+
mainArgs = Seq(s"${os.temp(g.toString)};$dest;txt,dot,json,png,svg"),
115+
stdin = os.Inherit,
1116
diff --git a/mill-build/build.mill b/mill-build/build.mill
2117
index 154569714a3..79609fb5233 100644
3118
--- a/mill-build/build.mill
@@ -11,6 +126,32 @@ index 154569714a3..79609fb5233 100644
11126
mvn"net.sourceforge.htmlcleaner:htmlcleaner:2.29",
12127
// TODO: implement empty version for ivy deps as we do in import parser
13128
mvn"com.lihaoyi::mill-contrib-buildinfo:${mill.api.BuildInfo.millVersion}",
129+
diff --git a/mill-build/src/millbuild/Deps.scala b/mill-build/src/millbuild/Deps.scala
130+
index e636a30d4a1..0516ef73815 100644
131+
--- a/mill-build/src/millbuild/Deps.scala
132+
+++ b/mill-build/src/millbuild/Deps.scala
133+
@@ -1,7 +1,7 @@
134+
package millbuild
135+
136+
import mill.scalalib.*
137+
-import mill.jvmlib.api.*
138+
+import mill.javalib.api.*
139+
140+
object Deps {
141+
142+
diff --git a/mill-build/src/millbuild/MillScalaModule.scala b/mill-build/src/millbuild/MillScalaModule.scala
143+
index ceaeee3fc19..195b8c93d42 100644
144+
--- a/mill-build/src/millbuild/MillScalaModule.scala
145+
+++ b/mill-build/src/millbuild/MillScalaModule.scala
146+
@@ -2,7 +2,7 @@ package millbuild
147+
148+
import mill.*
149+
import mill.scalalib.*
150+
-import mill.jvmlib.api.JvmWorkerUtil
151+
+import mill.javalib.api.JvmWorkerUtil
152+
import mill.api.BuildCtx
153+
// import com.goyeau.mill.scalafix.ScalafixModule
154+
14155
diff --git a/mill-build/src/millbuild/MillStableScalaModule.scala b/mill-build/src/millbuild/MillStableScalaModule.scala
15156
index ef25e2a891f..11e78faf6da 100644
16157
--- a/mill-build/src/millbuild/MillStableScalaModule.scala
@@ -51,3 +192,43 @@ index ef25e2a891f..11e78faf6da 100644
51192
+//
52193
+// def mimaExcludeAnnotations = Seq("mill.api.internal.internal", "mill.api.experimental")
53194
}
195+
diff --git a/website/package.mill b/website/package.mill
196+
index dd0965f8778..ee1476b87fa 100644
197+
--- a/website/package.mill
198+
+++ b/website/package.mill
199+
@@ -105,7 +105,7 @@ object `package` extends mill.Module {
200+
201+
expandDiagramsInDirectoryAdocFile(
202+
Task.dest,
203+
- mill.main.VisualizeModule.toolsClasspath().map(_.path)
204+
+ mill.util.VisualizeModule.toolsClasspath().map(_.path)
205+
)
206+
207+
PathRef(Task.dest)
208+
@@ -171,7 +171,7 @@ object `package` extends mill.Module {
209+
}
210+
211+
mill.util.Jvm.callProcess(
212+
- mainClass = "mill.main.graphviz.GraphvizTools",
213+
+ mainClass = "mill.graphviz.GraphvizTools",
214+
classPath = visualizeClassPath.toSeq,
215+
mainArgs = orderedDiagrams.map { case (p, i, src, dest) =>
216+
Task.log.debug(s"Rendering graphviz: ${p} (${i}) to ${dest}")
217+
@@ -233,7 +233,7 @@ object `package` extends mill.Module {
218+
os.copy(blogFolder0().path, Task.dest, mergeFolders = true)
219+
expandDiagramsInDirectoryAdocFile(
220+
Task.dest,
221+
- mill.main.VisualizeModule.toolsClasspath().map(_.path)
222+
+ mill.util.VisualizeModule.toolsClasspath().map(_.path)
223+
)
224+
PathRef(Task.dest)
225+
}
226+
@@ -352,7 +352,7 @@ object `package` extends mill.Module {
227+
228+
expandDiagramsInDirectoryAdocFile(
229+
outputFolder,
230+
- mill.main.VisualizeModule.toolsClasspath().map(_.path)
231+
+ mill.util.VisualizeModule.toolsClasspath().map(_.path)
232+
)
233+
234+
val useOldDownloadUrl =

0 commit comments

Comments
 (0)