Skip to content

Commit 235367b

Browse files
lihaoyilihaoyi
authored
Rebootstrap (#5479)
1 parent 3ba698a commit 235367b

File tree

13 files changed

+36
-256
lines changed

13 files changed

+36
-256
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -325,11 +325,11 @@ jobs:
325325
buildcmd: |
326326
set -eux
327327
./mill -i mill.scalalib.scalafmt.ScalafmtModule/scalafmt --check + __.fix --check + mill.javalib.palantirformat.PalantirFormatModule/ --check + mill.kotlinlib.ktlint.KtlintModule/checkFormatAll
328-
mima:
329-
needs: build-linux
330-
uses: ./.github/workflows/post-build-raw.yml
331-
with:
332-
java-version: '17'
333-
buildcmd: |
334-
set -eux
335-
./mill -i __.mimaReportBinaryIssues
328+
# mima:
329+
# needs: build-linux
330+
# uses: ./.github/workflows/post-build-raw.yml
331+
# with:
332+
# java-version: '17'
333+
# buildcmd: |
334+
# set -eux
335+
# ./mill -i __.mimaReportBinaryIssues

‎build.mill‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//| mill-version: 1.0.0-RC3-31-eb2d11
1+
//| mill-version: 1.0.0-RC3-56-3ba698
22
//| mill-jvm-opts: ["-XX:NonProfiledCodeHeapSize=250m", "-XX:ReservedCodeCacheSize=500m"]
33
//| mill-opts: ["--jobs=0.5C"]
44

@@ -10,12 +10,12 @@ import millbuild.*
1010
//import com.github.lolgab.mill.mima.Mima
1111
import coursier.maven.MavenRepository
1212
import coursier.VersionConstraint
13-
import mill.vcs.VcsVersion
13+
import mill.util.VcsVersion
1414
//import com.goyeau.mill.scalafix.ScalafixModule
1515
import mill._
1616
import mill.util.Tasks
1717
import mill.scalalib._
18-
import mill.jvmlib.api.JvmWorkerUtil
18+
import mill.javalib.api.JvmWorkerUtil
1919
import mill.scalalib.publish._
2020
import mill.api.SelectMode
2121
import mill.T

‎ci/mill-bootstrap.patch‎

Lines changed: 0 additions & 220 deletions
Original file line numberDiff line numberDiff line change
@@ -1,220 +0,0 @@
1-
diff --git a/build.mill b/build.mill
2-
index c87279ddc31..ab3f79762c0 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 82bcca15874..7b019a583a6 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/javalib/package.mill b/libs/javalib/package.mill
68-
index 7b84504be3d..4b5b37db0f4 100644
69-
--- a/libs/javalib/package.mill
70-
+++ b/libs/javalib/package.mill
71-
@@ -6,7 +6,7 @@ import coursier.maven.MavenRepository
72-
import mill._
73-
import mill.util.Tasks
74-
import mill.scalalib._
75-
-import mill.jvmlib.api.JvmWorkerUtil
76-
+import mill.javalib.api.JvmWorkerUtil
77-
import mill.scalalib.publish._
78-
import mill.util.Jvm
79-
import mill.api.SelectMode
80-
diff --git a/libs/util/package.mill b/libs/util/package.mill
81-
index 15e100dce96..d245b62d774 100644
82-
--- a/libs/util/package.mill
83-
+++ b/libs/util/package.mill
84-
@@ -6,7 +6,7 @@ import mill.scalalib._
85-
import mill.contrib.buildinfo.BuildInfo
86-
import mill.T
87-
import mill.api.Cross
88-
-import mill.jvmlib.api.JvmWorkerUtil
89-
+import mill.javalib.api.JvmWorkerUtil
90-
import millbuild.*
91-
92-
/**
93-
diff --git a/mill-build/build.mill b/mill-build/build.mill
94-
index 154569714a3..79609fb5233 100644
95-
--- a/mill-build/build.mill
96-
+++ b/mill-build/build.mill
97-
@@ -10,7 +10,7 @@ object `package` extends MillBuildRootModule {
98-
override def mvnDeps = Seq(
99-
// Hardcode MIMA version so test-mill-bootstrap.sh works with
100-
// the locally-built `SNAPSHOT` version
101-
- mvn"com.github.lolgab::mill-mima_mill1.0.0-RC3:0.2.0-M4",
102-
+// mvn"com.github.lolgab::mill-mima_mill1.0.0-RC3:0.2.0-M4",
103-
mvn"net.sourceforge.htmlcleaner:htmlcleaner:2.29",
104-
// TODO: implement empty version for ivy deps as we do in import parser
105-
mvn"com.lihaoyi::mill-contrib-buildinfo:${mill.api.BuildInfo.millVersion}",
106-
diff --git a/mill-build/src/millbuild/Deps.scala b/mill-build/src/millbuild/Deps.scala
107-
index e636a30d4a1..0516ef73815 100644
108-
--- a/mill-build/src/millbuild/Deps.scala
109-
+++ b/mill-build/src/millbuild/Deps.scala
110-
@@ -1,7 +1,7 @@
111-
package millbuild
112-
113-
import mill.scalalib.*
114-
-import mill.jvmlib.api.*
115-
+import mill.javalib.api.*
116-
117-
object Deps {
118-
119-
diff --git a/mill-build/src/millbuild/MillScalaModule.scala b/mill-build/src/millbuild/MillScalaModule.scala
120-
index ceaeee3fc19..195b8c93d42 100644
121-
--- a/mill-build/src/millbuild/MillScalaModule.scala
122-
+++ b/mill-build/src/millbuild/MillScalaModule.scala
123-
@@ -2,7 +2,7 @@ package millbuild
124-
125-
import mill.*
126-
import mill.scalalib.*
127-
-import mill.jvmlib.api.JvmWorkerUtil
128-
+import mill.javalib.api.JvmWorkerUtil
129-
import mill.api.BuildCtx
130-
// import com.goyeau.mill.scalafix.ScalafixModule
131-
132-
diff --git a/mill-build/src/millbuild/MillStableScalaModule.scala b/mill-build/src/millbuild/MillStableScalaModule.scala
133-
index ef25e2a891f..11e78faf6da 100644
134-
--- a/mill-build/src/millbuild/MillStableScalaModule.scala
135-
+++ b/mill-build/src/millbuild/MillStableScalaModule.scala
136-
@@ -1,15 +1,15 @@
137-
package millbuild
138-
-import com.github.lolgab.mill.mima._
139-
+//import com.github.lolgab.mill.mima._
140-
import mill._, scalalib._
141-
142-
/** Publishable module which contains strictly handled API. */
143-
-trait MillStableScalaModule extends MillPublishScalaModule with Mima {
144-
+trait MillStableScalaModule extends MillPublishScalaModule /*with Mima*/ {
145-
146-
- override def mimaBinaryIssueFilters: T[Seq[ProblemFilter]] = Seq.empty[ProblemFilter]
147-
-
148-
- def mimaPreviousVersions: T[Seq[String]] = Settings.mimaBaseVersions
149-
-
150-
- def mimaPreviousArtifacts: T[Seq[Dep]] = Task {
151-
+// override def mimaBinaryIssueFilters: T[Seq[ProblemFilter]] = Seq.empty[ProblemFilter]
152-
+//
153-
+// def mimaPreviousVersions: T[Seq[String]] = Settings.mimaBaseVersions
154-
+//
155-
+// def mimaPreviousArtifacts: T[Seq[Dep]] = Task {
156-
// Settings.mimaBaseVersions
157-
// .map({ version =>
158-
// val patchedSuffix = {
159-
@@ -27,8 +27,8 @@ trait MillStableScalaModule extends MillPublishScalaModule with Mima {
160-
// val patchedId = artifactName() + patchedSuffix
161-
// mvn"${pomSettings().organization}:${patchedId}:${version}"
162-
// })
163-
- Seq.empty[Dep]
164-
- }
165-
-
166-
- def mimaExcludeAnnotations = Seq("mill.api.internal.internal", "mill.api.experimental")
167-
+// Seq.empty[Dep]
168-
+// }
169-
+//
170-
+// def mimaExcludeAnnotations = Seq("mill.api.internal.internal", "mill.api.experimental")
171-
}
172-
diff --git a/website/package.mill b/website/package.mill
173-
index 9b215a2dfc2..3184bc4112d 100644
174-
--- a/website/package.mill
175-
+++ b/website/package.mill
176-
@@ -105,7 +105,7 @@ object `package` extends mill.Module {
177-
178-
expandDiagramsInDirectoryAdocFile(
179-
Task.dest,
180-
- mill.main.VisualizeModule.toolsClasspath().map(_.path)
181-
+ mill.util.VisualizeModule.toolsClasspath().map(_.path)
182-
)
183-
184-
PathRef(Task.dest)
185-
@@ -171,7 +171,7 @@ object `package` extends mill.Module {
186-
}
187-
188-
mill.util.Jvm.callProcess(
189-
- mainClass = "mill.main.graphviz.GraphvizTools",
190-
+ mainClass = "mill.graphviz.GraphvizTools",
191-
classPath = visualizeClassPath.toSeq,
192-
mainArgs = orderedDiagrams.map { case (p, i, src, dest) =>
193-
Task.log.debug(s"Rendering graphviz: ${p} (${i}) to ${dest}")
194-
@@ -233,7 +233,7 @@ object `package` extends mill.Module {
195-
os.copy(blogFolder0().path, Task.dest, mergeFolders = true)
196-
expandDiagramsInDirectoryAdocFile(
197-
Task.dest,
198-
- mill.main.VisualizeModule.toolsClasspath().map(_.path)
199-
+ mill.util.VisualizeModule.toolsClasspath().map(_.path)
200-
)
201-
PathRef(Task.dest)
202-
}
203-
@@ -304,7 +304,7 @@ object `package` extends mill.Module {
204-
)
205-
206-
def oldDocSources = Task {
207-
- Task.traverse(oldDocs.items.map(_.module))(_.value.oldDocSource)()
208-
+ Task.traverse(oldDocs.items.map(_.module))(_().oldDocSource)()
209-
}
210-
211-
object oldDocs extends Cross[OldDocModule](versionLabels)
212-
@@ -352,7 +352,7 @@ object `package` extends mill.Module {
213-
214-
expandDiagramsInDirectoryAdocFile(
215-
outputFolder,
216-
- mill.main.VisualizeModule.toolsClasspath().map(_.path)
217-
+ mill.util.VisualizeModule.toolsClasspath().map(_.path)
218-
)
219-
220-
val useOldDownloadUrl =

‎contrib/package.mill‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import coursier.maven.MavenRepository
55
import mill._
66
import mill.util.Tasks
77
import mill.scalalib._
8-
import mill.jvmlib.api.JvmWorkerUtil
8+
import mill.javalib.api.JvmWorkerUtil
99
import mill.scalalib.publish._
1010
import mill.util.Jvm
1111
import mill.api.SelectMode

‎example/package.mill‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import coursier.maven.MavenRepository
55
import mill.*
66
import mill.util.Tasks
77
import mill.scalalib.*
8-
import mill.jvmlib.api.JvmWorkerUtil
8+
import mill.javalib.api.JvmWorkerUtil
99
import mill.scalalib.publish.*
1010
import mill.util.Jvm
1111
import mill.api.SelectMode

‎integration/package.mill‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import coursier.maven.MavenRepository
55
import mill._
66
import mill.util.Tasks
77
import mill.scalalib._
8-
import mill.jvmlib.api.JvmWorkerUtil
8+
import mill.javalib.api.JvmWorkerUtil
99
import mill.scalalib.publish._
1010
import mill.util.Jvm
1111
import mill.api.SelectMode
1212
import mill.contrib.buildinfo.BuildInfo
1313
import mill.T
1414
import mill.api.Cross
15-
import mill.testrunner.TestResult
15+
import mill.javalib.testrunner.TestResult
1616
import millbuild.*
1717
import upickle.implicits.namedTuples.default.given
1818
import mill.api.BuildCtx

‎libs/javalib/package.mill‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import coursier.maven.MavenRepository
66
import mill._
77
import mill.util.Tasks
88
import mill.scalalib._
9-
import mill.jvmlib.api.JvmWorkerUtil
9+
import mill.javalib.api.JvmWorkerUtil
1010
import mill.scalalib.publish._
1111
import mill.util.Jvm
1212
import mill.api.SelectMode

‎libs/util/package.mill‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import mill.scalalib._
66
import mill.contrib.buildinfo.BuildInfo
77
import mill.T
88
import mill.api.Cross
9-
import mill.jvmlib.api.JvmWorkerUtil
9+
import mill.javalib.api.JvmWorkerUtil
1010
import millbuild.*
1111

1212
/**

‎mill-build/build.mill‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ object `package` extends MillBuildRootModule {
1010
override def mvnDeps = Seq(
1111
// Hardcode MIMA version so test-mill-bootstrap.sh works with
1212
// the locally-built `SNAPSHOT` version
13-
mvn"com.github.lolgab::mill-mima_mill1.0.0-RC3:0.2.0-M4",
13+
// mvn"com.github.lolgab::mill-mima_mill1.0.0-RC3:0.2.0-M4",
1414
mvn"net.sourceforge.htmlcleaner:htmlcleaner:2.29",
1515
// TODO: implement empty version for ivy deps as we do in import parser
1616
mvn"com.lihaoyi::mill-contrib-buildinfo:${mill.api.BuildInfo.millVersion}",

‎mill-build/src/millbuild/Deps.scala‎

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

33
import mill.scalalib.*
4-
import mill.jvmlib.api.*
4+
import mill.javalib.api.*
55

66
object Deps {
77

0 commit comments

Comments
 (0)