8000 Update bootstap patch file by lefou · Pull Request #4562 · com-lihaoyi/mill · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Update bootstap patch file #4562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2025
Merged

Update bootstap patch file #4562

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions ci/mill-bootstrap.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/build.mill b/build.mill
index 019adfc8cb9..c9df11158ef 100644
index 93bd1656426..9d704ff7fbc 100644
--- a/build.mill
+++ b/build.mill
@@ -1,16 +1,16 @@
Expand All @@ -23,7 +23,7 @@ index 019adfc8cb9..c9df11158ef 100644
import mill.T
import mill.define.Cross

@@ -284,19 +284,19 @@ object Deps {
@@ -288,19 +288,19 @@ object Deps {
}

def millVersion: T[String] = Task.Input {
Expand All @@ -47,7 +47,7 @@ index 019adfc8cb9..c9df11158ef 100644
}

def millDownloadPrefix = Task {
@@ -316,7 +316,7 @@ def millBinPlatform: T[String] = Task {
@@ -320,7 +320,7 @@ def millBinPlatform: T[String] = Task {
"0.11"
}

Expand All @@ -56,7 +56,7 @@ index 019adfc8cb9..c9df11158ef 100644

val essentialBridgeScalaVersions =
Seq(Deps.scalaVersion, Deps.scala2Version, Deps.workerScalaVersion212)
@@ -463,7 +463,7 @@ trait MillPublishJavaModule extends MillJavaModule with PublishModule {
@@ -468,7 +468,7 @@ trait MillPublishJavaModule extends MillJavaModule with PublishModule {
/**
* Some custom scala settings and test convenience
*/
Expand All @@ -65,7 +65,7 @@ index 019adfc8cb9..c9df11158ef 100644
def scalaVersion = Deps.scalaVersion
def scalapVersion: T[String] = Deps.scala2Version
def scalafixScalaBinaryVersion = T {
@@ -520,8 +520,8 @@ trait MillScalaModule extends ScalaModule with MillJavaModule with ScalafixModul
@@ -525,8 +525,8 @@ trait MillScalaModule extends ScalaModule with MillJavaModule with ScalafixModul
val binaryVersion = ZincWorkerUtil.scalaBinaryVersion(sv)
val hasModuleDefs = binaryVersion == "2.13" || binaryVersion == "3"
super.scalacPluginIvyDeps() ++
Expand All @@ -76,7 +76,7 @@ index 019adfc8cb9..c9df11158ef 100644
}

def mandatoryIvyDeps = T {
@@ -529,13 +529,13 @@ trait MillScalaModule extends ScalaModule with MillJavaModule with ScalafixModul
@@ -534,13 +534,13 @@ trait MillScalaModule extends ScalaModule with MillJavaModule with ScalafixModul
val binaryVersion = ZincWorkerUtil.scalaBinaryVersion(sv)
val hasModuleDefs = binaryVersion == "2.13" || binaryVersion == "3"
super.mandatoryIvyDeps() ++
Expand All @@ -92,7 +92,7 @@ index 019adfc8cb9..c9df11158ef 100644
def scalafixConfig = T { Some(T.workspace / ".scalafix.conf") }
def forkArgs = super.forkArgs() ++ outer.testArgs()
def moduleDeps = outer.testModuleDeps
@@ -575,7 +575,8 @@ trait MillBaseTestsModule extends TestModule {
@@ -580,7 +580,8 @@ trait MillBaseTestsModule extends TestModule {
trait MillPublishScalaModule extends MillScalaModule with MillPublishJavaModule

/** Publishable module which contains strictly handled API. */
Expand All @@ -102,7 +102,7 @@ index 019adfc8cb9..c9df11158ef 100644
import com.github.lolgab.mill.mima._
override def mimaBinaryIssueFilters: T[Seq[ProblemFilter]] = Seq(
// (5x) MIMA doesn't properly ignore things which are nested inside other private things
@@ -705,7 +706,7 @@ trait MillStableScalaModule extends MillPublishScalaModule with Mima {
@@ -710,7 +711,7 @@ trait MillStableScalaModule extends MillPublishScalaModule with Mima {
def skipPreviousVersions: T[Seq[String]] = T {
T.log.info("Skipping mima for previous versions (!!1000s of errors due to Scala 3)")
mimaPreviousVersions() // T(Seq.empty[String])
Expand Down Expand Up @@ -193,7 +193,7 @@ index e49f218f4be..9d03aa073f3 100644
def ivyDeps = Task {
if (!caseName.contains("realistic") && !caseName.contains("sourcecode")) super.ivyDeps()
diff --git a/dist/package.mill b/dist/package.mill
index fbbeacbc843..04b53aaf2f2 100644
index fbbeacbc843..fb06c486273 100644
--- a/dist/package.mill
+++ b/dist/package.mill
@@ -2,15 +2,14 @@ package build.dist
Expand Down Expand Up @@ -264,7 +264,7 @@ index fbbeacbc843..04b53aaf2f2 100644
PathRef(executable)
}
diff --git a/example/package.mill b/example/package.mill
index 427a6aecd74..4ff150b74d1 100644
index 62190fd6c1e..9d4f176c915 100644
--- a/example/package.mill
+++ b/example/package.mill
@@ -3,13 +3,12 @@ package build.example
Expand Down Expand Up @@ -483,7 +483,7 @@ index 427a6aecd74..4ff150b74d1 100644
os.write(
Task.dest / "example.adoc",
parsed()
@@ -300,7 +299,7 @@ object `package` extends RootModule with Module {
@@ -303,7 +302,7 @@ $txt
"gatling" -> ("gatling/gatling", "3870fda86e6bca005fbd53108c60a65db36279b6"),
"arrow" -> ("arrow-kt/arrow", "bc9bf92cc98e01c21bdd2bf8640cf7db0f97204a")
)
Expand Down Expand Up @@ -546,7 +546,7 @@ index af00b40d3f0..303bb74cbc0 100644
override def moduleDeps = super[IntegrationTestModule].moduleDeps
def forkEnv = super.forkEnv() ++ Seq(
diff --git a/main/package.mill b/main/package.mill
index 08980f56dda..fe819532072 100644
index 03f2256c480..f879f8f3f92 100644
--- a/main/package.mill
+++ b/main/package.mill
@@ -63,7 +63,7 @@ object `package` extends RootModule with build.MillStableScalaModule with BuildI
Expand Down Expand Up @@ -579,7 +579,7 @@ index 957d929826d..112f1aaccb8 100644
// TODO: document, why we have this dependency
ivy"org.jsoup:jsoup:1.18.1"
diff --git a/scalajslib/package.mill b/scalajslib/package.mill
index cb17827974f..9270c6ca604 100644
index 562041446af..f4cce7cebb1 100644
--- a/scalajslib/package.mill
+++ b/scalajslib/package.mill
@@ -44,7 +44,7 @@ object `package` extends RootModule with build.MillStableScalaModule with BuildI
Expand All @@ -592,7 +592,7 @@ index cb17827974f..9270c6ca604 100644
def mandatoryIvyDeps = Agg.empty[Dep]
def compileIvyDeps = super.mandatoryIvyDeps() ++ Agg(
diff --git a/scalalib/package.mill b/scalalib/package.mill
index 05d74d4426f..e73afa90405 100644
index d25adf2effd..6852f802156 100644
--- a/scalalib/package.mill
+++ b/scalalib/package.mill
@@ -2,14 +2,13 @@ package build.scalalib
Expand Down Expand Up @@ -638,7 +638,7 @@ index 3b577e29c65..7f45dcaeab6 100644
def forkEnv =
super.forkEnv() ++ Map("MILL_EXECUTABLE_PATH" -> build.dist.launcher().path.toString())
diff --git a/website/package.mill b/website/package.mill
index eb4f1515dee..8a52e72cdc9 100644
index f88dc3fe8f6..eb1916dae76 100644
--- a/website/package.mill
+++ b/website/package.mill
@@ -26,7 +26,7 @@ object `package` extends RootModule {
Expand Down Expand Up @@ -711,7 +711,7 @@ index eb4f1515dee..8a52e72cdc9 100644
}
)()

@@ -161,9 +161,9 @@ object `package` extends RootModule {
@@ -170,9 +170,9 @@ object `package` extends RootModule {
(p, i, os.temp(s), os.temp.dir())
}

Expand All @@ -720,10 +720,10 @@ index eb4f1515dee..8a52e72cdc9 100644
"mill.main.graphviz.GraphvizTools",
- visualizeClassPath,
+ classPath = visualizeClassPath.toSeq,
mainArgs = orderedDiagrams.map { case (p, i, src, dest) => s"$src;$dest;svg" }
)

@@ -173,7 +173,7 @@ object `package` extends RootModule {
mainArgs = orderedDiagrams.map { case (p, i, src, dest) =>
T.log.debug(s"Rendering graphviz: ${p} (${i}) to ${dest}")
s"$src;$dest;svg"
@@ -185,7 +185,7 @@ object `package` extends RootModule {

}

Expand All @@ -732,7 +732,7 @@ index eb4f1515dee..8a52e72cdc9 100644

/**
* The doc root ready to be built by antora for the current branch.
@@ -216,7 +216,7 @@ object `package` extends RootModule {
@@ -228,7 +228,7 @@ object `package` extends RootModule {
os.write.over(dest / "antora.yml", (lines ++ newLines).mkString("\n"))
}

Expand Down
Loading
0