|
| 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/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, |
| 116 | +diff --git a/mill-build/build.mill b/mill-build/build.mill |
| 117 | +index 154569714a3..79609fb5233 100644 |
| 118 | +--- a/mill-build/build.mill |
| 119 | ++++ b/mill-build/build.mill |
| 120 | +@@ -10,7 +10,7 @@ object `package` extends MillBuildRootModule { |
| 121 | + override def mvnDeps = Seq( |
| 122 | + // Hardcode MIMA version so test-mill-bootstrap.sh works with |
| 123 | + // the locally-built `SNAPSHOT` version |
| 124 | +- mvn"com.github.lolgab::mill-mima_mill1.0.0-RC3:0.2.0-M4", |
| 125 | ++// mvn"com.github.lolgab::mill-mima_mill1.0.0-RC3:0.2.0-M4", |
| 126 | + mvn"net.sourceforge.htmlcleaner:htmlcleaner:2.29", |
| 127 | + // TODO: implement empty version for ivy deps as we do in import parser |
| 128 | + 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 | + |
| 155 | +diff --git a/mill-build/src/millbuild/MillStableScalaModule.scala b/mill-build/src/millbuild/MillStableScalaModule.scala |
| 156 | +index ef25e2a891f..11e78faf6da 100644 |
| 157 | +--- a/mill-build/src/millbuild/MillStableScalaModule.scala |
| 158 | ++++ b/mill-build/src/millbuild/MillStableScalaModule.scala |
| 159 | +@@ -1,15 +1,15 @@ |
| 160 | + package millbuild |
| 161 | +-import com.github.lolgab.mill.mima._ |
| 162 | ++//import com.github.lolgab.mill.mima._ |
| 163 | + import mill._, scalalib._ |
| 164 | + |
| 165 | + /** Publishable module which contains strictly handled API. */ |
| 166 | +-trait MillStableScalaModule extends MillPublishScalaModule with Mima { |
| 167 | ++trait MillStableScalaModule extends MillPublishScalaModule /*with Mima*/ { |
| 168 | + |
| 169 | +- override def mimaBinaryIssueFilters: T[Seq[ProblemFilter]] = Seq.empty[ProblemFilter] |
| 170 | +- |
| 171 | +- def mimaPreviousVersions: T[Seq[String]] = Settings.mimaBaseVersions |
| 172 | +- |
| 173 | +- def mimaPreviousArtifacts: T[Seq[Dep]] = Task { |
| 174 | ++// override def mimaBinaryIssueFilters: T[Seq[ProblemFilter]] = Seq.empty[ProblemFilter] |
| 175 | ++// |
| 176 | ++// def mimaPreviousVersions: T[Seq[String]] = Settings.mimaBaseVersions |
| 177 | ++// |
| 178 | ++// def mimaPreviousArtifacts: T[Seq[Dep]] = Task { |
| 179 | + // Settings.mimaBaseVersions |
| 180 | + // .map({ version => |
| 181 | + // val patchedSuffix = { |
| 182 | +@@ -27,8 +27,8 @@ trait MillStableScalaModule extends MillPublishScalaModule with Mima { |
| 183 | + // val patchedId = artifactName() + patchedSuffix |
| 184 | + // mvn"${pomSettings().organization}:${patchedId}:${version}" |
| 185 | + // }) |
| 186 | +- Seq.empty[Dep] |
| 187 | +- } |
| 188 | +- |
| 189 | +- def mimaExcludeAnnotations = Seq("mill.api.internal.internal", "mill.api.experimental") |
| 190 | ++// Seq.empty[Dep] |
| 191 | ++// } |
| 192 | ++// |
| 193 | ++// def mimaExcludeAnnotations = Seq("mill.api.internal.internal", "mill.api.experimental") |
| 194 | + } |
| 195 | +diff --git a/website/package.mill b/website/package.mill |
| 196 | +index 9b215a2dfc2..3184bc4112d 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 | +@@ -304,7 +304,7 @@ object `package` extends mill.Module { |
| 227 | + ) |
| 228 | + |
| 229 | + def oldDocSources = Task { |
| 230 | +- Task.traverse(oldDocs.items.map(_.module))(_.value.oldDocSource)() |
| 231 | ++ Task.traverse(oldDocs.items.map(_.module))(_().oldDocSource)() |
| 232 | + } |
| 233 | + |
| 234 | + object oldDocs extends Cross[OldDocModule](versionLabels) |
| 235 | +@@ -352,7 +352,7 @@ object `package` extends mill.Module { |
| 236 | + |
| 237 | + expandDiagramsInDirectoryAdocFile( |
| 238 | + outputFolder, |
| 239 | +- mill.main.VisualizeModule.toolsClasspath().map(_.path) |
| 240 | ++ mill.util.VisualizeModule.toolsClasspath().map(_.path) |
| 241 | + ) |
| 242 | + |
| 243 | + val useOldDownloadUrl = |
0 commit comments